Skip to content

Commit 870c018

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#2323 from barbacbd/CORS-4041
CORS-4041: Remove the TagManager from the GCP Custom Endpoints
2 parents 768a119 + 0cd9658 commit 870c018

16 files changed

+17
-34
lines changed

‎config/v1/tests/infrastructures.config.openshift.io/GCPCustomAPIEndpoints.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ tests:
213213
dnsType: PlatformDefault
214214
serviceEndpoints:
215215
- {name: "UnknownService", url: "https://compute-myendpoint1.p.googleapis.com"}
216-
expectedStatusError: "[status.platformStatus.gcp.serviceEndpoints[0].name: Unsupported value: \"UnknownService\": supported values: \"Compute\", \"Container\", \"CloudResourceManager\", \"DNS\", \"File\", \"IAM\", \"ServiceUsage\", \"Storage\", \"TagManager\", <nil>: Invalid value: \"null\": some validation rules were not checked because the object was invalid; correct the existing errors to complete validation"
216+
expectedStatusError: "[status.platformStatus.gcp.serviceEndpoints[0].name: Unsupported value: \"UnknownService\": supported values: \"Compute\", \"Container\", \"CloudResourceManager\", \"DNS\", \"File\", \"IAM\", \"ServiceUsage\", \"Storage\", <nil>: Invalid value: \"null\": some validation rules were not checked because the object was invalid; correct the existing errors to complete validation"
217217
- name: Service Endpoint End Slash
218218
initial: |
219219
apiVersion: config.openshift.io/v1

‎config/v1/types_infrastructure.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ const (
630630
)
631631

632632
// GCPServiceEndpointName is the name of the GCP Service Endpoint.
633-
// +kubebuilder:validation:Enum=Compute;Container;CloudResourceManager;DNS;File;IAM;ServiceUsage;Storage;TagManager
633+
// +kubebuilder:validation:Enum=Compute;Container;CloudResourceManager;DNS;File;IAM;ServiceUsage;Storage
634634
type GCPServiceEndpointName string
635635

636636
const (
@@ -657,9 +657,6 @@ const (
657657

658658
// GCPServiceEndpointNameStorage is the name used for the GCP Storage Service endpoint.
659659
GCPServiceEndpointNameStorage GCPServiceEndpointName = "Storage"
660-
661-
// GCPServiceEndpointNameTagManager is the name used for the GCP Tag Manager Service endpoint.
662-
GCPServiceEndpointNameTagManager GCPServiceEndpointName = "TagManager"
663660
)
664661

665662
// GCPServiceEndpoint store the configuration of a custom url to
@@ -755,7 +752,7 @@ type GCPPlatformStatus struct {
755752
// The maximum number of endpoint overrides allowed is 9.
756753
// +listType=map
757754
// +listMapKey=name
758-
// +kubebuilder:validation:MaxItems=9
755+
// +kubebuilder:validation:MaxItems=8
759756
// +kubebuilder:validation:XValidation:rule="self.all(x, self.exists_one(y, x.name == y.name))",message="only 1 endpoint override is permitted per GCP service name"
760757
// +optional
761758
// +openshift:enable:FeatureGate=GCPCustomAPIEndpoints

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,7 +1917,6 @@ spec:
19171917
- IAM
19181918
- ServiceUsage
19191919
- Storage
1920-
- TagManager
19211920
type: string
19221921
url:
19231922
description: |-
@@ -1943,7 +1942,7 @@ spec:
19431942
- name
19441943
- url
19451944
type: object
1946-
maxItems: 9
1945+
maxItems: 8
19471946
type: array
19481947
x-kubernetes-list-map-keys:
19491948
- name

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,7 +1917,6 @@ spec:
19171917
- IAM
19181918
- ServiceUsage
19191919
- Storage
1920-
- TagManager
19211920
type: string
19221921
url:
19231922
description: |-
@@ -1943,7 +1942,7 @@ spec:
19431942
- name
19441943
- url
19451944
type: object
1946-
maxItems: 9
1945+
maxItems: 8
19471946
type: array
19481947
x-kubernetes-list-map-keys:
19491948
- name

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,6 @@ spec:
19161916
- IAM
19171917
- ServiceUsage
19181918
- Storage
1919-
- TagManager
19201919
type: string
19211920
url:
19221921
description: |-
@@ -1942,7 +1941,7 @@ spec:
19421941
- name
19431942
- url
19441943
type: object
1945-
maxItems: 9
1944+
maxItems: 8
19461945
type: array
19471946
x-kubernetes-list-map-keys:
19481947
- name

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPCustomAPIEndpoints.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,6 @@ spec:
15131513
- IAM
15141514
- ServiceUsage
15151515
- Storage
1516-
- TagManager
15171516
type: string
15181517
url:
15191518
description: |-
@@ -1539,7 +1538,7 @@ spec:
15391538
- name
15401539
- url
15411540
type: object
1542-
maxItems: 9
1541+
maxItems: 8
15431542
type: array
15441543
x-kubernetes-list-map-keys:
15451544
- name

‎machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2197,7 +2197,6 @@ spec:
21972197
- IAM
21982198
- ServiceUsage
21992199
- Storage
2200-
- TagManager
22012200
type: string
22022201
url:
22032202
description: |-
@@ -2223,7 +2222,7 @@ spec:
22232222
- name
22242223
- url
22252224
type: object
2226-
maxItems: 9
2225+
maxItems: 8
22272226
type: array
22282227
x-kubernetes-list-map-keys:
22292228
- name

‎machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2197,7 +2197,6 @@ spec:
21972197
- IAM
21982198
- ServiceUsage
21992199
- Storage
2200-
- TagManager
22012200
type: string
22022201
url:
22032202
description: |-
@@ -2223,7 +2222,7 @@ spec:
22232222
- name
22242223
- url
22252224
type: object
2226-
maxItems: 9
2225+
maxItems: 8
22272226
type: array
22282227
x-kubernetes-list-map-keys:
22292228
- name

‎machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2196,7 +2196,6 @@ spec:
21962196
- IAM
21972197
- ServiceUsage
21982198
- Storage
2199-
- TagManager
22002199
type: string
22012200
url:
22022201
description: |-
@@ -2222,7 +2221,7 @@ spec:
22222221
- name
22232222
- url
22242223
type: object
2225-
maxItems: 9
2224+
maxItems: 8
22262225
type: array
22272226
x-kubernetes-list-map-keys:
22282227
- name

‎machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPCustomAPIEndpoints.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,6 @@ spec:
18111811
- IAM
18121812
- ServiceUsage
18131813
- Storage
1814-
- TagManager
18151814
type: string
18161815
url:
18171816
description: |-
@@ -1837,7 +1836,7 @@ spec:
18371836
- name
18381837
- url
18391838
type: object
1840-
maxItems: 9
1839+
maxItems: 8
18411840
type: array
18421841
x-kubernetes-list-map-keys:
18431842
- name

0 commit comments

Comments
 (0)