Skip to content

Commit 6dd622f

Browse files
committed
OCPBUGS-30090: manifests: make template manifests valid YAML
CVO manifests are applied by CVO itself, which processes them through the templating engine, which makes them valid YAML. In an attempt to address OCPBUGS-30090, I want to process the CVO manifests through `oc adm release new` machinery, which requires them to be valid YAML.
1 parent 4ec8c48 commit 6dd622f

2 files changed

+3
-4
lines changed

install/0000_00_cluster-version-operator_03_deployment.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
automountServiceAccountToken: false
2626
containers:
2727
- name: cluster-version-operator
28-
image: {{.ReleaseImage}}
28+
image: "{{.ReleaseImage}}"
2929
imagePullPolicy: IfNotPresent
3030
args:
3131
- "start"
@@ -58,7 +58,6 @@ spec:
5858
name: kube-api-access
5959
readOnly: true
6060
env:
61-
# Unfortunately the placeholder is not replaced, reported as OCPBUGS-30080
6261
- name: OPERATOR_IMAGE_VERSION
6362
value: "0.0.1-snapshot"
6463
- name: KUBERNETES_SERVICE_PORT # allows CVO to communicate with apiserver directly on same host. Is substituted with port from infrastructures.status.apiServerInternalURL if available.
@@ -70,7 +69,7 @@ spec:
7069
fieldRef:
7170
fieldPath: spec.nodeName
7271
- name: CLUSTER_PROFILE
73-
value: {{ .ClusterProfile }}
72+
value: "{{ .ClusterProfile }}"
7473
# this pod is hostNetwork and uses the internal LB DNS name when possible, which the kubelet also uses.
7574
# this dnsPolicy allows us to use the same dnsConfig as the kubelet, without access to read it ourselves.
7675
dnsPolicy: Default

install/0000_00_update-status-controller_03_deployment-DevPreviewNoUpgrade.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
runAsNonRoot: true
2727
containers:
2828
- name: update-status-controller
29-
image: {{.ReleaseImage}}
29+
image: "{{.ReleaseImage}}"
3030
imagePullPolicy: IfNotPresent
3131
args:
3232
- "update-status-controller"

0 commit comments

Comments
 (0)