Skip to content

Commit f8c665c

Browse files
committed
MK8S-184 - Remove shell wrapper, execute Python script directly via shebang and defaultMode
1 parent 464b58f commit f8c665c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

salt/metalk8s/addons/prometheus-operator/deployed/oidc-proxy-alertmanager.sls

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Create oauth2-proxy-alertmanager Deployment:
6161
- name: UNIQUE_FILENAMES
6262
value: "true"
6363
- name: SCRIPT
64-
value: /scripts/restart-on-ca-change.sh
64+
value: /scripts/restart-on-ca-change.py
6565
- name: DEPLOYMENT_NAMESPACE
6666
value: metalk8s-monitoring
6767
- name: DEPLOYMENT_NAME
@@ -109,6 +109,7 @@ Create oauth2-proxy-alertmanager Deployment:
109109
- name: restart-script
110110
configMap:
111111
name: oidc-proxy-restart-script
112+
defaultMode: "0555"
112113
113114
Create oauth2-proxy-alertmanager Service:
114115
metalk8s_kubernetes.object_present:

salt/metalk8s/addons/prometheus-operator/deployed/oidc-proxy-prometheus.sls

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Create oauth2-proxy-prometheus Deployment:
6060
- name: UNIQUE_FILENAMES
6161
value: "true"
6262
- name: SCRIPT
63-
value: /scripts/restart-on-ca-change.sh
63+
value: /scripts/restart-on-ca-change.py
6464
- name: DEPLOYMENT_NAMESPACE
6565
value: metalk8s-monitoring
6666
- name: DEPLOYMENT_NAME
@@ -108,6 +108,7 @@ Create oauth2-proxy-prometheus Deployment:
108108
- name: restart-script
109109
configMap:
110110
name: oidc-proxy-restart-script
111+
defaultMode: "0555"
111112
112113
Create oauth2-proxy-prometheus Service:
113114
metalk8s_kubernetes.object_present:

salt/metalk8s/addons/prometheus-operator/deployed/oidc-proxy-restart-script.sls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ Create oidc-proxy-restart-script ConfigMap:
4646
data:
4747
restart-on-ca-change.py: |-
4848
{{ script_content | indent(12, first=True) }}
49-
restart-on-ca-change.sh: |
50-
python3 /scripts/restart-on-ca-change.py
5149

5250
{%- else %}
5351

0 commit comments

Comments
 (0)