HOSTEDCP-2166: Add ability to set Labels on HCP Pods

api/hypershift/v1beta1/featuregates/featureGate-Hypershift-Default.yaml

@@ -20,6 +20,9 @@
                     },
                     {
                         "name": "OpenStack"
+                    },
+                    {
+                        "name": "HCPPodsLabels"
                     }
                 ],
                 "enabled": [

api/hypershift/v1beta1/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml

@@ -30,6 +30,9 @@
                     },
                     {
                         "name": "OpenStack"
+                    },
+                    {
+                        "name": "HCPPodsLabels"
                     }
                 ],
                 "version": ""

api/hypershift/v1beta1/featuregates/featureGate-SelfManagedHA-Default.yaml

@@ -20,6 +20,9 @@
                     },
                     {
                         "name": "OpenStack"
+                    },
+                    {
+                        "name": "HCPPodsLabels"
                     }
                 ],
                 "enabled": [

api/hypershift/v1beta1/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml

@@ -30,6 +30,9 @@
                     },
                     {
                         "name": "OpenStack"
+                    },
+                    {
+                        "name": "HCPPodsLabels"
                     }
                 ],
                 "version": ""

api/hypershift/v1beta1/hosted_controlplane.go

@@ -184,6 +184,18 @@ type HostedControlPlaneSpec struct {
 	//
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
+
+	// labels when specified, define what custom labels are added to the hcp pods.
+	// Changing this day 2 will cause a rollout of all hcp pods.
+	// Duplicate keys are not supported. If duplicate keys are defined, only the last key/value pair is preserved.
+	// Valid values are those in https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set
+	//
+	// -kubebuilder:validation:XValidation:rule=`self.all(key, size(key) <= 317 && key.matches('^(([A-Za-z0-9]+(\\.[A-Za-z0-9]+)?)*[A-Za-z0-9]\\/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$'))`, message="label key must have two segments: an optional prefix and name, separated by a slash (/). The name segment is required and must be 63 characters or less, beginning and ending with an alphanumeric character ([a-z0-9A-Z]) with dashes (-), underscores (_), dots (.), and alphanumerics between. The prefix is optional. If specified, the prefix must be a DNS subdomain: a series of DNS labels separated by dots (.), not longer than 253 characters in total, followed by a slash (/)"
+	// -kubebuilder:validation:XValidation:rule=`self.all(key, size(self[key]) <= 63 && self[key].matches('^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$'))`, message="label value must be 63 characters or less (can be empty), consist of alphanumeric characters, dashes (-), underscores (_) or dots (.), and begin and end with an alphanumeric character"
+	// TODO: key/value validations break cost budget for <=4.17. We should figure why and enable it back.
+	// +kubebuilder:validation:MaxProperties=20
+	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
 }
 
 // availabilityPolicy specifies a high level availability policy for components.

api/hypershift/v1beta1/hostedcluster_types.go

@@ -611,6 +611,19 @@ type HostedClusterSpec struct {
 	//
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
+
+	// labels when specified, define what custom labels are added to the hcp pods.
+	// Changing this day 2 will cause a rollout of all hcp pods.
+	// Duplicate keys are not supported. If duplicate keys are defined, only the last key/value pair is preserved.
+	// Valid values are those in https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set
+	//
+	// -kubebuilder:validation:XValidation:rule=`self.all(key, size(key) <= 317 && key.matches('^(([A-Za-z0-9]+(\\.[A-Za-z0-9]+)?)*[A-Za-z0-9]\\/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$'))`, message="label key must have two segments: an optional prefix and name, separated by a slash (/). The name segment is required and must be 63 characters or less, beginning and ending with an alphanumeric character ([a-z0-9A-Z]) with dashes (-), underscores (_), dots (.), and alphanumerics between. The prefix is optional. If specified, the prefix must be a DNS subdomain: a series of DNS labels separated by dots (.), not longer than 253 characters in total, followed by a slash (/)"
+	// -kubebuilder:validation:XValidation:rule=`self.all(key, size(self[key]) <= 63 && self[key].matches('^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$'))`, message="label value must be 63 characters or less (can be empty), consist of alphanumeric characters, dashes (-), underscores (_) or dots (.), and begin and end with an alphanumeric character"
+	// TODO: key/value validations break cost budget for <=4.17. We should figure why and enable it back.
+	// +kubebuilder:validation:MaxProperties=20
+	// +optional
+	// +openshift:enable:FeatureGate=HCPPodsLabels
+	Labels map[string]string `json:"labels,omitempty"`
 }
 
 // OLMCatalogPlacement is an enum specifying the placement of OLM catalog components.

api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests.yaml

@@ -98,6 +98,7 @@ hostedclusters.hypershift.openshift.io:
   - AROHCPManagedIdentities
   - DynamicResourceAllocation
   - ExternalOIDC
+  - HCPPodsLabels
   - NetworkDiagnosticsConfig
   - OpenStack
   FilenameOperatorName: ""