Skip to content

Commit b2ad603

Browse files
committed
Propagate RELATED_IMAGE to openstack-baremetal-operator
This should resolve a regression since the new initialization resource was implemented where provision server is missing default settings from the openstack-operator CSV Jira: OSPRH-17188
1 parent 461d8b4 commit b2ad603

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

bindata/operator/managers.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{{ $leaseDuration := .LeaseDuration }}
44
{{ $renewDeadline := .RenewDeadline }}
55
{{ $retryPeriod := .RetryPeriod }}
6+
{{ $openstackServiceRelatedImages := .OpenStackServiceRelatedImages }}
67
{{ range $operatorName, $operatorImage := .OperatorImages }}
78
apiVersion: apps/v1
89
kind: Deployment
@@ -45,6 +46,12 @@ spec:
4546
value: '{{ $renewDeadline }}'
4647
- name: RETRY_PERIOD
4748
value: '{{ $retryPeriod }}'
49+
{{ if (eq $operatorName "openstack-baremetal") }}
50+
{{ range $envName, $envValue := $openstackServiceRelatedImages }}
51+
- name: {{ $envName }}
52+
value: {{ $envValue }}
53+
{{ end }}
54+
{{ end }}
4855
image: {{ $operatorImage }}
4956
livenessProbe:
5057
httpGet:

config/operator/managers.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{{ $leaseDuration := .LeaseDuration }}
44
{{ $renewDeadline := .RenewDeadline }}
55
{{ $retryPeriod := .RetryPeriod }}
6+
{{ $openstackServiceRelatedImages := .OpenStackServiceRelatedImages }}
67
{{ range $operatorName, $operatorImage := .OperatorImages }}
78
apiVersion: apps/v1
89
kind: Deployment
@@ -45,6 +46,12 @@ spec:
4546
value: '{{ $renewDeadline }}'
4647
- name: RETRY_PERIOD
4748
value: '{{ $retryPeriod }}'
49+
{{ if (eq $operatorName "openstack-baremetal") }}
50+
{{ range $envName, $envValue := $openstackServiceRelatedImages }}
51+
- name: {{ $envName }}
52+
value: {{ $envValue }}
53+
{{ end }}
54+
{{ end }}
4855
image: {{ $operatorImage }}
4956
livenessProbe:
5057
httpGet:

0 commit comments

Comments
 (0)