diff --git a/apis/kots/v1beta1/airgap_types.go b/apis/kots/v1beta1/airgap_types.go index c4e7183f..4ddfe542 100644 --- a/apis/kots/v1beta1/airgap_types.go +++ b/apis/kots/v1beta1/airgap_types.go @@ -44,17 +44,17 @@ type AirgapReleaseMeta struct { // EmbeddedClusterArtifacts maps embedded cluster artifacts to their path type EmbeddedClusterArtifacts struct { - Charts string `json:"charts,omitempty"` - ImagesAmd64 string `json:"imagesAmd64,omitempty"` - BinaryAmd64 string `json:"binaryAmd64,omitempty"` - Metadata string `json:"metadata,omitempty"` - Registry Registry `json:"registry,omitempty"` + Charts string `json:"charts,omitempty"` + ImagesAmd64 string `json:"imagesAmd64,omitempty"` + BinaryAmd64 string `json:"binaryAmd64,omitempty"` + Metadata string `json:"metadata,omitempty"` + Registry EmbeddedClusterRegistry `json:"registry,omitempty"` } -// Registry holds a directory from where a images can be read and later pushed -// to the registry. Format inside the directory is the same as the registry -// storage format. -type Registry struct { +// EmbeddedClusterRegistry holds a directory from where a images can be read and later +// pushed to the embedded cluster registry. Format inside the directory is the same as +// the registry storage format. +type EmbeddedClusterRegistry struct { Dir string `json:"dir,omitempty"` SavedImages []string `json:"savedImages,omitempty"` } diff --git a/apis/kots/v1beta1/zz_generated.deepcopy.go b/apis/kots/v1beta1/zz_generated.deepcopy.go index 3264bba4..eddad16a 100644 --- a/apis/kots/v1beta1/zz_generated.deepcopy.go +++ b/apis/kots/v1beta1/zz_generated.deepcopy.go @@ -761,6 +761,26 @@ func (in *EmbeddedClusterArtifacts) DeepCopy() *EmbeddedClusterArtifacts { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *EmbeddedClusterRegistry) DeepCopyInto(out *EmbeddedClusterRegistry) { + *out = *in + if in.SavedImages != nil { + in, out := &in.SavedImages, &out.SavedImages + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EmbeddedClusterRegistry. +func (in *EmbeddedClusterRegistry) DeepCopy() *EmbeddedClusterRegistry { + if in == nil { + return nil + } + out := new(EmbeddedClusterRegistry) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *EntitlementField) DeepCopyInto(out *EntitlementField) { *out = *in @@ -1820,26 +1840,6 @@ func (in *RegexValidator) DeepCopy() *RegexValidator { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Registry) DeepCopyInto(out *Registry) { - *out = *in - if in.SavedImages != nil { - in, out := &in.SavedImages, &out.SavedImages - *out = make([]string, len(*in)) - copy(*out, *in) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Registry. -func (in *Registry) DeepCopy() *Registry { - if in == nil { - return nil - } - out := new(Registry) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RepeatTemplate) DeepCopyInto(out *RepeatTemplate) { *out = *in diff --git a/config/crds/kots.io_airgaps.yaml b/config/crds/kots.io_airgaps.yaml index 9d753154..8cee6c47 100644 --- a/config/crds/kots.io_airgaps.yaml +++ b/config/crds/kots.io_airgaps.yaml @@ -59,9 +59,9 @@ spec: type: string registry: description: |- - Registry holds a directory from where a images can be read and later pushed - to the registry. Format inside the directory is the same as the registry - storage format. + EmbeddedClusterRegistry holds a directory from where a images can be read and later + pushed to the embedded cluster registry. Format inside the directory is the same as + the registry storage format. properties: dir: type: string diff --git a/config/crds/kots.io_installations.yaml b/config/crds/kots.io_installations.yaml index 343acc45..9e8308fa 100644 --- a/config/crds/kots.io_installations.yaml +++ b/config/crds/kots.io_installations.yaml @@ -57,9 +57,9 @@ spec: type: string registry: description: |- - Registry holds a directory from where a images can be read and later pushed - to the registry. Format inside the directory is the same as the registry - storage format. + EmbeddedClusterRegistry holds a directory from where a images can be read and later + pushed to the embedded cluster registry. Format inside the directory is the same as + the registry storage format. properties: dir: type: string