Skip to content

Commit 29d9d89

Browse files
sadasusadasu
committed
Clean up and fix ClusterHostedDNS test files for GCP, AWS and Azure
1 parent 146e81c commit 29d9d89

File tree

3 files changed

+86
-78
lines changed

3 files changed

+86
-78
lines changed

‎machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/AWSClusterHostedDNSInstall.yaml‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,40 @@ tests:
1515
baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
1616
cloudProviderCAData: null
1717
cloudProviderConfig: ""
18-
clusterDNSIP: fd02::a
18+
clusterDNSIP: 10.0.0.10
1919
dns:
2020
apiVersion: config.openshift.io/v1
2121
kind: DNS
2222
spec:
23-
baseDomain: fake.redhat.com
23+
baseDomain: example.redhat.com
2424
images:
2525
machineConfigOperator: rexample.com/example/openshift-release-dev@sha256:2c3ea52ac3a41c6d58e85977c3149413e3fa4b70eb2397426456863adbf43306
2626
infra:
2727
apiVersion: config.openshift.io/v1
2828
kind: Infrastructure
2929
spec:
30-
cloudConfig:
31-
name: ""
3230
platformSpec:
33-
type: None
31+
type: AWS
32+
aws: {}
3433
status:
35-
apiServerInternalURI: https://api-int.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
36-
apiServerURL: https://api.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
34+
apiServerInternalURI: https://api-int.test.example.com:6443
35+
apiServerURL: https://api.test.example.com:6443
3736
cpuPartitioning: "None"
38-
controlPlaneTopology: SingleReplica
37+
controlPlaneTopology: HighlyAvailable
3938
etcdDiscoveryDomain: ""
40-
infrastructureName: cnfde4-sxhr7
41-
infrastructureTopology: SingleReplica
42-
platform: None
39+
infrastructureName: test-aws-cluster
40+
infrastructureTopology: HighlyAvailable
41+
platform: AWS
4342
platformStatus:
44-
type: None
45-
ipFamilies: IPv6
43+
type: AWS
44+
aws:
45+
region: us-east-1
46+
ipFamilies: IPv4
4647
kubeAPIServerServingCAData: Y2VydGlmaWNhdGUK
4748
network: null
4849
networkType: OVNKubernetes
4950
osImageURL: example.com/example/openshift-release-dev@sha256:eacdc37aec78fdbf8caa9601e4012ab31453cf59b086474901900e853e803ea8
50-
platform: none
51+
platform: aws
5152
proxy: null
5253
pullSecret:
5354
name: pull-secret
@@ -63,39 +64,40 @@ tests:
6364
baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
6465
cloudProviderCAData: null
6566
cloudProviderConfig: ""
66-
clusterDNSIP: fd02::a
67+
clusterDNSIP: 10.0.0.10
6768
dns:
6869
apiVersion: config.openshift.io/v1
6970
kind: DNS
7071
spec:
71-
baseDomain: fake.redhat.com
72+
baseDomain: example.redhat.com
7273
images:
7374
machineConfigOperator: rexample.com/example/openshift-release-dev@sha256:2c3ea52ac3a41c6d58e85977c3149413e3fa4b70eb2397426456863adbf43306
7475
infra:
7576
apiVersion: config.openshift.io/v1
7677
kind: Infrastructure
7778
spec:
78-
cloudConfig:
79-
name: ""
8079
platformSpec:
81-
type: None
80+
type: AWS
81+
aws: {}
8282
status:
83-
apiServerInternalURI: https://api-int.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
84-
apiServerURL: https://api.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
83+
apiServerInternalURI: https://api-int.test.example.com:6443
84+
apiServerURL: https://api.test.example.com:6443
8585
cpuPartitioning: "None"
86-
controlPlaneTopology: SingleReplica
86+
controlPlaneTopology: HighlyAvailable
8787
etcdDiscoveryDomain: ""
88-
infrastructureName: cnfde4-sxhr7
89-
infrastructureTopology: SingleReplica
90-
platform: None
88+
infrastructureName: test-aws-cluster
89+
infrastructureTopology: HighlyAvailable
90+
platform: AWS
9191
platformStatus:
92-
type: None
93-
ipFamilies: IPv6
92+
type: AWS
93+
aws:
94+
region: us-east-1
95+
ipFamilies: IPv4
9496
kubeAPIServerServingCAData: Y2VydGlmaWNhdGUK
9597
network: null
9698
networkType: OVNKubernetes
9799
osImageURL: example.com/example/openshift-release-dev@sha256:eacdc37aec78fdbf8caa9601e4012ab31453cf59b086474901900e853e803ea8
98-
platform: none
100+
platform: aws
99101
proxy: null
100102
pullSecret:
101103
name: pull-secret

