Skip to content

Commit feb36be

Browse files
committed
fix salt issue
1 parent 8cfa2b7 commit feb36be

File tree

3 files changed

+4
-26
lines changed

3 files changed

+4
-26
lines changed

salt/metalk8s/addons/shell-ui/deployed/ui-operator-cr.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Update ScalityUI for control plane:
5555
- name: shell-ui-cp
5656
- kind: ScalityUI
5757
- apiVersion: ui.scality.com/v1alpha1
58+
- namespace: metalk8s-ui
5859
- patch:
5960
spec:
6061
image: {{ shell_ui_image }}
@@ -115,6 +116,7 @@ Update ScalityUI for workload plane:
115116
- name: shell-ui-wp
116117
- kind: ScalityUI
117118
- apiVersion: ui.scality.com/v1alpha1
119+
- namespace: metalk8s-ui
118120
- patch:
119121
spec:
120122
image: {{ shell_ui_image }}

salt/metalk8s/addons/ui-operator/deployed/manifests.sls

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
{%- from "metalk8s/repo/macro.sls" import build_image_name with context %}
22
3-
include:
4-
- .namespace
5-
63
{%- set ui_operator_image = build_image_name('ui-operator') %}
74
8-
{%- set ui_operator = salt.metalk8s_kubernetes.get_object(
9-
kind='Deployment',
10-
apiVersion='apps/v1',
11-
namespace='metalk8s-ui',
12-
name='ui-operator',
13-
)
14-
%}
15-
16-
{%- if ui_operator is none %}
175
Deploy UI Operator:
186
metalk8s_kubernetes.object_present:
197
- manifest:
@@ -84,17 +72,4 @@ Deploy UI Operator:
8472
- ALL
8573
securityContext:
8674
runAsNonRoot: true
87-
terminationGracePeriodSeconds: 10
88-
- require:
89-
- sls: metalk8s.addons.ui-operator.deployed.namespace
90-
{%- else %}
91-
92-
Update UI Operator:
93-
metalk8s_kubernetes.object_updated:
94-
- name: ui-operator
95-
- kind: Deployment
96-
- apiVersion: apps/v1
97-
- patch:
98-
spec:
99-
image: {{ ui_operator_image }}
100-
{%- endif %}
75+
terminationGracePeriodSeconds: 10

salt/metalk8s/addons/ui/deployed/ui-operator-cr.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Update metalk8s-ui ScalityUIComponent:
3131
- name: metalk8s-ui
3232
- kind: ScalityUIComponent
3333
- apiVersion: ui.scality.com/v1alpha1
34+
- namespace: metalk8s-ui
3435
- patch:
3536
spec:
3637
image: {{ metalk8s_ui_image }}

0 commit comments

Comments
 (0)