Skip to content

Commit 050f450

Browse files
maxbrunetmaxbrunet
committed
fix(charts): update 4-year outdated kubectl image
1 parent 3b18d9a commit 050f450

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

‎charts/emissary-ingress/templates/deployment-canary.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ spec:
113113
initContainers:
114114
{{- if and .Values.waitForApiext (eq .Values.waitForApiext.enabled true) }}
115115
- name: wait-for-apiext
116-
image: istio/kubectl:1.5.10
116+
image: public.ecr.aws/bitnami/kubectl:1.30.0
117117
imagePullPolicy: IfNotPresent
118118
{{- with .Values.waitForApiext.securityContext }}
119119
securityContext:
@@ -122,6 +122,7 @@ spec:
122122
command: ["/bin/sh", "-c"]
123123
args:
124124
- |
125+
set -eu
125126
deployment_name={{ .Values.waitForApiext.deploymentName | default "emissary-apiext" | quote }}
126127
deployment_namespace={{ .Values.waitForApiext.deploymentNamespace | default "emissary-system" | quote }}
127128
while true; do
@@ -135,7 +136,7 @@ spec:
135136
while true; do
136137
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
137138
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
138-
if [[ $current_replicas != $desired_replicas ]]; then
139+
if [ $current_replicas != $desired_replicas ]; then
139140
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
140141
sleep 3
141142
else

‎charts/emissary-ingress/templates/deployment.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ spec:
134134
initContainers:
135135
{{- if and .Values.waitForApiext (eq .Values.waitForApiext.enabled true) }}
136136
- name: wait-for-apiext
137-
image: istio/kubectl:1.5.10
137+
image: public.ecr.aws/bitnami/kubectl:1.30.0
138138
imagePullPolicy: IfNotPresent
139139
{{- with .Values.waitForApiext.securityContext }}
140140
securityContext:
@@ -143,6 +143,7 @@ spec:
143143
command: ["/bin/sh", "-c"]
144144
args:
145145
- |
146+
set -eu
146147
deployment_name={{ .Values.waitForApiext.deploymentName | default "emissary-apiext" | quote }}
147148
deployment_namespace={{ .Values.waitForApiext.deploymentNamespace | default "emissary-system" | quote }}
148149
while true; do
@@ -156,7 +157,7 @@ spec:
156157
while true; do
157158
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
158159
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
159-
if [[ $current_replicas != $desired_replicas ]]; then
160+
if [ $current_replicas != $desired_replicas ]; then
160161
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
161162
sleep 3
162163
else

‎manifests/emissary/emissary-defaultns.yaml.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ spec:
321321
initContainers:
322322
- args:
323323
- |
324+
set -eu
324325
deployment_name="emissary-apiext"
325326
deployment_namespace="emissary-system"
326327
while true; do
@@ -334,7 +335,7 @@ spec:
334335
while true; do
335336
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
336337
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
337-
if [[ $current_replicas != $desired_replicas ]]; then
338+
if [ $current_replicas != $desired_replicas ]; then
338339
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
339340
sleep 3
340341
else
@@ -354,7 +355,7 @@ spec:
354355
command:
355356
- /bin/sh
356357
- -c
357-
image: istio/kubectl:1.5.10
358+
image: public.ecr.aws/bitnami/kubectl:1.30.0
358359
imagePullPolicy: IfNotPresent
359360
name: wait-for-apiext
360361
securityContext:

‎manifests/emissary/emissary-emissaryns.yaml.in‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ spec:
321321
initContainers:
322322
- args:
323323
- |
324+
set -eu
324325
deployment_name="emissary-apiext"
325326
deployment_namespace="emissary-system"
326327
while true; do
@@ -334,7 +335,7 @@ spec:
334335
while true; do
335336
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
336337
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
337-
if [[ $current_replicas != $desired_replicas ]]; then
338+
if [ $current_replicas != $desired_replicas ]; then
338339
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
339340
sleep 3
340341
else
@@ -354,7 +355,7 @@ spec:
354355
command:
355356
- /bin/sh
356357
- -c
357-
image: istio/kubectl:1.5.10
358+
image: public.ecr.aws/bitnami/kubectl:1.30.0
358359
imagePullPolicy: IfNotPresent
359360
name: wait-for-apiext
360361
securityContext:

‎python/tests/integration/manifests/ambassador.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ spec:
189189
initContainers:
190190
- args:
191191
- |
192+
set -eu
192193
deployment_name="emissary-apiext"
193194
deployment_namespace="emissary-system"
194195
while true; do
@@ -202,7 +203,7 @@ spec:
202203
while true; do
203204
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
204205
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
205-
if [[ $current_replicas != $desired_replicas ]]; then
206+
if [ $current_replicas != $desired_replicas ]; then
206207
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
207208
sleep 3
208209
else
@@ -222,7 +223,7 @@ spec:
222223
command:
223224
- /bin/sh
224225
- -c
225-
image: istio/kubectl:1.5.10
226+
image: public.ecr.aws/bitnami/kubectl:1.30.0
226227
imagePullPolicy: IfNotPresent
227228
name: wait-for-apiext
228229
securityContext:

0 commit comments

Comments
 (0)