Skip to content

Commit 4c60b1e

Browse files
authored
Bumped Azure Linux base to 3.0.20260722 and chart to 1.9.13 (#1802)
- Regenerated chart snapshots to get tests green again - Snapshot regen also removes accumulated stale cleanup-job hook manifests (leftover 1.6.0/1.9.0/1.9.5 Job copies); no functional change
1 parent f82493f commit 4c60b1e

31 files changed

Lines changed: 56 additions & 812 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ GOOS ?= linux
1616
GARCH ?= arm64
1717

1818
BUILD_BASE_IMAGE ?= golang:1.25.12-bookworm
19-
BINARY_BASE_IMAGE ?= mcr.microsoft.com/azurelinux/distroless/base:3.0.20260706
19+
BINARY_BASE_IMAGE ?= mcr.microsoft.com/azurelinux/distroless/base:3.0.20260722
2020

2121
REPO ?= appgwreg.azurecr.io
2222
IMAGE_NAME = public/azure-application-gateway/kubernetes-ingress-staging

helm/ingress-azure/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
2-
appVersion: "1.9.12"
2+
appVersion: "1.9.13"
33
description: Use Azure Application Gateway as the ingress for an Azure Kubernetes Service cluster.
44
name: ingress-azure
5-
version: 1.9.12
5+
version: 1.9.13

helm/ingress-azure/tests/snapshots/sample-config-addon/ingress-azure/templates/aadpodidentity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ metadata:
88
spec:
99
type: 0
1010
resourceID: /a/b/c
11-
clientID: 0000-0000-0000-0000-00000000
11+
clientID: 0000-0000-0000-0000-00000000

helm/ingress-azure/tests/snapshots/sample-config-addon/ingress-azure/templates/cleanup-job.yaml

Lines changed: 3 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: release-name-ingress-azure-cleanup
77
labels:
88
app: ingress-azure-cleanup
9-
chart: ingress-azure-1.6.0
9+
chart: ingress-azure-1.9.13
1010
heritage: Helm
1111
release: release-name
1212
annotations:
@@ -19,7 +19,7 @@ spec:
1919
restartPolicy: OnFailure
2020
containers:
2121
- name: cleanup
22-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.6.0
22+
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.13
2323
imagePullPolicy: Always
2424
env:
2525
- name: AGIC_POD_NAMESPACE
@@ -54,172 +54,4 @@ spec:
5454
operator: Exists
5555
tolerations:
5656
- key: CriticalAppsOnly
57-
operator: Exists---
58-
# Source: ingress-azure/templates/cleanup-job.yaml
59-
apiVersion: batch/v1
60-
kind: Job
61-
metadata:
62-
name: release-name-ingress-azure-cleanup
63-
labels:
64-
app: ingress-azure-cleanup
65-
chart: ingress-azure-1.9.0
66-
heritage: Helm
67-
release: release-name
68-
annotations:
69-
"helm.sh/hook": pre-delete
70-
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
71-
spec:
72-
template:
73-
spec:
74-
serviceAccountName: release-name-sa-ingress-azure
75-
restartPolicy: OnFailure
76-
containers:
77-
- name: cleanup
78-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.0
79-
imagePullPolicy: Always
80-
env:
81-
- name: AGIC_POD_NAMESPACE
82-
valueFrom:
83-
fieldRef:
84-
fieldPath: metadata.namespace
85-
command:
86-
- "/appgw-ingress"
87-
- "--cleanup-oec"
88-
- "app.kubernetes.io/managed-by=ingress-appgw-addon"
89-
securityContext:
90-
capabilities:
91-
drop:
92-
- ALL
93-
nodeSelector:
94-
beta.kubernetes.io/os: linux
95-
affinity:
96-
nodeAffinity:
97-
preferredDuringSchedulingIgnoredDuringExecution:
98-
- preference:
99-
matchExpressions:
100-
- key: kubernetes.cloud.com/mode
101-
operator: In
102-
values:
103-
- system
104-
weight: 100
105-
requiredDuringSchedulingIgnoredDuringExecution:
106-
nodeSelectorTerms:
107-
- labelSelector: null
108-
matchExpressions:
109-
- key: kubernetes.cloud.com/cluster
110-
operator: Exists
111-
tolerations:
112-
- key: CriticalAppsOnly
113-
operator: Exists---
114-
# Source: ingress-azure/templates/cleanup-job.yaml
115-
apiVersion: batch/v1
116-
kind: Job
117-
metadata:
118-
name: release-name-ingress-azure-cleanup
119-
labels:
120-
app: ingress-azure-cleanup
121-
chart: ingress-azure-1.9.5
122-
heritage: Helm
123-
release: release-name
124-
annotations:
125-
"helm.sh/hook": pre-delete
126-
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
127-
spec:
128-
template:
129-
spec:
130-
serviceAccountName: release-name-sa-ingress-azure
131-
restartPolicy: OnFailure
132-
containers:
133-
- name: cleanup
134-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.5
135-
imagePullPolicy: Always
136-
env:
137-
- name: AGIC_POD_NAMESPACE
138-
valueFrom:
139-
fieldRef:
140-
fieldPath: metadata.namespace
141-
command:
142-
- "/appgw-ingress"
143-
- "--cleanup-oec"
144-
- "app.kubernetes.io/managed-by=ingress-appgw-addon"
145-
securityContext:
146-
capabilities:
147-
drop:
148-
- ALL
149-
nodeSelector:
150-
beta.kubernetes.io/os: linux
151-
affinity:
152-
nodeAffinity:
153-
preferredDuringSchedulingIgnoredDuringExecution:
154-
- preference:
155-
matchExpressions:
156-
- key: kubernetes.cloud.com/mode
157-
operator: In
158-
values:
159-
- system
160-
weight: 100
161-
requiredDuringSchedulingIgnoredDuringExecution:
162-
nodeSelectorTerms:
163-
- labelSelector: null
164-
matchExpressions:
165-
- key: kubernetes.cloud.com/cluster
166-
operator: Exists
167-
tolerations:
168-
- key: CriticalAppsOnly
169-
operator: Exists---
170-
# Source: ingress-azure/templates/cleanup-job.yaml
171-
apiVersion: batch/v1
172-
kind: Job
173-
metadata:
174-
name: release-name-ingress-azure-cleanup
175-
labels:
176-
app: ingress-azure-cleanup
177-
chart: ingress-azure-1.9.11
178-
heritage: Helm
179-
release: release-name
180-
annotations:
181-
"helm.sh/hook": pre-delete
182-
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
183-
spec:
184-
template:
185-
spec:
186-
serviceAccountName: release-name-sa-ingress-azure
187-
restartPolicy: OnFailure
188-
containers:
189-
- name: cleanup
190-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.11
191-
imagePullPolicy: Always
192-
env:
193-
- name: AGIC_POD_NAMESPACE
194-
valueFrom:
195-
fieldRef:
196-
fieldPath: metadata.namespace
197-
command:
198-
- "/appgw-ingress"
199-
- "--cleanup-oec"
200-
- "app.kubernetes.io/managed-by=ingress-appgw-addon"
201-
securityContext:
202-
capabilities:
203-
drop:
204-
- ALL
205-
nodeSelector:
206-
beta.kubernetes.io/os: linux
207-
affinity:
208-
nodeAffinity:
209-
preferredDuringSchedulingIgnoredDuringExecution:
210-
- preference:
211-
matchExpressions:
212-
- key: kubernetes.cloud.com/mode
213-
operator: In
214-
values:
215-
- system
216-
weight: 100
217-
requiredDuringSchedulingIgnoredDuringExecution:
218-
nodeSelectorTerms:
219-
- labelSelector: null
220-
matchExpressions:
221-
- key: kubernetes.cloud.com/cluster
222-
operator: Exists
223-
tolerations:
224-
- key: CriticalAppsOnly
225-
operator: Exists
57+
operator: Exists

helm/ingress-azure/tests/snapshots/sample-config-addon/ingress-azure/templates/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: release-name-cm-ingress-azure
77
labels:
88
app: ingress-azure
9-
chart: ingress-azure-1.9.11
9+
chart: ingress-azure-1.9.13
1010
heritage: Helm
1111
release: release-name
1212
data:

helm/ingress-azure/tests/snapshots/sample-config-addon/ingress-azure/templates/deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: release-name-ingress-azure
77
labels:
88
app: ingress-azure
9-
chart: ingress-azure-1.9.11
9+
chart: ingress-azure-1.9.13
1010
heritage: Helm
1111
release: release-name
1212
spec:
@@ -32,7 +32,7 @@ spec:
3232
runAsUser: 3000
3333
containers:
3434
- name: ingress-azure
35-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.11
35+
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.13
3636
imagePullPolicy: Always
3737
readinessProbe:
3838
httpGet:
@@ -105,4 +105,4 @@ spec:
105105
operator: Exists
106106
tolerations:
107107
- key: CriticalAppsOnly
108-
operator: Exists
108+
operator: Exists

helm/ingress-azure/tests/snapshots/sample-config-addon/ingress-azure/templates/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
labels:
77
app: ingress-azure
8-
chart: ingress-azure-1.9.11
8+
chart: ingress-azure-1.9.13
99
heritage: Helm
1010
release: release-name
1111
name: release-name-sa-ingress-azure

helm/ingress-azure/tests/snapshots/sample-config-empty/ingress-azure/templates/aadpodidentity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ metadata:
88
spec:
99
type: 0
1010
resourceID: /a/b/c
11-
clientID: 0000-0000-0000-0000-00000000
11+
clientID: 0000-0000-0000-0000-00000000

helm/ingress-azure/tests/snapshots/sample-config-empty/ingress-azure/templates/cleanup-job.yaml

Lines changed: 3 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: release-name-ingress-azure-cleanup
77
labels:
88
app: ingress-azure-cleanup
9-
chart: ingress-azure-1.6.0
9+
chart: ingress-azure-1.9.13
1010
heritage: Helm
1111
release: release-name
1212
annotations:
@@ -19,7 +19,7 @@ spec:
1919
restartPolicy: OnFailure
2020
containers:
2121
- name: cleanup
22-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.6.0
22+
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.13
2323
imagePullPolicy: Always
2424
env:
2525
- name: AGIC_POD_NAMESPACE
@@ -33,109 +33,4 @@ spec:
3333
securityContext:
3434
capabilities:
3535
drop:
36-
- ALL---
37-
# Source: ingress-azure/templates/cleanup-job.yaml
38-
apiVersion: batch/v1
39-
kind: Job
40-
metadata:
41-
name: release-name-ingress-azure-cleanup
42-
labels:
43-
app: ingress-azure-cleanup
44-
chart: ingress-azure-1.9.0
45-
heritage: Helm
46-
release: release-name
47-
annotations:
48-
"helm.sh/hook": pre-delete
49-
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
50-
spec:
51-
template:
52-
spec:
53-
serviceAccountName: release-name-sa-ingress-azure
54-
restartPolicy: OnFailure
55-
containers:
56-
- name: cleanup
57-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.0
58-
imagePullPolicy: Always
59-
env:
60-
- name: AGIC_POD_NAMESPACE
61-
valueFrom:
62-
fieldRef:
63-
fieldPath: metadata.namespace
64-
command:
65-
- "/appgw-ingress"
66-
- "--cleanup-oec"
67-
- "app.kubernetes.io/managed-by=ingress-appgw-helm"
68-
securityContext:
69-
capabilities:
70-
drop:
71-
- ALL---
72-
# Source: ingress-azure/templates/cleanup-job.yaml
73-
apiVersion: batch/v1
74-
kind: Job
75-
metadata:
76-
name: release-name-ingress-azure-cleanup
77-
labels:
78-
app: ingress-azure-cleanup
79-
chart: ingress-azure-1.9.5
80-
heritage: Helm
81-
release: release-name
82-
annotations:
83-
"helm.sh/hook": pre-delete
84-
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
85-
spec:
86-
template:
87-
spec:
88-
serviceAccountName: release-name-sa-ingress-azure
89-
restartPolicy: OnFailure
90-
containers:
91-
- name: cleanup
92-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.5
93-
imagePullPolicy: Always
94-
env:
95-
- name: AGIC_POD_NAMESPACE
96-
valueFrom:
97-
fieldRef:
98-
fieldPath: metadata.namespace
99-
command:
100-
- "/appgw-ingress"
101-
- "--cleanup-oec"
102-
- "app.kubernetes.io/managed-by=ingress-appgw-helm"
103-
securityContext:
104-
capabilities:
105-
drop:
106-
- ALL---
107-
# Source: ingress-azure/templates/cleanup-job.yaml
108-
apiVersion: batch/v1
109-
kind: Job
110-
metadata:
111-
name: release-name-ingress-azure-cleanup
112-
labels:
113-
app: ingress-azure-cleanup
114-
chart: ingress-azure-1.9.11
115-
heritage: Helm
116-
release: release-name
117-
annotations:
118-
"helm.sh/hook": pre-delete
119-
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
120-
spec:
121-
template:
122-
spec:
123-
serviceAccountName: release-name-sa-ingress-azure
124-
restartPolicy: OnFailure
125-
containers:
126-
- name: cleanup
127-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.9.11
128-
imagePullPolicy: Always
129-
env:
130-
- name: AGIC_POD_NAMESPACE
131-
valueFrom:
132-
fieldRef:
133-
fieldPath: metadata.namespace
134-
command:
135-
- "/appgw-ingress"
136-
- "--cleanup-oec"
137-
- "app.kubernetes.io/managed-by=ingress-appgw-helm"
138-
securityContext:
139-
capabilities:
140-
drop:
141-
- ALL
36+
- ALL

0 commit comments

Comments
 (0)