Skip to content

OAPE-232/OCPBUGS-55653: Remove GCPLabelsTags featuregate #2372

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2,278 −5,017
Open

OAPE-232/OCPBUGS-55653: Remove GCPLabelsTags featuregate #2372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions config/v1/tests/infrastructures.config.openshift.io/GCPLabelsTags.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "Infrastructure"
crdName: infrastructures.config.openshift.io
featureGates:
- GCPLabelsTags
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
Expand Down
6 changes: 2 additions & 4 deletions config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,8 +694,8 @@ type GCPServiceEndpoint struct {
type GCPPlatformSpec struct{}

// GCPPlatformStatus holds the current status of the Google Cloud Platform infrastructure provider.
// +openshift:validation:FeatureGateAwareXValidation:featureGate=GCPLabelsTags,rule="!has(oldSelf.resourceLabels) && !has(self.resourceLabels) || has(oldSelf.resourceLabels) && has(self.resourceLabels)",message="resourceLabels may only be configured during installation"
// +openshift:validation:FeatureGateAwareXValidation:featureGate=GCPLabelsTags,rule="!has(oldSelf.resourceTags) && !has(self.resourceTags) || has(oldSelf.resourceTags) && has(self.resourceTags)",message="resourceTags may only be configured during installation"
// +kubebuilder:validation:XValidation:rule="!has(oldSelf.resourceLabels) && !has(self.resourceLabels) || has(oldSelf.resourceLabels) && has(self.resourceLabels)",message="resourceLabels may only be configured during installation"
// +kubebuilder:validation:XValidation:rule="!has(oldSelf.resourceTags) && !has(self.resourceTags) || has(oldSelf.resourceTags) && has(self.resourceTags)",message="resourceTags may only be configured during installation"
type GCPPlatformStatus struct {
// resourceGroupName is the Project ID for new GCP resources created for the cluster.
ProjectID string `json:"projectID"`
Expand All @@ -712,7 +712,6 @@ type GCPPlatformStatus struct {
// +listType=map
// +listMapKey=key
// +optional
// +openshift:enable:FeatureGate=GCPLabelsTags
ResourceLabels []GCPResourceLabel `json:"resourceLabels,omitempty"`

// resourceTags is a list of additional tags to apply to GCP resources created for the cluster.
Expand All @@ -723,7 +722,6 @@ type GCPPlatformStatus struct {
// +listType=map
// +listMapKey=key
// +optional
// +openshift:enable:FeatureGate=GCPLabelsTags
ResourceTags []GCPResourceTag `json:"resourceTags,omitempty"`

// This field was introduced and removed under tech preview.
Expand Down
1 change: 0 additions & 1 deletion config/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ infrastructures.config.openshift.io:
- DyanmicServiceEndpointIBMCloud
- GCPClusterHostedDNS
- GCPCustomAPIEndpoints
- GCPLabelsTags
- HighlyAvailableArbiter
- HighlyAvailableArbiter+DualReplica
- NutanixMultiSubnets
Expand Down
106 changes: 106 additions & 0 deletions ...generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,113 @@ spec:
description: region holds the region for new GCP resources
created for the cluster.
type: string
resourceLabels:
description: |-
resourceLabels is a list of additional labels to apply to GCP resources created for the cluster.
See https://cloud.google.com/compute/docs/labeling-resources for information on labeling GCP resources.
GCP supports a maximum of 64 labels per resource. OpenShift reserves 32 labels for internal use,
allowing 32 labels for user configuration.
items:
description: GCPResourceLabel is a label to apply to GCP
resources created for the cluster.
properties:
key:
description: |-
key is the key part of the label. A label key can have a maximum of 63 characters and cannot be empty.
Label key must begin with a lowercase letter, and must contain only lowercase letters, numeric characters,
and the following special characters `_-`. Label key must not have the reserved prefixes `kubernetes-io`
and `openshift-io`.
maxLength: 63
minLength: 1
pattern: ^[a-z][0-9a-z_-]{0,62}$
type: string
x-kubernetes-validations:
- message: label keys must not start with either `openshift-io`
or `kubernetes-io`
rule: '!self.startsWith(''openshift-io'') && !self.startsWith(''kubernetes-io'')'
value:
description: |-
value is the value part of the label. A label value can have a maximum of 63 characters and cannot be empty.
Value must contain only lowercase letters, numeric characters, and the following special characters `_-`.
maxLength: 63
minLength: 1
pattern: ^[0-9a-z_-]{1,63}$
type: string
required:
- key
- value
type: object
maxItems: 32
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
x-kubernetes-validations:
- message: resourceLabels are immutable and may only be configured
during installation
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
resourceTags:
description: |-
resourceTags is a list of additional tags to apply to GCP resources created for the cluster.
See https://cloud.google.com/resource-manager/docs/tags/tags-overview for information on
tagging GCP resources. GCP supports a maximum of 50 tags per resource.
items:
description: GCPResourceTag is a tag to apply to GCP resources
created for the cluster.
properties:
key:
description: |-
key is the key part of the tag. A tag key can have a maximum of 63 characters and cannot be empty.
Tag key must begin and end with an alphanumeric character, and must contain only uppercase, lowercase
alphanumeric characters, and the following special characters `._-`.
maxLength: 63
minLength: 1
pattern: ^[a-zA-Z0-9]([0-9A-Za-z_.-]{0,61}[a-zA-Z0-9])?$
type: string
parentID:
description: |-
parentID is the ID of the hierarchical resource where the tags are defined,
e.g. at the Organization or the Project level. To find the Organization or Project ID refer to the following pages:
https://cloud.google.com/resource-manager/docs/creating-managing-organization#retrieving_your_organization_id,
https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects.
An OrganizationID must consist of decimal numbers, and cannot have leading zeroes.
A ProjectID must be 6 to 30 characters in length, can only contain lowercase letters, numbers,
and hyphens, and must start with a letter, and cannot end with a hyphen.
maxLength: 32
minLength: 1
pattern: (^[1-9][0-9]{0,31}$)|(^[a-z][a-z0-9-]{4,28}[a-z0-9]$)
type: string
value:
description: |-
value is the value part of the tag. A tag value can have a maximum of 63 characters and cannot be empty.
Tag value must begin and end with an alphanumeric character, and must contain only uppercase, lowercase
alphanumeric characters, and the following special characters `_-.@%=+:,*#&(){}[]` and spaces.
maxLength: 63
minLength: 1
pattern: ^[a-zA-Z0-9]([0-9A-Za-z_.@%=+:,*#&()\[\]{}\-\s]{0,61}[a-zA-Z0-9])?$
type: string
required:
- key
- parentID
- value
type: object
maxItems: 50
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
x-kubernetes-validations:
- message: resourceTags are immutable and may only be configured
during installation
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
type: object
x-kubernetes-validations:
- message: resourceLabels may only be configured during installation
rule: '!has(oldSelf.resourceLabels) && !has(self.resourceLabels)
|| has(oldSelf.resourceLabels) && has(self.resourceLabels)'
- message: resourceTags may only be configured during installation
rule: '!has(oldSelf.resourceTags) && !has(self.resourceTags)
|| has(oldSelf.resourceTags) && has(self.resourceTags)'
ibmcloud:
description: ibmcloud contains settings specific to the IBMCloud
infrastructure provider.
Expand Down
106 changes: 106 additions & 0 deletions ...d.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,113 @@ spec:
description: region holds the region for new GCP resources
created for the cluster.
type: string
resourceLabels:
description: |-
resourceLabels is a list of additional labels to apply to GCP resources created for the cluster.
See https://cloud.google.com/compute/docs/labeling-resources for information on labeling GCP resources.
GCP supports a maximum of 64 labels per resource. OpenShift reserves 32 labels for internal use,
allowing 32 labels for user configuration.
items:
description: GCPResourceLabel is a label to apply to GCP
resources created for the cluster.
properties:
key:
description: |-
key is the key part of the label. A label key can have a maximum of 63 characters and cannot be empty.
Label key must begin with a lowercase letter, and must contain only lowercase letters, numeric characters,
and the following special characters `_-`. Label key must not have the reserved prefixes `kubernetes-io`
and `openshift-io`.
maxLength: 63
minLength: 1
pattern: ^[a-z][0-9a-z_-]{0,62}$
type: string
x-kubernetes-validations:
- message: label keys must not start with either `openshift-io`
or `kubernetes-io`
rule: '!self.startsWith(''openshift-io'') && !self.startsWith(''kubernetes-io'')'
value:
description: |-
value is the value part of the label. A label value can have a maximum of 63 characters and cannot be empty.
Value must contain only lowercase letters, numeric characters, and the following special characters `_-`.
maxLength: 63
minLength: 1
pattern: ^[0-9a-z_-]{1,63}$
type: string
required:
- key
- value
type: object
maxItems: 32
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
x-kubernetes-validations:
- message: resourceLabels are immutable and may only be configured
during installation
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
resourceTags:
description: |-
resourceTags is a list of additional tags to apply to GCP resources created for the cluster.
See https://cloud.google.com/resource-manager/docs/tags/tags-overview for information on
tagging GCP resources. GCP supports a maximum of 50 tags per resource.
items:
description: GCPResourceTag is a tag to apply to GCP resources
created for the cluster.
properties:
key:
description: |-
key is the key part of the tag. A tag key can have a maximum of 63 characters and cannot be empty.
Tag key must begin and end with an alphanumeric character, and must contain only uppercase, lowercase
alphanumeric characters, and the following special characters `._-`.
maxLength: 63
minLength: 1
pattern: ^[a-zA-Z0-9]([0-9A-Za-z_.-]{0,61}[a-zA-Z0-9])?$
type: string
parentID:
description: |-
parentID is the ID of the hierarchical resource where the tags are defined,
e.g. at the Organization or the Project level. To find the Organization or Project ID refer to the following pages:
https://cloud.google.com/resource-manager/docs/creating-managing-organization#retrieving_your_organization_id,
https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects.
An OrganizationID must consist of decimal numbers, and cannot have leading zeroes.
A ProjectID must be 6 to 30 characters in length, can only contain lowercase letters, numbers,
and hyphens, and must start with a letter, and cannot end with a hyphen.
maxLength: 32
minLength: 1
pattern: (^[1-9][0-9]{0,31}$)|(^[a-z][a-z0-9-]{4,28}[a-z0-9]$)
type: string
value:
description: |-
value is the value part of the tag. A tag value can have a maximum of 63 characters and cannot be empty.
Tag value must begin and end with an alphanumeric character, and must contain only uppercase, lowercase
alphanumeric characters, and the following special characters `_-.@%=+:,*#&(){}[]` and spaces.
maxLength: 63
minLength: 1
pattern: ^[a-zA-Z0-9]([0-9A-Za-z_.@%=+:,*#&()\[\]{}\-\s]{0,61}[a-zA-Z0-9])?$
type: string
required:
- key
- parentID
- value
type: object
maxItems: 50
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
x-kubernetes-validations:
- message: resourceTags are immutable and may only be configured
during installation
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
type: object
x-kubernetes-validations:
- message: resourceLabels may only be configured during installation
rule: '!has(oldSelf.resourceLabels) && !has(self.resourceLabels)
|| has(oldSelf.resourceLabels) && has(self.resourceLabels)'
- message: resourceTags may only be configured during installation
rule: '!has(oldSelf.resourceTags) && !has(self.resourceTags)
|| has(oldSelf.resourceTags) && has(self.resourceTags)'
ibmcloud:
description: ibmcloud contains settings specific to the IBMCloud
infrastructure provider.
Expand Down
Loading