Run make update

openshift · Nov 21, 2024 · a21c7a6 · a21c7a6
1 parent c2796bc
commit a21c7a6
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/...erated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml b/...erated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml
@@ -3915,7 +3915,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...regated-crd-manifests/hostedclusters.hypershift.openshift.io/AROHCPManagedIdentities.yaml b/...regated-crd-manifests/hostedclusters.hypershift.openshift.io/AROHCPManagedIdentities.yaml
@@ -4160,7 +4160,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...gated-crd-manifests/hostedclusters.hypershift.openshift.io/DynamicResourceAllocation.yaml b/...gated-crd-manifests/hostedclusters.hypershift.openshift.io/DynamicResourceAllocation.yaml
@@ -3924,7 +3924,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...rated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml b/...rated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml
@@ -4145,7 +4145,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...egated-crd-manifests/hostedclusters.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml b/...egated-crd-manifests/hostedclusters.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
@@ -4055,7 +4055,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...enerated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml b/...enerated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml
@@ -4377,7 +4377,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...d.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml b/...d.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml
@@ -3771,7 +3771,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...ed-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AROHCPManagedIdentities.yaml b/...ed-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AROHCPManagedIdentities.yaml
@@ -4016,7 +4016,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/DynamicResourceAllocation.yaml b/...-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/DynamicResourceAllocation.yaml
@@ -3780,7 +3780,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/....featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml b/....featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml
@@ -4001,7 +4001,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...d-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml b/...d-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml
@@ -3911,7 +3911,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...ted.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/OpenStack.yaml b/...ted.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/OpenStack.yaml
@@ -4233,7 +4233,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...ts/hypershift-operator/zz_generated.crd-manifests/hostedclusters-CustomNoUpgrade.crd.yaml b/...ts/hypershift-operator/zz_generated.crd-manifests/hostedclusters-CustomNoUpgrade.crd.yaml
@@ -5050,7 +5050,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...all/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Default.crd.yaml b/...all/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Default.crd.yaml
@@ -4329,7 +4329,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...pershift-operator/zz_generated.crd-manifests/hostedclusters-TechPreviewNoUpgrade.crd.yaml b/...pershift-operator/zz_generated.crd-manifests/hostedclusters-TechPreviewNoUpgrade.crd.yaml
@@ -5050,7 +5050,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...pershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-CustomNoUpgrade.crd.yaml b/...pershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-CustomNoUpgrade.crd.yaml
@@ -4906,7 +4906,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...ssets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Default.crd.yaml b/...ssets/hypershift-operator/zz_generated.crd-manifests/hostedcontrolplanes-Default.crd.yaml
@@ -4185,7 +4185,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/...ift-operator/zz_generated.crd-manifests/hostedcontrolplanes-TechPreviewNoUpgrade.crd.yaml b/...ift-operator/zz_generated.crd-manifests/hostedcontrolplanes-TechPreviewNoUpgrade.crd.yaml
@@ -4906,7 +4906,7 @@ spec:
                               x-kubernetes-validations:
                               - message: address must be a valid hostname, IPv4, or
                                   IPv6 address
-                                rule: self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
+                                rule: isIP(self) || self.matches('^(([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}|localhost)$')
                                   || self.matches('^((\\d{1,3}\\.){3}\\d{1,3})$')
                                   || self.matches('^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$')
                             port:

diff --git a/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hostedcluster_types.go b/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hostedcluster_types.go