‎machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/AzureClusterHostedDNSInstall.yaml‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
2-
name: "Azure Cluster Hosted DNS"
2+
name: "AzureClusterHostedDNSInstall ControllerConfig"
33
crdName: controllerconfigs.machineconfiguration.openshift.io
44
featureGates:
55
- AzureClusterHostedDNSInstall
@@ -20,34 +20,35 @@ tests:
2020
apiVersion: config.openshift.io/v1
2121
kind: DNS
2222
spec:
23-
baseDomain: fake.redhat.com
23+
baseDomain: example.redhat.com
2424
images:
2525
machineConfigOperator: rexample.com/example/openshift-release-dev@sha256:2c3ea52ac3a41c6d58e85977c3149413e3fa4b70eb2397426456863adbf43306
2626
infra:
2727
apiVersion: config.openshift.io/v1
2828
kind: Infrastructure
2929
spec:
30-
cloudConfig:
31-
name: ""
3230
platformSpec:
33-
type: None
31+
type: Azure
32+
azure: {}
3433
status:
35-
apiServerInternalURI: https://api-int.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
36-
apiServerURL: https://api.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
34+
apiServerInternalURI: https://api-int.test.example.com:6443
35+
apiServerURL: https://api.test.example.com:6443
3736
cpuPartitioning: "None"
3837
controlPlaneTopology: HighlyAvailable
3938
etcdDiscoveryDomain: ""
40-
infrastructureName: cnfde4-sxhr7
39+
infrastructureName: test-azure-cluster
4140
infrastructureTopology: HighlyAvailable
42-
platform: None
41+
platform: Azure
4342
platformStatus:
44-
type: None
43+
type: Azure
44+
azure:
45+
resourceGroupName: test-rg
4546
ipFamilies: IPv4
4647
kubeAPIServerServingCAData: Y2VydGlmaWNhdGUK
4748
network: null
4849
networkType: OVNKubernetes
4950
osImageURL: example.com/example/openshift-release-dev@sha256:eacdc37aec78fdbf8caa9601e4012ab31453cf59b086474901900e853e803ea8
50-
platform: None
51+
platform: azure
5152
proxy: null
5253
pullSecret:
5354
name: pull-secret
@@ -68,34 +69,35 @@ tests:
6869
apiVersion: config.openshift.io/v1
6970
kind: DNS
7071
spec:
71-
baseDomain: fake.redhat.com
72+
baseDomain: example.redhat.com
7273
images:
7374
machineConfigOperator: rexample.com/example/openshift-release-dev@sha256:2c3ea52ac3a41c6d58e85977c3149413e3fa4b70eb2397426456863adbf43306
7475
infra:
7576
apiVersion: config.openshift.io/v1
7677
kind: Infrastructure
7778
spec:
78-
cloudConfig:
79-
name: ""
8079
platformSpec:
81-
type: None
80+
type: Azure
81+
azure: {}
8282
status:
83-
apiServerInternalURI: https://api-int.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
84-
apiServerURL: https://api.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
83+
apiServerInternalURI: https://api-int.test.example.com:6443
84+
apiServerURL: https://api.test.example.com:6443
8585
cpuPartitioning: "None"
8686
controlPlaneTopology: HighlyAvailable
8787
etcdDiscoveryDomain: ""
88-
infrastructureName: cnfde4-sxhr7
88+
infrastructureName: test-azure-cluster
8989
infrastructureTopology: HighlyAvailable
90-
platform: None
90+
platform: Azure
9191
platformStatus:
92-
type: None
92+
type: Azure
93+
azure:
94+
resourceGroupName: test-rg
9395
ipFamilies: IPv4
9496
kubeAPIServerServingCAData: Y2VydGlmaWNhdGUK
9597
network: null
9698
networkType: OVNKubernetes
9799
osImageURL: example.com/example/openshift-release-dev@sha256:eacdc37aec78fdbf8caa9601e4012ab31453cf59b086474901900e853e803ea8
98-
platform: None
100+
platform: azure
99101
proxy: null
100102
pullSecret:
101103
name: pull-secret

‎machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNSInstall.yaml‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
2-
name: "Shamefully missing"
2+
name: "GCPClusterHostedDNSInstall ControllerConfig"
33
crdName: controllerconfigs.machineconfiguration.openshift.io
44
featureGates:
55
- GCPClusterHostedDNSInstall
@@ -15,39 +15,41 @@ tests:
1515
baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
1616
cloudProviderCAData: null
1717
cloudProviderConfig: ""
18-
clusterDNSIP: fd02::a
18+
clusterDNSIP: 10.0.0.10
1919
dns:
2020
apiVersion: config.openshift.io/v1
2121
kind: DNS
2222
spec:
23-
baseDomain: fake.redhat.com
23+
baseDomain: example.redhat.com
2424
images:
2525
machineConfigOperator: rexample.com/example/openshift-release-dev@sha256:2c3ea52ac3a41c6d58e85977c3149413e3fa4b70eb2397426456863adbf43306
2626
infra:
2727
apiVersion: config.openshift.io/v1
2828
kind: Infrastructure
2929
spec:
30-
cloudConfig:
31-
name: ""
3230
platformSpec:
33-
type: None
31+
type: GCP
32+
gcp: {}
3433
status:
35-
apiServerInternalURI: https://api-int.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
36-
apiServerURL: https://api.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
34+
apiServerInternalURI: https://api-int.test.example.com:6443
35+
apiServerURL: https://api.test.example.com:6443
3736
cpuPartitioning: "None"
38-
controlPlaneTopology: SingleReplica
37+
controlPlaneTopology: HighlyAvailable
3938
etcdDiscoveryDomain: ""
40-
infrastructureName: cnfde4-sxhr7
41-
infrastructureTopology: SingleReplica
42-
platform: None
39+
infrastructureName: test-gcp-cluster
40+
infrastructureTopology: HighlyAvailable
41+
platform: GCP
4342
platformStatus:
44-
type: None
45-
ipFamilies: IPv6
43+
type: GCP
44+
gcp:
45+
projectID: test-project-123456
46+
region: us-central1
47+
ipFamilies: IPv4
4648
kubeAPIServerServingCAData: Y2VydGlmaWNhdGUK
4749
network: null
4850
networkType: OVNKubernetes
4951
osImageURL: example.com/example/openshift-release-dev@sha256:eacdc37aec78fdbf8caa9601e4012ab31453cf59b086474901900e853e803ea8
50-
platform: none
52+
platform: gcp
5153
proxy: null
5254
pullSecret:
5355
name: pull-secret
@@ -63,39 +65,41 @@ tests:
6365
baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
6466
cloudProviderCAData: null
6567
cloudProviderConfig: ""
66-
clusterDNSIP: fd02::a
68+
clusterDNSIP: 10.0.0.10
6769
dns:
6870
apiVersion: config.openshift.io/v1
6971
kind: DNS
7072
spec:
71-
baseDomain: fake.redhat.com
73+
baseDomain: example.redhat.com
7274
images:
7375
machineConfigOperator: rexample.com/example/openshift-release-dev@sha256:2c3ea52ac3a41c6d58e85977c3149413e3fa4b70eb2397426456863adbf43306
7476
infra:
7577
apiVersion: config.openshift.io/v1
7678
kind: Infrastructure
7779
spec:
78-
cloudConfig:
79-
name: ""
8080
platformSpec:
81-
type: None
81+
type: GCP
82+
gcp: {}
8283
status:
83-
apiServerInternalURI: https://api-int.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
84-
apiServerURL: https://api.cnfde4.sno.ptp.lab.eng.bos.redhat.com:6443
84+
apiServerInternalURI: https://api-int.test.example.com:6443
85+
apiServerURL: https://api.test.example.com:6443
8586
cpuPartitioning: "None"
86-
controlPlaneTopology: SingleReplica
87+
controlPlaneTopology: HighlyAvailable
8788
etcdDiscoveryDomain: ""
88-
infrastructureName: cnfde4-sxhr7
89-
infrastructureTopology: SingleReplica
90-
platform: None
89+
infrastructureName: test-gcp-cluster
90+
infrastructureTopology: HighlyAvailable
91+
platform: GCP
9192
platformStatus:
92-
type: None
93-
ipFamilies: IPv6
93+
type: GCP
94+
gcp:
95+
projectID: test-project-123456
96+
region: us-central1
97+
ipFamilies: IPv4
9498
kubeAPIServerServingCAData: Y2VydGlmaWNhdGUK
9599
network: null
96100
networkType: OVNKubernetes
97101
osImageURL: example.com/example/openshift-release-dev@sha256:eacdc37aec78fdbf8caa9601e4012ab31453cf59b086474901900e853e803ea8
98-
platform: none
102+
platform: gcp
99103
proxy: null
100104
pullSecret:
101105
name: pull-secret

0 commit comments

Comments
 (0)