From 7af6eb6cfe3d47b10ab342a7f0dab64293995182 Mon Sep 17 00:00:00 2001 From: Robert Graeff Date: Fri, 22 Sep 2023 14:54:55 +0200 Subject: [PATCH 1/4] Remove obsolete pullsecret field from installation --- apis/core/types_installation.go | 7 ---- apis/core/v1alpha1/types_installation.go | 7 ---- apis/core/v1alpha1/zz_generated.conversion.go | 2 -- apis/core/v1alpha1/zz_generated.deepcopy.go | 5 --- apis/core/validation/installation.go | 3 -- apis/core/zz_generated.deepcopy.go | 5 --- apis/openapi/openapi_generated.go | 16 +-------- .../apis/core/types_installation.go | 7 ---- .../apis/core/v1alpha1/types_installation.go | 7 ---- .../core/v1alpha1/zz_generated.conversion.go | 2 -- .../core/v1alpha1/zz_generated.deepcopy.go | 5 --- .../apis/core/zz_generated.deepcopy.go | 5 --- docs/api-reference/core.md | 35 ------------------- docs/proposals/feature-coverage.md | 3 +- examples/30-Example-Installation.yaml | 5 --- .../controllers/installations/controller.go | 3 +- ...ndscaper.gardener.cloud_installations.yaml | 19 ---------- .../installations/executions/operation.go | 1 - .../subinstallations/subinstallations.go | 1 - .../apis/core/types_installation.go | 7 ---- .../apis/core/v1alpha1/types_installation.go | 7 ---- .../core/v1alpha1/zz_generated.conversion.go | 2 -- .../core/v1alpha1/zz_generated.deepcopy.go | 5 --- .../apis/core/validation/installation.go | 3 -- .../apis/core/zz_generated.deepcopy.go | 5 --- 25 files changed, 4 insertions(+), 163 deletions(-) diff --git a/apis/core/types_installation.go b/apis/core/types_installation.go index 0365bc996..0b4066e3c 100644 --- a/apis/core/types_installation.go +++ b/apis/core/types_installation.go @@ -54,13 +54,6 @@ type InstallationSpec struct { // Blueprint is the resolved reference to the definition. Blueprint BlueprintDefinition `json:"blueprint"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` - // Imports define the imported data objects and targets. // +optional Imports InstallationImports `json:"imports,omitempty"` diff --git a/apis/core/v1alpha1/types_installation.go b/apis/core/v1alpha1/types_installation.go index 35c39a4e6..415a38f89 100644 --- a/apis/core/v1alpha1/types_installation.go +++ b/apis/core/v1alpha1/types_installation.go @@ -183,13 +183,6 @@ type InstallationSpec struct { // Blueprint is the resolved reference to the definition. Blueprint BlueprintDefinition `json:"blueprint"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` - // Imports define the imported data objects and targets. // +optional Imports InstallationImports `json:"imports,omitempty"` diff --git a/apis/core/v1alpha1/zz_generated.conversion.go b/apis/core/v1alpha1/zz_generated.conversion.go index e39ce3915..6234aa74a 100644 --- a/apis/core/v1alpha1/zz_generated.conversion.go +++ b/apis/core/v1alpha1/zz_generated.conversion.go @@ -2543,7 +2543,6 @@ func autoConvert_v1alpha1_InstallationSpec_To_core_InstallationSpec(in *Installa if err := Convert_v1alpha1_BlueprintDefinition_To_core_BlueprintDefinition(&in.Blueprint, &out.Blueprint, s); err != nil { return err } - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) if err := Convert_v1alpha1_InstallationImports_To_core_InstallationImports(&in.Imports, &out.Imports, s); err != nil { return err } @@ -2567,7 +2566,6 @@ func autoConvert_core_InstallationSpec_To_v1alpha1_InstallationSpec(in *core.Ins if err := Convert_core_BlueprintDefinition_To_v1alpha1_BlueprintDefinition(&in.Blueprint, &out.Blueprint, s); err != nil { return err } - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) if err := Convert_core_InstallationImports_To_v1alpha1_InstallationImports(&in.Imports, &out.Imports, s); err != nil { return err } diff --git a/apis/core/v1alpha1/zz_generated.deepcopy.go b/apis/core/v1alpha1/zz_generated.deepcopy.go index 6da8017b1..4295455f1 100644 --- a/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1663,11 +1663,6 @@ func (in *InstallationSpec) DeepCopyInto(out *InstallationSpec) { (*in).DeepCopyInto(*out) } in.Blueprint.DeepCopyInto(&out.Blueprint) - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } in.Imports.DeepCopyInto(&out.Imports) if in.ImportDataMappings != nil { in, out := &in.ImportDataMappings, &out.ImportDataMappings diff --git a/apis/core/validation/installation.go b/apis/core/validation/installation.go index a930af613..3a3517d0c 100644 --- a/apis/core/validation/installation.go +++ b/apis/core/validation/installation.go @@ -55,9 +55,6 @@ func ValidateInstallationSpec(spec *core.InstallationSpec, fldPath *field.Path) allErrs = append(allErrs, ValidateInstallationBlueprint(spec.Blueprint, fldPath.Child("blueprint"))...) allErrs = append(allErrs, ValidateInstallationComponentDescriptor(spec.ComponentDescriptor, fldPath.Child("componentDescriptor"))...) - // check RegistryPullSecrets - allErrs = append(allErrs, ValidateObjectReferenceList(spec.RegistryPullSecrets, fldPath.Child("registryPullSecrets"))...) - return allErrs } diff --git a/apis/core/zz_generated.deepcopy.go b/apis/core/zz_generated.deepcopy.go index 6bdc8eeaa..42416ca9c 100644 --- a/apis/core/zz_generated.deepcopy.go +++ b/apis/core/zz_generated.deepcopy.go @@ -1663,11 +1663,6 @@ func (in *InstallationSpec) DeepCopyInto(out *InstallationSpec) { (*in).DeepCopyInto(*out) } in.Blueprint.DeepCopyInto(&out.Blueprint) - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } in.Imports.DeepCopyInto(&out.Imports) if in.ImportDataMappings != nil { in, out := &in.ImportDataMappings, &out.ImportDataMappings diff --git a/apis/openapi/openapi_generated.go b/apis/openapi/openapi_generated.go index 32b1b57f9..2cdf92799 100644 --- a/apis/openapi/openapi_generated.go +++ b/apis/openapi/openapi_generated.go @@ -5839,20 +5839,6 @@ func schema_landscaper_apis_core_v1alpha1_InstallationSpec(ref common.ReferenceC Ref: ref("github.com/gardener/landscaper/apis/core/v1alpha1.BlueprintDefinition"), }, }, - "registryPullSecrets": { - SchemaProps: spec.SchemaProps{ - Description: "RegistryPullSecrets defines a list of registry credentials that are used to pull blueprints, component descriptors and jsonschemas from the respective registry. For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ Note that the type information is used to determine the secret key and the type of the secret.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/gardener/landscaper/apis/core/v1alpha1.ObjectReference"), - }, - }, - }, - }, - }, "imports": { SchemaProps: spec.SchemaProps{ Description: "Imports define the imported data objects and targets.", @@ -5906,7 +5892,7 @@ func schema_landscaper_apis_core_v1alpha1_InstallationSpec(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON", "github.com/gardener/landscaper/apis/core/v1alpha1.AutomaticReconcile", "github.com/gardener/landscaper/apis/core/v1alpha1.BlueprintDefinition", "github.com/gardener/landscaper/apis/core/v1alpha1.ComponentDescriptorDefinition", "github.com/gardener/landscaper/apis/core/v1alpha1.InstallationExports", "github.com/gardener/landscaper/apis/core/v1alpha1.InstallationImports", "github.com/gardener/landscaper/apis/core/v1alpha1.ObjectReference"}, + "github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON", "github.com/gardener/landscaper/apis/core/v1alpha1.AutomaticReconcile", "github.com/gardener/landscaper/apis/core/v1alpha1.BlueprintDefinition", "github.com/gardener/landscaper/apis/core/v1alpha1.ComponentDescriptorDefinition", "github.com/gardener/landscaper/apis/core/v1alpha1.InstallationExports", "github.com/gardener/landscaper/apis/core/v1alpha1.InstallationImports"}, } } diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_installation.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_installation.go index 0365bc996..0b4066e3c 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_installation.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_installation.go @@ -54,13 +54,6 @@ type InstallationSpec struct { // Blueprint is the resolved reference to the definition. Blueprint BlueprintDefinition `json:"blueprint"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` - // Imports define the imported data objects and targets. // +optional Imports InstallationImports `json:"imports,omitempty"` diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_installation.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_installation.go index 35c39a4e6..415a38f89 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_installation.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_installation.go @@ -183,13 +183,6 @@ type InstallationSpec struct { // Blueprint is the resolved reference to the definition. Blueprint BlueprintDefinition `json:"blueprint"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` - // Imports define the imported data objects and targets. // +optional Imports InstallationImports `json:"imports,omitempty"` diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go index e39ce3915..6234aa74a 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go @@ -2543,7 +2543,6 @@ func autoConvert_v1alpha1_InstallationSpec_To_core_InstallationSpec(in *Installa if err := Convert_v1alpha1_BlueprintDefinition_To_core_BlueprintDefinition(&in.Blueprint, &out.Blueprint, s); err != nil { return err } - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) if err := Convert_v1alpha1_InstallationImports_To_core_InstallationImports(&in.Imports, &out.Imports, s); err != nil { return err } @@ -2567,7 +2566,6 @@ func autoConvert_core_InstallationSpec_To_v1alpha1_InstallationSpec(in *core.Ins if err := Convert_core_BlueprintDefinition_To_v1alpha1_BlueprintDefinition(&in.Blueprint, &out.Blueprint, s); err != nil { return err } - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) if err := Convert_core_InstallationImports_To_v1alpha1_InstallationImports(&in.Imports, &out.Imports, s); err != nil { return err } diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go index 6da8017b1..4295455f1 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1663,11 +1663,6 @@ func (in *InstallationSpec) DeepCopyInto(out *InstallationSpec) { (*in).DeepCopyInto(*out) } in.Blueprint.DeepCopyInto(&out.Blueprint) - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } in.Imports.DeepCopyInto(&out.Imports) if in.ImportDataMappings != nil { in, out := &in.ImportDataMappings, &out.ImportDataMappings diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go index 6bdc8eeaa..42416ca9c 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go @@ -1663,11 +1663,6 @@ func (in *InstallationSpec) DeepCopyInto(out *InstallationSpec) { (*in).DeepCopyInto(*out) } in.Blueprint.DeepCopyInto(&out.Blueprint) - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } in.Imports.DeepCopyInto(&out.Imports) if in.ImportDataMappings != nil { in, out := &in.ImportDataMappings, &out.ImportDataMappings diff --git a/docs/api-reference/core.md b/docs/api-reference/core.md index 919cf00c6..ce31d4ef2 100644 --- a/docs/api-reference/core.md +++ b/docs/api-reference/core.md @@ -1086,23 +1086,6 @@ BlueprintDefinition -registryPullSecrets
- - -[]ObjectReference - - - - -(Optional) -

RegistryPullSecrets defines a list of registry credentials that are used to -pull blueprints, component descriptors and jsonschemas from the respective registry. -For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ -Note that the type information is used to determine the secret key and the type of the secret.

- - - - imports
@@ -4527,23 +4510,6 @@ BlueprintDefinition -registryPullSecrets
- - -[]ObjectReference - - - - -(Optional) -

RegistryPullSecrets defines a list of registry credentials that are used to -pull blueprints, component descriptors and jsonschemas from the respective registry. -For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ -Note that the type information is used to determine the secret key and the type of the secret.

- - - - imports
@@ -5061,7 +5027,6 @@ ObjectReference ExecutionSpec, ExecutionStatus, ImportStatus, -InstallationSpec, InstallationStatus, NamedObjectReference, SecretReference, diff --git a/docs/proposals/feature-coverage.md b/docs/proposals/feature-coverage.md index c500a3a88..abf9506d0 100644 --- a/docs/proposals/feature-coverage.md +++ b/docs/proposals/feature-coverage.md @@ -137,8 +137,7 @@ The blueprint of an installation can be given: Subinstallations, deploy executions, export executions can be defined in separate files or in the blueprint.yaml Pulling a blueprint, component descriptor or jsonschema using a registry pull secret -- from field `registryPullSecrets` of the installation spec -- from field `registryPullSecrets` of the `Context` referenced in the `Installation` +from field `registryPullSecrets` of the `Context` referenced in the `Installation` diff --git a/examples/30-Example-Installation.yaml b/examples/30-Example-Installation.yaml index cecf629f8..e5b2e391b 100644 --- a/examples/30-Example-Installation.yaml +++ b/examples/30-Example-Installation.yaml @@ -18,11 +18,6 @@ spec: componentName: github.com/gardener/virtual-cluster version: v1.7.2 -# # additional pull secrets to access component descriptors and blueprints -# # is deprecated and should be defined in the context instead. -# registryPullSecrets: # additional pull secrets to access component descriptors and blueprints -# - name: my-pullsecret - blueprint: # will be read from the component descriptor ref: resourceName: my-installation-blueprint diff --git a/pkg/landscaper/controllers/installations/controller.go b/pkg/landscaper/controllers/installations/controller.go index 1132b22b5..09d79fc49 100644 --- a/pkg/landscaper/controllers/installations/controller.go +++ b/pkg/landscaper/controllers/installations/controller.go @@ -265,7 +265,8 @@ func (c *Controller) initPrerequisites(ctx context.Context, inst *lsv1alpha1.Ins return nil, lserrors.NewWrappedError(err, currOp, "CalculateContext", err.Error()) } - if err := c.SetupRegistries(ctx, op, append(lsCtx.External.RegistryPullSecrets(), inst.Spec.RegistryPullSecrets...), inst); err != nil { + if err := c.SetupRegistries(ctx, op, lsCtx.External.RegistryPullSecrets(), inst); err != nil { + return nil, lserrors.NewWrappedError(err, currOp, "SetupRegistries", err.Error()) } diff --git a/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_installations.yaml b/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_installations.yaml index 2b673bf87..39184bac6 100755 --- a/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_installations.yaml +++ b/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_installations.yaml @@ -615,25 +615,6 @@ spec: type: object type: array type: object - registryPullSecrets: - description: 'RegistryPullSecrets defines a list of registry credentials - that are used to pull blueprints, component descriptors and jsonschemas - from the respective registry. For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - Note that the type information is used to determine the secret key - and the type of the secret.' - items: - description: ObjectReference is the reference to a kubernetes object. - properties: - name: - description: Name is the name of the kubernetes object. - type: string - namespace: - description: Namespace is the namespace of kubernetes object. - type: string - required: - - name - type: object - type: array required: - blueprint type: object diff --git a/pkg/landscaper/installations/executions/operation.go b/pkg/landscaper/installations/executions/operation.go index 46129a078..b71110524 100644 --- a/pkg/landscaper/installations/executions/operation.go +++ b/pkg/landscaper/installations/executions/operation.go @@ -157,7 +157,6 @@ func (o *ExecutionOperation) Ensure(ctx context.Context, inst *installations.Ins exec := &lsv1alpha1.Execution{} exec.Name = inst.GetInstallation().Name exec.Namespace = inst.GetInstallation().Namespace - exec.Spec.RegistryPullSecrets = inst.GetInstallation().Spec.RegistryPullSecrets versionedDeployItemTemplateList := lsv1alpha1.DeployItemTemplateList{} if err := lsv1alpha1.Convert_core_DeployItemTemplateList_To_v1alpha1_DeployItemTemplateList(&execTemplates, &versionedDeployItemTemplateList, nil); err != nil { diff --git a/pkg/landscaper/installations/subinstallations/subinstallations.go b/pkg/landscaper/installations/subinstallations/subinstallations.go index 6d04841a9..432da79da 100644 --- a/pkg/landscaper/installations/subinstallations/subinstallations.go +++ b/pkg/landscaper/installations/subinstallations/subinstallations.go @@ -287,7 +287,6 @@ func (o *Operation) createOrUpdateNewInstallation(ctx context.Context, } subInst.Spec = lsv1alpha1.InstallationSpec{ Context: inst.Spec.Context, - RegistryPullSecrets: inst.Spec.RegistryPullSecrets, ComponentDescriptor: subCdDef, Blueprint: *subBlueprint, Imports: subInstTmpl.Imports, diff --git a/vendor/github.com/gardener/landscaper/apis/core/types_installation.go b/vendor/github.com/gardener/landscaper/apis/core/types_installation.go index 0365bc996..0b4066e3c 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/types_installation.go +++ b/vendor/github.com/gardener/landscaper/apis/core/types_installation.go @@ -54,13 +54,6 @@ type InstallationSpec struct { // Blueprint is the resolved reference to the definition. Blueprint BlueprintDefinition `json:"blueprint"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` - // Imports define the imported data objects and targets. // +optional Imports InstallationImports `json:"imports,omitempty"` diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_installation.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_installation.go index 35c39a4e6..415a38f89 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_installation.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_installation.go @@ -183,13 +183,6 @@ type InstallationSpec struct { // Blueprint is the resolved reference to the definition. Blueprint BlueprintDefinition `json:"blueprint"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` - // Imports define the imported data objects and targets. // +optional Imports InstallationImports `json:"imports,omitempty"` diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go index e39ce3915..6234aa74a 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go @@ -2543,7 +2543,6 @@ func autoConvert_v1alpha1_InstallationSpec_To_core_InstallationSpec(in *Installa if err := Convert_v1alpha1_BlueprintDefinition_To_core_BlueprintDefinition(&in.Blueprint, &out.Blueprint, s); err != nil { return err } - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) if err := Convert_v1alpha1_InstallationImports_To_core_InstallationImports(&in.Imports, &out.Imports, s); err != nil { return err } @@ -2567,7 +2566,6 @@ func autoConvert_core_InstallationSpec_To_v1alpha1_InstallationSpec(in *core.Ins if err := Convert_core_BlueprintDefinition_To_v1alpha1_BlueprintDefinition(&in.Blueprint, &out.Blueprint, s); err != nil { return err } - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) if err := Convert_core_InstallationImports_To_v1alpha1_InstallationImports(&in.Imports, &out.Imports, s); err != nil { return err } diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go index 6da8017b1..4295455f1 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1663,11 +1663,6 @@ func (in *InstallationSpec) DeepCopyInto(out *InstallationSpec) { (*in).DeepCopyInto(*out) } in.Blueprint.DeepCopyInto(&out.Blueprint) - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } in.Imports.DeepCopyInto(&out.Imports) if in.ImportDataMappings != nil { in, out := &in.ImportDataMappings, &out.ImportDataMappings diff --git a/vendor/github.com/gardener/landscaper/apis/core/validation/installation.go b/vendor/github.com/gardener/landscaper/apis/core/validation/installation.go index a930af613..3a3517d0c 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/validation/installation.go +++ b/vendor/github.com/gardener/landscaper/apis/core/validation/installation.go @@ -55,9 +55,6 @@ func ValidateInstallationSpec(spec *core.InstallationSpec, fldPath *field.Path) allErrs = append(allErrs, ValidateInstallationBlueprint(spec.Blueprint, fldPath.Child("blueprint"))...) allErrs = append(allErrs, ValidateInstallationComponentDescriptor(spec.ComponentDescriptor, fldPath.Child("componentDescriptor"))...) - // check RegistryPullSecrets - allErrs = append(allErrs, ValidateObjectReferenceList(spec.RegistryPullSecrets, fldPath.Child("registryPullSecrets"))...) - return allErrs } diff --git a/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go b/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go index 6bdc8eeaa..42416ca9c 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go @@ -1663,11 +1663,6 @@ func (in *InstallationSpec) DeepCopyInto(out *InstallationSpec) { (*in).DeepCopyInto(*out) } in.Blueprint.DeepCopyInto(&out.Blueprint) - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } in.Imports.DeepCopyInto(&out.Imports) if in.ImportDataMappings != nil { in, out := &in.ImportDataMappings, &out.ImportDataMappings From 42eed67e6d22a1326fe8796ebf48fa3bb4ae60e0 Mon Sep 17 00:00:00 2001 From: Robert Graeff Date: Wed, 27 Sep 2023 11:54:06 +0200 Subject: [PATCH 2/4] Remove obsolete pullsecret field from execution --- apis/core/types_execution.go | 7 ---- apis/core/v1alpha1/conversion.go | 2 -- apis/core/v1alpha1/types_execution.go | 7 ---- apis/core/v1alpha1/zz_generated.conversion.go | 2 -- apis/core/v1alpha1/zz_generated.deepcopy.go | 5 --- apis/core/zz_generated.deepcopy.go | 5 --- apis/openapi/openapi_generated.go | 16 +-------- .../landscaper/apis/core/types_execution.go | 7 ---- .../apis/core/v1alpha1/conversion.go | 2 -- .../apis/core/v1alpha1/types_execution.go | 7 ---- .../core/v1alpha1/zz_generated.conversion.go | 2 -- .../core/v1alpha1/zz_generated.deepcopy.go | 5 --- .../apis/core/zz_generated.deepcopy.go | 5 --- docs/api-reference/core.md | 35 ------------------- .../landscaper.gardener.cloud_executions.yaml | 19 ---------- pkg/landscaper/execution/reconcile.go | 1 - .../landscaper/apis/core/types_execution.go | 7 ---- .../apis/core/v1alpha1/conversion.go | 2 -- .../apis/core/v1alpha1/types_execution.go | 7 ---- .../core/v1alpha1/zz_generated.conversion.go | 2 -- .../core/v1alpha1/zz_generated.deepcopy.go | 5 --- .../apis/core/zz_generated.deepcopy.go | 5 --- 22 files changed, 1 insertion(+), 154 deletions(-) diff --git a/apis/core/types_execution.go b/apis/core/types_execution.go index 962569983..fd9537281 100644 --- a/apis/core/types_execution.go +++ b/apis/core/types_execution.go @@ -63,13 +63,6 @@ type ExecutionSpec struct { // DeployItemsCompressed as zipped byte array DeployItemsCompressed []byte `json:"deployItemsCompressed,omitempty"` - - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` } // ExecutionStatus contains the current status of a execution. diff --git a/apis/core/v1alpha1/conversion.go b/apis/core/v1alpha1/conversion.go index 107111eb3..e21131df7 100644 --- a/apis/core/v1alpha1/conversion.go +++ b/apis/core/v1alpha1/conversion.go @@ -44,7 +44,6 @@ func Convert_v1alpha1_ExecutionSpec_To_core_ExecutionSpec(in *ExecutionSpec, out if err := Convert_v1alpha1_DeployItemTemplateList_To_core_DeployItemTemplateList((*DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)), (*core.DeployItemTemplateList)(unsafe.Pointer(&out.DeployItems)), s); err != nil { return err } - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } @@ -53,7 +52,6 @@ func Convert_core_ExecutionSpec_To_v1alpha1_ExecutionSpec(in *core.ExecutionSpec if err := Convert_core_DeployItemTemplateList_To_v1alpha1_DeployItemTemplateList((*core.DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)), (*DeployItemTemplateList)(unsafe.Pointer(&out.DeployItems)), s); err != nil { return err } - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } diff --git a/apis/core/v1alpha1/types_execution.go b/apis/core/v1alpha1/types_execution.go index 422e0130c..60b6e6dc2 100644 --- a/apis/core/v1alpha1/types_execution.go +++ b/apis/core/v1alpha1/types_execution.go @@ -164,13 +164,6 @@ type ExecutionSpec struct { // DeployItemsCompressed as zipped byte array DeployItemsCompressed []byte `json:"deployItemsCompressed,omitempty"` - - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` } // ExecutionStatus contains the current status of a execution. diff --git a/apis/core/v1alpha1/zz_generated.conversion.go b/apis/core/v1alpha1/zz_generated.conversion.go index 6234aa74a..45fb9a0dc 100644 --- a/apis/core/v1alpha1/zz_generated.conversion.go +++ b/apis/core/v1alpha1/zz_generated.conversion.go @@ -2219,7 +2219,6 @@ func autoConvert_v1alpha1_ExecutionSpec_To_core_ExecutionSpec(in *ExecutionSpec, out.Context = in.Context out.DeployItems = *(*core.DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)) out.DeployItemsCompressed = *(*[]byte)(unsafe.Pointer(&in.DeployItemsCompressed)) - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } @@ -2227,7 +2226,6 @@ func autoConvert_core_ExecutionSpec_To_v1alpha1_ExecutionSpec(in *core.Execution out.Context = in.Context out.DeployItems = *(*DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)) out.DeployItemsCompressed = *(*[]byte)(unsafe.Pointer(&in.DeployItemsCompressed)) - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } diff --git a/apis/core/v1alpha1/zz_generated.deepcopy.go b/apis/core/v1alpha1/zz_generated.deepcopy.go index 4295455f1..e9203ee97 100644 --- a/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1284,11 +1284,6 @@ func (in *ExecutionSpec) DeepCopyInto(out *ExecutionSpec) { *out = make([]byte, len(*in)) copy(*out, *in) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } return } diff --git a/apis/core/zz_generated.deepcopy.go b/apis/core/zz_generated.deepcopy.go index 42416ca9c..25c9bbf68 100644 --- a/apis/core/zz_generated.deepcopy.go +++ b/apis/core/zz_generated.deepcopy.go @@ -1284,11 +1284,6 @@ func (in *ExecutionSpec) DeepCopyInto(out *ExecutionSpec) { *out = make([]byte, len(*in)) copy(*out, *in) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } return } diff --git a/apis/openapi/openapi_generated.go b/apis/openapi/openapi_generated.go index 2cdf92799..2ec204e30 100644 --- a/apis/openapi/openapi_generated.go +++ b/apis/openapi/openapi_generated.go @@ -5205,25 +5205,11 @@ func schema_landscaper_apis_core_v1alpha1_ExecutionSpec(ref common.ReferenceCall Format: "byte", }, }, - "registryPullSecrets": { - SchemaProps: spec.SchemaProps{ - Description: "RegistryPullSecrets defines a list of registry credentials that are used to pull blueprints, component descriptors and jsonschemas from the respective registry. For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ Note that the type information is used to determine the secret key and the type of the secret.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/gardener/landscaper/apis/core/v1alpha1.ObjectReference"), - }, - }, - }, - }, - }, }, }, }, Dependencies: []string{ - "github.com/gardener/landscaper/apis/core/v1alpha1.DeployItemTemplate", "github.com/gardener/landscaper/apis/core/v1alpha1.ObjectReference"}, + "github.com/gardener/landscaper/apis/core/v1alpha1.DeployItemTemplate"}, } } diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_execution.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_execution.go index 962569983..fd9537281 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_execution.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_execution.go @@ -63,13 +63,6 @@ type ExecutionSpec struct { // DeployItemsCompressed as zipped byte array DeployItemsCompressed []byte `json:"deployItemsCompressed,omitempty"` - - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` } // ExecutionStatus contains the current status of a execution. diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/conversion.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/conversion.go index 107111eb3..e21131df7 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/conversion.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/conversion.go @@ -44,7 +44,6 @@ func Convert_v1alpha1_ExecutionSpec_To_core_ExecutionSpec(in *ExecutionSpec, out if err := Convert_v1alpha1_DeployItemTemplateList_To_core_DeployItemTemplateList((*DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)), (*core.DeployItemTemplateList)(unsafe.Pointer(&out.DeployItems)), s); err != nil { return err } - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } @@ -53,7 +52,6 @@ func Convert_core_ExecutionSpec_To_v1alpha1_ExecutionSpec(in *core.ExecutionSpec if err := Convert_core_DeployItemTemplateList_To_v1alpha1_DeployItemTemplateList((*core.DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)), (*DeployItemTemplateList)(unsafe.Pointer(&out.DeployItems)), s); err != nil { return err } - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_execution.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_execution.go index 422e0130c..60b6e6dc2 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_execution.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_execution.go @@ -164,13 +164,6 @@ type ExecutionSpec struct { // DeployItemsCompressed as zipped byte array DeployItemsCompressed []byte `json:"deployItemsCompressed,omitempty"` - - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` } // ExecutionStatus contains the current status of a execution. diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go index 6234aa74a..45fb9a0dc 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go @@ -2219,7 +2219,6 @@ func autoConvert_v1alpha1_ExecutionSpec_To_core_ExecutionSpec(in *ExecutionSpec, out.Context = in.Context out.DeployItems = *(*core.DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)) out.DeployItemsCompressed = *(*[]byte)(unsafe.Pointer(&in.DeployItemsCompressed)) - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } @@ -2227,7 +2226,6 @@ func autoConvert_core_ExecutionSpec_To_v1alpha1_ExecutionSpec(in *core.Execution out.Context = in.Context out.DeployItems = *(*DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)) out.DeployItemsCompressed = *(*[]byte)(unsafe.Pointer(&in.DeployItemsCompressed)) - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go index 4295455f1..e9203ee97 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1284,11 +1284,6 @@ func (in *ExecutionSpec) DeepCopyInto(out *ExecutionSpec) { *out = make([]byte, len(*in)) copy(*out, *in) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } return } diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go index 42416ca9c..25c9bbf68 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go @@ -1284,11 +1284,6 @@ func (in *ExecutionSpec) DeepCopyInto(out *ExecutionSpec) { *out = make([]byte, len(*in)) copy(*out, *in) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } return } diff --git a/docs/api-reference/core.md b/docs/api-reference/core.md index ce31d4ef2..dc08f723e 100644 --- a/docs/api-reference/core.md +++ b/docs/api-reference/core.md @@ -951,23 +951,6 @@ DeployItemTemplateList

DeployItemsCompressed as zipped byte array

- - -registryPullSecrets
- - -[]ObjectReference - - - - -(Optional) -

RegistryPullSecrets defines a list of registry credentials that are used to -pull blueprints, component descriptors and jsonschemas from the respective registry. -For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ -Note that the type information is used to determine the secret key and the type of the secret.

- - @@ -3731,23 +3714,6 @@ DeployItemTemplateList

DeployItemsCompressed as zipped byte array

- - -registryPullSecrets
- - -[]ObjectReference - - - - -(Optional) -

RegistryPullSecrets defines a list of registry credentials that are used to -pull blueprints, component descriptors and jsonschemas from the respective registry. -For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ -Note that the type information is used to determine the secret key and the type of the secret.

- -

ExecutionStatus @@ -5024,7 +4990,6 @@ ObjectReference DeployItemSpec, DeployItemStatus, DeployItemTemplate, -ExecutionSpec, ExecutionStatus, ImportStatus, InstallationStatus, diff --git a/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_executions.yaml b/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_executions.yaml index f9ccdafcf..da726f725 100755 --- a/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_executions.yaml +++ b/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_executions.yaml @@ -113,25 +113,6 @@ spec: description: DeployItemsCompressed as zipped byte array format: byte type: string - registryPullSecrets: - description: 'RegistryPullSecrets defines a list of registry credentials - that are used to pull blueprints, component descriptors and jsonschemas - from the respective registry. For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - Note that the type information is used to determine the secret key - and the type of the secret.' - items: - description: ObjectReference is the reference to a kubernetes object. - properties: - name: - description: Name is the name of the kubernetes object. - type: string - namespace: - description: Namespace is the namespace of kubernetes object. - type: string - required: - - name - type: object - type: array type: object status: description: Status contains the current status of the execution. diff --git a/pkg/landscaper/execution/reconcile.go b/pkg/landscaper/execution/reconcile.go index 3d01e6aad..020889d74 100644 --- a/pkg/landscaper/execution/reconcile.go +++ b/pkg/landscaper/execution/reconcile.go @@ -47,7 +47,6 @@ func (o *Operation) updateDeployItem(ctx context.Context, item executionItem) ls item.DeployItem.GenerateName = fmt.Sprintf("%s-%s-", o.exec.Name, item.Info.Name) item.DeployItem.Namespace = o.exec.Namespace } - item.DeployItem.Spec.RegistryPullSecrets = o.exec.Spec.RegistryPullSecrets if _, err := o.Writer().CreateOrUpdateDeployItem(ctx, read_write_layer.W000036, item.DeployItem, func() error { ApplyDeployItemTemplate(item.DeployItem, item.Info) diff --git a/vendor/github.com/gardener/landscaper/apis/core/types_execution.go b/vendor/github.com/gardener/landscaper/apis/core/types_execution.go index 962569983..fd9537281 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/types_execution.go +++ b/vendor/github.com/gardener/landscaper/apis/core/types_execution.go @@ -63,13 +63,6 @@ type ExecutionSpec struct { // DeployItemsCompressed as zipped byte array DeployItemsCompressed []byte `json:"deployItemsCompressed,omitempty"` - - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` } // ExecutionStatus contains the current status of a execution. diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/conversion.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/conversion.go index 107111eb3..e21131df7 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/conversion.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/conversion.go @@ -44,7 +44,6 @@ func Convert_v1alpha1_ExecutionSpec_To_core_ExecutionSpec(in *ExecutionSpec, out if err := Convert_v1alpha1_DeployItemTemplateList_To_core_DeployItemTemplateList((*DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)), (*core.DeployItemTemplateList)(unsafe.Pointer(&out.DeployItems)), s); err != nil { return err } - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } @@ -53,7 +52,6 @@ func Convert_core_ExecutionSpec_To_v1alpha1_ExecutionSpec(in *core.ExecutionSpec if err := Convert_core_DeployItemTemplateList_To_v1alpha1_DeployItemTemplateList((*core.DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)), (*DeployItemTemplateList)(unsafe.Pointer(&out.DeployItems)), s); err != nil { return err } - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_execution.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_execution.go index 422e0130c..60b6e6dc2 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_execution.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_execution.go @@ -164,13 +164,6 @@ type ExecutionSpec struct { // DeployItemsCompressed as zipped byte array DeployItemsCompressed []byte `json:"deployItemsCompressed,omitempty"` - - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` } // ExecutionStatus contains the current status of a execution. diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go index 6234aa74a..45fb9a0dc 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go @@ -2219,7 +2219,6 @@ func autoConvert_v1alpha1_ExecutionSpec_To_core_ExecutionSpec(in *ExecutionSpec, out.Context = in.Context out.DeployItems = *(*core.DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)) out.DeployItemsCompressed = *(*[]byte)(unsafe.Pointer(&in.DeployItemsCompressed)) - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } @@ -2227,7 +2226,6 @@ func autoConvert_core_ExecutionSpec_To_v1alpha1_ExecutionSpec(in *core.Execution out.Context = in.Context out.DeployItems = *(*DeployItemTemplateList)(unsafe.Pointer(&in.DeployItems)) out.DeployItemsCompressed = *(*[]byte)(unsafe.Pointer(&in.DeployItemsCompressed)) - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) return nil } diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go index 4295455f1..e9203ee97 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1284,11 +1284,6 @@ func (in *ExecutionSpec) DeepCopyInto(out *ExecutionSpec) { *out = make([]byte, len(*in)) copy(*out, *in) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } return } diff --git a/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go b/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go index 42416ca9c..25c9bbf68 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go @@ -1284,11 +1284,6 @@ func (in *ExecutionSpec) DeepCopyInto(out *ExecutionSpec) { *out = make([]byte, len(*in)) copy(*out, *in) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } return } From df78990ce8181d684acb6f1577fa516e18b230ed Mon Sep 17 00:00:00 2001 From: Robert Graeff Date: Wed, 27 Sep 2023 15:21:32 +0200 Subject: [PATCH 3/4] Remove obsolete pullsecret field from deployitem --- apis/core/types_deployitem.go | 6 ---- apis/core/v1alpha1/types_deployitem.go | 6 ---- apis/core/v1alpha1/zz_generated.conversion.go | 2 -- apis/core/v1alpha1/zz_generated.deepcopy.go | 5 --- apis/core/zz_generated.deepcopy.go | 5 --- apis/openapi/openapi_generated.go | 14 -------- .../landscaper/apis/core/types_deployitem.go | 6 ---- .../apis/core/v1alpha1/types_deployitem.go | 6 ---- .../core/v1alpha1/zz_generated.conversion.go | 2 -- .../core/v1alpha1/zz_generated.deepcopy.go | 5 --- .../apis/core/zz_generated.deepcopy.go | 5 --- docs/api-reference/core.md | 34 ------------------- pkg/deployer/container/container_reconcile.go | 18 ---------- pkg/deployer/helm/helm.go | 2 +- ...landscaper.gardener.cloud_deployitems.yaml | 19 ----------- .../landscaper/apis/core/types_deployitem.go | 6 ---- .../apis/core/v1alpha1/types_deployitem.go | 6 ---- .../core/v1alpha1/zz_generated.conversion.go | 2 -- .../core/v1alpha1/zz_generated.deepcopy.go | 5 --- .../apis/core/zz_generated.deepcopy.go | 5 --- 20 files changed, 1 insertion(+), 158 deletions(-) diff --git a/apis/core/types_deployitem.go b/apis/core/types_deployitem.go index ea04693e9..3871a13ad 100644 --- a/apis/core/types_deployitem.go +++ b/apis/core/types_deployitem.go @@ -55,12 +55,6 @@ type DeployItemSpec struct { Context string `json:"context,omitempty"` // Configuration contains the deployer type specific configuration. Configuration *runtime.RawExtension `json:"config,omitempty"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` // Timeout specifies how long the deployer may take to apply the deploy item. // When the time is exceeded, the deploy item fails. // Value has to be parsable by time.ParseDuration (or 'none' to deactivate the timeout). diff --git a/apis/core/v1alpha1/types_deployitem.go b/apis/core/v1alpha1/types_deployitem.go index b9b860a6c..18ebcc524 100644 --- a/apis/core/v1alpha1/types_deployitem.go +++ b/apis/core/v1alpha1/types_deployitem.go @@ -149,12 +149,6 @@ type DeployItemSpec struct { Context string `json:"context,omitempty"` // Configuration contains the deployer type specific configuration. Configuration *runtime.RawExtension `json:"config,omitempty"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` // Timeout specifies how long the deployer may take to apply the deploy item. // When the time is exceeded, the deploy item fails. // Value has to be parsable by time.ParseDuration (or 'none' to deactivate the timeout). diff --git a/apis/core/v1alpha1/zz_generated.conversion.go b/apis/core/v1alpha1/zz_generated.conversion.go index 45fb9a0dc..e7ba71f30 100644 --- a/apis/core/v1alpha1/zz_generated.conversion.go +++ b/apis/core/v1alpha1/zz_generated.conversion.go @@ -1712,7 +1712,6 @@ func autoConvert_v1alpha1_DeployItemSpec_To_core_DeployItemSpec(in *DeployItemSp out.Target = (*core.ObjectReference)(unsafe.Pointer(in.Target)) out.Context = in.Context out.Configuration = (*runtime.RawExtension)(unsafe.Pointer(in.Configuration)) - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) out.Timeout = (*core.Duration)(unsafe.Pointer(in.Timeout)) out.UpdateOnChangeOnly = in.UpdateOnChangeOnly out.OnDelete = (*core.OnDeleteConfig)(unsafe.Pointer(in.OnDelete)) @@ -1729,7 +1728,6 @@ func autoConvert_core_DeployItemSpec_To_v1alpha1_DeployItemSpec(in *core.DeployI out.Target = (*ObjectReference)(unsafe.Pointer(in.Target)) out.Context = in.Context out.Configuration = (*runtime.RawExtension)(unsafe.Pointer(in.Configuration)) - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) out.Timeout = (*Duration)(unsafe.Pointer(in.Timeout)) out.UpdateOnChangeOnly = in.UpdateOnChangeOnly out.OnDelete = (*OnDeleteConfig)(unsafe.Pointer(in.OnDelete)) diff --git a/apis/core/v1alpha1/zz_generated.deepcopy.go b/apis/core/v1alpha1/zz_generated.deepcopy.go index e9203ee97..ff15d2703 100644 --- a/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -747,11 +747,6 @@ func (in *DeployItemSpec) DeepCopyInto(out *DeployItemSpec) { *out = new(runtime.RawExtension) (*in).DeepCopyInto(*out) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } if in.Timeout != nil { in, out := &in.Timeout, &out.Timeout *out = new(Duration) diff --git a/apis/core/zz_generated.deepcopy.go b/apis/core/zz_generated.deepcopy.go index 25c9bbf68..117d736ef 100644 --- a/apis/core/zz_generated.deepcopy.go +++ b/apis/core/zz_generated.deepcopy.go @@ -747,11 +747,6 @@ func (in *DeployItemSpec) DeepCopyInto(out *DeployItemSpec) { *out = new(runtime.RawExtension) (*in).DeepCopyInto(*out) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } if in.Timeout != nil { in, out := &in.Timeout, &out.Timeout *out = new(Duration) diff --git a/apis/openapi/openapi_generated.go b/apis/openapi/openapi_generated.go index 2ec204e30..258f3333d 100644 --- a/apis/openapi/openapi_generated.go +++ b/apis/openapi/openapi_generated.go @@ -4307,20 +4307,6 @@ func schema_landscaper_apis_core_v1alpha1_DeployItemSpec(ref common.ReferenceCal Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"), }, }, - "registryPullSecrets": { - SchemaProps: spec.SchemaProps{ - Description: "RegistryPullSecrets defines a list of registry credentials that are used to pull blueprints, component descriptors and jsonschemas from the respective registry. For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ Note that the type information is used to determine the secret key and the type of the secret.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/gardener/landscaper/apis/core/v1alpha1.ObjectReference"), - }, - }, - }, - }, - }, "timeout": { SchemaProps: spec.SchemaProps{ Description: "Timeout specifies how long the deployer may take to apply the deploy item. When the time is exceeded, the deploy item fails. Value has to be parsable by time.ParseDuration (or 'none' to deactivate the timeout). Defaults to ten minutes if not specified.", diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_deployitem.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_deployitem.go index ea04693e9..3871a13ad 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_deployitem.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/types_deployitem.go @@ -55,12 +55,6 @@ type DeployItemSpec struct { Context string `json:"context,omitempty"` // Configuration contains the deployer type specific configuration. Configuration *runtime.RawExtension `json:"config,omitempty"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` // Timeout specifies how long the deployer may take to apply the deploy item. // When the time is exceeded, the deploy item fails. // Value has to be parsable by time.ParseDuration (or 'none' to deactivate the timeout). diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_deployitem.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_deployitem.go index b9b860a6c..18ebcc524 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_deployitem.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_deployitem.go @@ -149,12 +149,6 @@ type DeployItemSpec struct { Context string `json:"context,omitempty"` // Configuration contains the deployer type specific configuration. Configuration *runtime.RawExtension `json:"config,omitempty"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` // Timeout specifies how long the deployer may take to apply the deploy item. // When the time is exceeded, the deploy item fails. // Value has to be parsable by time.ParseDuration (or 'none' to deactivate the timeout). diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go index 45fb9a0dc..e7ba71f30 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go @@ -1712,7 +1712,6 @@ func autoConvert_v1alpha1_DeployItemSpec_To_core_DeployItemSpec(in *DeployItemSp out.Target = (*core.ObjectReference)(unsafe.Pointer(in.Target)) out.Context = in.Context out.Configuration = (*runtime.RawExtension)(unsafe.Pointer(in.Configuration)) - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) out.Timeout = (*core.Duration)(unsafe.Pointer(in.Timeout)) out.UpdateOnChangeOnly = in.UpdateOnChangeOnly out.OnDelete = (*core.OnDeleteConfig)(unsafe.Pointer(in.OnDelete)) @@ -1729,7 +1728,6 @@ func autoConvert_core_DeployItemSpec_To_v1alpha1_DeployItemSpec(in *core.DeployI out.Target = (*ObjectReference)(unsafe.Pointer(in.Target)) out.Context = in.Context out.Configuration = (*runtime.RawExtension)(unsafe.Pointer(in.Configuration)) - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) out.Timeout = (*Duration)(unsafe.Pointer(in.Timeout)) out.UpdateOnChangeOnly = in.UpdateOnChangeOnly out.OnDelete = (*OnDeleteConfig)(unsafe.Pointer(in.OnDelete)) diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go index e9203ee97..ff15d2703 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -747,11 +747,6 @@ func (in *DeployItemSpec) DeepCopyInto(out *DeployItemSpec) { *out = new(runtime.RawExtension) (*in).DeepCopyInto(*out) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } if in.Timeout != nil { in, out := &in.Timeout, &out.Timeout *out = new(Duration) diff --git a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go index 25c9bbf68..117d736ef 100644 --- a/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go +++ b/controller-utils/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go @@ -747,11 +747,6 @@ func (in *DeployItemSpec) DeepCopyInto(out *DeployItemSpec) { *out = new(runtime.RawExtension) (*in).DeepCopyInto(*out) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } if in.Timeout != nil { in, out := &in.Timeout, &out.Timeout *out = new(Duration) diff --git a/docs/api-reference/core.md b/docs/api-reference/core.md index dc08f723e..4a224578f 100644 --- a/docs/api-reference/core.md +++ b/docs/api-reference/core.md @@ -563,23 +563,6 @@ k8s.io/apimachinery/pkg/runtime.RawExtension -registryPullSecrets
- - -[]ObjectReference - - - - -(Optional) -

RegistryPullSecrets defines a list of registry credentials that are used to -pull blueprints, component descriptors and jsonschemas from the respective registry. -For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ -Note that the type information is used to determine the secret key and the type of the secret.

- - - - timeout
@@ -2777,23 +2760,6 @@ k8s.io/apimachinery/pkg/runtime.RawExtension -registryPullSecrets
- - -[]ObjectReference - - - - -(Optional) -

RegistryPullSecrets defines a list of registry credentials that are used to -pull blueprints, component descriptors and jsonschemas from the respective registry. -For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ -Note that the type information is used to determine the secret key and the type of the secret.

- - - - timeout
diff --git a/pkg/deployer/container/container_reconcile.go b/pkg/deployer/container/container_reconcile.go index 450809094..e12e1584b 100644 --- a/pkg/deployer/container/container_reconcile.go +++ b/pkg/deployer/container/container_reconcile.go @@ -527,24 +527,6 @@ func (c *Container) parseAndSyncSecrets(ctx context.Context, defaultLabels map[s } } - for _, secretRef := range c.DeployItem.Spec.RegistryPullSecrets { - secret := &corev1.Secret{} - - err := c.lsClient.Get(ctx, secretRef.NamespacedName(), secret) - if err != nil { - log.Debug("Unable to get auth config from secret, skipping", lc.KeyResource, secretRef.NamespacedName().String(), lc.KeyError, err.Error()) - } - authConfig, err := dockerconfig.LoadFromReader(bytes.NewBuffer(secret.Data[corev1.DockerConfigJsonKey])) - if err != nil { - log.Debug("Invalid auth config in secret, skipping", lc.KeyResource, secretRef.NamespacedName().String(), lc.KeyError, err.Error()) - continue - } - if err := ociKeyring.Add(authConfig.GetCredentialsStore("")); err != nil { - erro = fmt.Errorf("unable to add config from secret %q to credentials store: %w", secretRef.NamespacedName().String(), err) - return - } - } - var err error imagePullSecret, err = c.syncSecrets(ctx, ImagePullSecretName(c.DeployItem.Namespace, c.DeployItem.Name), c.ProviderConfiguration.Image, ociKeyring, defaultLabels) if err != nil { diff --git a/pkg/deployer/helm/helm.go b/pkg/deployer/helm/helm.go index 32a7ba275..363f8fdf0 100644 --- a/pkg/deployer/helm/helm.go +++ b/pkg/deployer/helm/helm.go @@ -126,7 +126,7 @@ func (h *Helm) Template(ctx context.Context) (map[string]string, map[string]stri // todo: do caching of charts // resolve all registry pull secrets - registryPullSecretRefs := append(lib.GetRegistryPullSecretsFromContext(h.Context), h.DeployItem.Spec.RegistryPullSecrets...) + registryPullSecretRefs := lib.GetRegistryPullSecretsFromContext(h.Context) registryPullSecrets, err := kutil.ResolveSecrets(ctx, h.lsKubeClient, registryPullSecretRefs) if err != nil { return nil, nil, nil, nil, lserrors.NewWrappedError(err, currOp, "ResolveSecrets", err.Error()) diff --git a/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_deployitems.yaml b/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_deployitems.yaml index 9999aab80..f649c8f0a 100755 --- a/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_deployitems.yaml +++ b/pkg/landscaper/crdmanager/crdresources/landscaper.gardener.cloud_deployitems.yaml @@ -54,25 +54,6 @@ spec: to check the Garden project with the shoot cluster resources type: boolean type: object - registryPullSecrets: - description: 'RegistryPullSecrets defines a list of registry credentials - that are used to pull blueprints, component descriptors and jsonschemas - from the respective registry. For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - Note that the type information is used to determine the secret key - and the type of the secret.' - items: - description: ObjectReference is the reference to a kubernetes object. - properties: - name: - description: Name is the name of the kubernetes object. - type: string - namespace: - description: Namespace is the namespace of kubernetes object. - type: string - required: - - name - type: object - type: array target: description: Target specifies an optional target of the deploy item. In most cases it contains the secrets to access a evironment. It diff --git a/vendor/github.com/gardener/landscaper/apis/core/types_deployitem.go b/vendor/github.com/gardener/landscaper/apis/core/types_deployitem.go index ea04693e9..3871a13ad 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/types_deployitem.go +++ b/vendor/github.com/gardener/landscaper/apis/core/types_deployitem.go @@ -55,12 +55,6 @@ type DeployItemSpec struct { Context string `json:"context,omitempty"` // Configuration contains the deployer type specific configuration. Configuration *runtime.RawExtension `json:"config,omitempty"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` // Timeout specifies how long the deployer may take to apply the deploy item. // When the time is exceeded, the deploy item fails. // Value has to be parsable by time.ParseDuration (or 'none' to deactivate the timeout). diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_deployitem.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_deployitem.go index b9b860a6c..18ebcc524 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_deployitem.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/types_deployitem.go @@ -149,12 +149,6 @@ type DeployItemSpec struct { Context string `json:"context,omitempty"` // Configuration contains the deployer type specific configuration. Configuration *runtime.RawExtension `json:"config,omitempty"` - // RegistryPullSecrets defines a list of registry credentials that are used to - // pull blueprints, component descriptors and jsonschemas from the respective registry. - // For more info see: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - // Note that the type information is used to determine the secret key and the type of the secret. - // +optional - RegistryPullSecrets []ObjectReference `json:"registryPullSecrets,omitempty"` // Timeout specifies how long the deployer may take to apply the deploy item. // When the time is exceeded, the deploy item fails. // Value has to be parsable by time.ParseDuration (or 'none' to deactivate the timeout). diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go index 45fb9a0dc..e7ba71f30 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.conversion.go @@ -1712,7 +1712,6 @@ func autoConvert_v1alpha1_DeployItemSpec_To_core_DeployItemSpec(in *DeployItemSp out.Target = (*core.ObjectReference)(unsafe.Pointer(in.Target)) out.Context = in.Context out.Configuration = (*runtime.RawExtension)(unsafe.Pointer(in.Configuration)) - out.RegistryPullSecrets = *(*[]core.ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) out.Timeout = (*core.Duration)(unsafe.Pointer(in.Timeout)) out.UpdateOnChangeOnly = in.UpdateOnChangeOnly out.OnDelete = (*core.OnDeleteConfig)(unsafe.Pointer(in.OnDelete)) @@ -1729,7 +1728,6 @@ func autoConvert_core_DeployItemSpec_To_v1alpha1_DeployItemSpec(in *core.DeployI out.Target = (*ObjectReference)(unsafe.Pointer(in.Target)) out.Context = in.Context out.Configuration = (*runtime.RawExtension)(unsafe.Pointer(in.Configuration)) - out.RegistryPullSecrets = *(*[]ObjectReference)(unsafe.Pointer(&in.RegistryPullSecrets)) out.Timeout = (*Duration)(unsafe.Pointer(in.Timeout)) out.UpdateOnChangeOnly = in.UpdateOnChangeOnly out.OnDelete = (*OnDeleteConfig)(unsafe.Pointer(in.OnDelete)) diff --git a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go index e9203ee97..ff15d2703 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/landscaper/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -747,11 +747,6 @@ func (in *DeployItemSpec) DeepCopyInto(out *DeployItemSpec) { *out = new(runtime.RawExtension) (*in).DeepCopyInto(*out) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } if in.Timeout != nil { in, out := &in.Timeout, &out.Timeout *out = new(Duration) diff --git a/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go b/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go index 25c9bbf68..117d736ef 100644 --- a/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/landscaper/apis/core/zz_generated.deepcopy.go @@ -747,11 +747,6 @@ func (in *DeployItemSpec) DeepCopyInto(out *DeployItemSpec) { *out = new(runtime.RawExtension) (*in).DeepCopyInto(*out) } - if in.RegistryPullSecrets != nil { - in, out := &in.RegistryPullSecrets, &out.RegistryPullSecrets - *out = make([]ObjectReference, len(*in)) - copy(*out, *in) - } if in.Timeout != nil { in, out := &in.Timeout, &out.Timeout *out = new(Duration) From 937d62a09acda4e14f0200e9edeb45199cc00b98 Mon Sep 17 00:00:00 2001 From: Robert Graeff Date: Wed, 27 Sep 2023 15:51:44 +0200 Subject: [PATCH 4/4] Test (run-int-tests)