Skip to content

Commit 4f089ea

Browse files
committed
fixup! features: add installer replacement feature gates
1 parent 0339e56 commit 4f089ea

File tree

2 files changed

+105
-1
lines changed

2 files changed

+105
-1
lines changed

machineconfiguration/v1/tests/controllerconfigs.machineconfiguration.openshift.io/AWSClusterHostedDNS.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if w
22
name: "Shamefully missing"
33
crdName: controllerconfigs.machineconfiguration.openshift.io
44
featureGates:
5-
- AWSClusterHostedDNS
5+
- AWSClusterHostedDNSInstall
66
tests:
77
onCreate:
88
- name: Should be able to create a minimal ControllerConfig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
2+
name: "AWSClusterHostedDNSInstall ControllerConfig"
3+
crdName: controllerconfigs.machineconfiguration.openshift.io
4+
featureGates:
5+
- AWSClusterHostedDNSInstall
6+
tests:
7+
onCreate:
8+
- name: Should be able to create a minimal ControllerConfig
9+
initial: |
10+
apiVersion: machineconfiguration.openshift.io/v1
11+
kind: ControllerConfig
12+
spec:
13+
additionalTrustBundle: Y2VydGlmaWNhdGUK
14+
baseOSContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
15+
baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
16+
cloudProviderCAData: null
17+
cloudProviderConfig: ""
18+
clusterDNSIP: fd02::a
19+
dns:
20+
apiVersion: config.openshift.io/v1
21+
kind: DNS
22+
spec:
23+
baseDomain: fake.redhat.com
24+
images:
25+
machineConfigOperator: rexample.com/example/openshift-release-dev@sha256:2c3ea52ac3a41c6d58e85977c3149413e3fa4b70eb2397426456863adbf43306
26+
infra:
27+
apiVersion: config.openshift.io/v1
28+
kind: Infrastructure
29+
spec:
30+
cloudConfig:
31+
name: ""
32+
platformSpec:
33+
type: None
34+
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
37+
cpuPartitioning: "None"
38+
controlPlaneTopology: SingleReplica
39+
etcdDiscoveryDomain: ""
40+
infrastructureName: cnfde4-sxhr7
41+
infrastructureTopology: SingleReplica
42+
platform: None
43+
platformStatus:
44+
type: None
45+
ipFamilies: IPv6
46+
kubeAPIServerServingCAData: Y2VydGlmaWNhdGUK
47+
network: null
48+
networkType: OVNKubernetes
49+
osImageURL: example.com/example/openshift-release-dev@sha256:eacdc37aec78fdbf8caa9601e4012ab31453cf59b086474901900e853e803ea8
50+
platform: none
51+
proxy: null
52+
pullSecret:
53+
name: pull-secret
54+
namespace: openshift-config
55+
releaseImage: ""
56+
rootCAData: Y2VydGlmaWNhdGUK
57+
expected: |
58+
apiVersion: machineconfiguration.openshift.io/v1
59+
kind: ControllerConfig
60+
spec:
61+
additionalTrustBundle: Y2VydGlmaWNhdGUK
62+
baseOSContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
63+
baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
64+
cloudProviderCAData: null
65+
cloudProviderConfig: ""
66+
clusterDNSIP: fd02::a
67+
dns:
68+
apiVersion: config.openshift.io/v1
69+
kind: DNS
70+
spec:
71+
baseDomain: fake.redhat.com
72+
images:
73+
machineConfigOperator: rexample.com/example/openshift-release-dev@sha256:2c3ea52ac3a41c6d58e85977c3149413e3fa4b70eb2397426456863adbf43306
74+
infra:
75+
apiVersion: config.openshift.io/v1
76+
kind: Infrastructure
77+
spec:
78+
cloudConfig:
79+
name: ""
80+
platformSpec:
81+
type: None
82+
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
85+
cpuPartitioning: "None"
86+
controlPlaneTopology: SingleReplica
87+
etcdDiscoveryDomain: ""
88+
infrastructureName: cnfde4-sxhr7
89+
infrastructureTopology: SingleReplica
90+
platform: None
91+
platformStatus:
92+
type: None
93+
ipFamilies: IPv6
94+
kubeAPIServerServingCAData: Y2VydGlmaWNhdGUK
95+
network: null
96+
networkType: OVNKubernetes
97+
osImageURL: example.com/example/openshift-release-dev@sha256:eacdc37aec78fdbf8caa9601e4012ab31453cf59b086474901900e853e803ea8
98+
platform: none
99+
proxy: null
100+
pullSecret:
101+
name: pull-secret
102+
namespace: openshift-config
103+
releaseImage: ""
104+
rootCAData: Y2VydGlmaWNhdGUK

0 commit comments

Comments
 (0)