Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Obsolete field for registry pull secrets in installations #834

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions apis/core/types_deployitem.go
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
7 changes: 0 additions & 7 deletions apis/core/types_execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 0 additions & 7 deletions apis/core/types_installation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 0 additions & 2 deletions apis/core/v1alpha1/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
6 changes: 0 additions & 6 deletions apis/core/v1alpha1/types_deployitem.go
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
7 changes: 0 additions & 7 deletions apis/core/v1alpha1/types_execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 0 additions & 7 deletions apis/core/v1alpha1/types_installation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
6 changes: 0 additions & 6 deletions apis/core/v1alpha1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions apis/core/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions apis/core/validation/installation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
15 changes: 0 additions & 15 deletions apis/core/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 2 additions & 44 deletions apis/openapi/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading