Skip to content

fix(charts): update 4-year outdated kubectl image #5681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(charts): update 4-year outdated kubectl image #5681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions charts/emissary-ingress/templates/deployment-canary.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
initContainers:
{{- if and .Values.waitForApiext (eq .Values.waitForApiext.enabled true) }}
- name: wait-for-apiext
image: istio/kubectl:1.5.10
image: public.ecr.aws/bitnami/kubectl:1.30.0
imagePullPolicy: IfNotPresent
{{- with .Values.waitForApiext.securityContext }}
securityContext:
Expand All @@ -122,6 +122,7 @@ spec:
command: ["/bin/sh", "-c"]
args:
- |
set -eu
deployment_name={{ .Values.waitForApiext.deploymentName | default "emissary-apiext" | quote }}
deployment_namespace={{ .Values.waitForApiext.deploymentNamespace | default "emissary-system" | quote }}
while true; do
Expand All @@ -135,7 +136,7 @@ spec:
while true; do
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
if [[ $current_replicas != $desired_replicas ]]; then
if [ $current_replicas != $desired_replicas ]; then
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
sleep 3
else
Expand Down
5 changes: 3 additions & 2 deletions charts/emissary-ingress/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ spec:
initContainers:
{{- if and .Values.waitForApiext (eq .Values.waitForApiext.enabled true) }}
- name: wait-for-apiext
image: istio/kubectl:1.5.10
image: public.ecr.aws/bitnami/kubectl:1.30.0
imagePullPolicy: IfNotPresent
{{- with .Values.waitForApiext.securityContext }}
securityContext:
Expand All @@ -143,6 +143,7 @@ spec:
command: ["/bin/sh", "-c"]
args:
- |
set -eu
deployment_name={{ .Values.waitForApiext.deploymentName | default "emissary-apiext" | quote }}
deployment_namespace={{ .Values.waitForApiext.deploymentNamespace | default "emissary-system" | quote }}
while true; do
Expand All @@ -156,7 +157,7 @@ spec:
while true; do
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
if [[ $current_replicas != $desired_replicas ]]; then
if [ $current_replicas != $desired_replicas ]; then
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
sleep 3
else
Expand Down
5 changes: 3 additions & 2 deletions manifests/emissary/emissary-defaultns.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ spec:
initContainers:
- args:
- |
set -eu
deployment_name="emissary-apiext"
deployment_namespace="emissary-system"
while true; do
Expand All @@ -334,7 +335,7 @@ spec:
while true; do
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
if [[ $current_replicas != $desired_replicas ]]; then
if [ $current_replicas != $desired_replicas ]; then
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
sleep 3
else
Expand All @@ -354,7 +355,7 @@ spec:
command:
- /bin/sh
- -c
image: istio/kubectl:1.5.10
image: public.ecr.aws/bitnami/kubectl:1.30.0
imagePullPolicy: IfNotPresent
name: wait-for-apiext
securityContext:
Expand Down
5 changes: 3 additions & 2 deletions manifests/emissary/emissary-emissaryns.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ spec:
initContainers:
- args:
- |
set -eu
deployment_name="emissary-apiext"
deployment_namespace="emissary-system"
while true; do
Expand All @@ -334,7 +335,7 @@ spec:
while true; do
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
if [[ $current_replicas != $desired_replicas ]]; then
if [ $current_replicas != $desired_replicas ]; then
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
sleep 3
else
Expand All @@ -354,7 +355,7 @@ spec:
command:
- /bin/sh
- -c
image: istio/kubectl:1.5.10
image: public.ecr.aws/bitnami/kubectl:1.30.0
imagePullPolicy: IfNotPresent
name: wait-for-apiext
securityContext:
Expand Down
5 changes: 3 additions & 2 deletions python/tests/integration/manifests/ambassador.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ spec:
initContainers:
- args:
- |
set -eu
deployment_name="emissary-apiext"
deployment_namespace="emissary-system"
while true; do
Expand All @@ -202,7 +203,7 @@ spec:
while true; do
desired_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.spec.replicas}')
current_replicas=$(kubectl get deployment $deployment_name -n $deployment_namespace -o jsonpath='{.status.replicas}')
if [[ $current_replicas != $desired_replicas ]]; then
if [ $current_replicas != $desired_replicas ]; then
echo "$deployment_name.$deployment_namespace is in the process of restarting. Have: $current_replicas, want $desired_replicas"
sleep 3
else
Expand All @@ -222,7 +223,7 @@ spec:
command:
- /bin/sh
- -c
image: istio/kubectl:1.5.10
image: public.ecr.aws/bitnami/kubectl:1.30.0
imagePullPolicy: IfNotPresent
name: wait-for-apiext
securityContext:
Expand Down