Skip to content

Commit c512862

Browse files
version 1.6.0 and check volume in helm chart (#1452)
1 parent 711a345 commit c512862

File tree

12 files changed

+19
-15
lines changed

12 files changed

+19
-15
lines changed

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.4.0"
2+
appVersion: "1.6.0"
33
description: Use Azure Application Gateway as the ingress for an Azure Kubernetes Service cluster.
44
name: ingress-azure
5-
version: 1.4.0
5+
version: 1.6.0

helm/ingress-azure/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ spec:
9696
readOnly: true
9797
{{- end}}
9898
{{- end}}
99+
{{- if .Values.kubernetes.volumes }}
99100
{{- if .Values.kubernetes.volumes.extraVolumeMounts }}
100101
{{- toYaml .Values.kubernetes.volumes.extraVolumeMounts | nindent 8 }}
101102
{{- end }}
103+
{{- end }}
102104
volumes:
103105
- name: azure
104106
hostPath:
@@ -111,9 +113,11 @@ spec:
111113
secretName: networking-appgw-k8s-azure-service-principal
112114
{{- end}}
113115
{{- end}}
116+
{{- if .Values.kubernetes.volumes }}
114117
{{- if .Values.kubernetes.volumes.extraVolumes }}
115118
{{- toYaml .Values.kubernetes.volumes.extraVolumes | nindent 6 }}
116119
{{- end }}
120+
{{- end }}
117121
{{- if .Values.kubernetes.nodeSelector }}
118122
{{- with .Values.kubernetes.nodeSelector }}
119123
nodeSelector:

helm/ingress-azure/tests/snapshots/sample-config-empty/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.4.0
9+
chart: ingress-azure-1.6.0
1010
heritage: Helm
1111
release: release-name
1212
data:

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

Lines changed: 2 additions & 2 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.4.0
9+
chart: ingress-azure-1.6.0
1010
heritage: Helm
1111
release: release-name
1212
spec:
@@ -30,7 +30,7 @@ spec:
3030
runAsUser: 0
3131
containers:
3232
- name: ingress-azure
33-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.4.0
33+
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.6.0
3434
imagePullPolicy: Always
3535
readinessProbe:
3636
httpGet:

helm/ingress-azure/tests/snapshots/sample-config-empty/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.4.0
8+
chart: ingress-azure-1.6.0
99
heritage: Helm
1010
release: release-name
1111
name: release-name-sa-ingress-azure

helm/ingress-azure/tests/snapshots/sample-config-prohibited-target/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.4.0
9+
chart: ingress-azure-1.6.0
1010
heritage: Helm
1111
release: release-name
1212
data:

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

Lines changed: 2 additions & 2 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.4.0
9+
chart: ingress-azure-1.6.0
1010
heritage: Helm
1111
release: release-name
1212
spec:
@@ -30,7 +30,7 @@ spec:
3030
runAsUser: 0
3131
containers:
3232
- name: ingress-azure
33-
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.4.0
33+
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.6.0
3434
imagePullPolicy: Always
3535
readinessProbe:
3636
httpGet:

helm/ingress-azure/tests/snapshots/sample-config-prohibited-target/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.4.0
8+
chart: ingress-azure-1.6.0
99
heritage: Helm
1010
release: release-name
1111
name: release-name-sa-ingress-azure

helm/ingress-azure/tests/snapshots/sample-config/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.4.0
9+
chart: ingress-azure-1.6.0
1010
heritage: Helm
1111
release: release-name
1212
data:

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

Lines changed: 2 additions & 2 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.4.0
9+
chart: ingress-azure-1.6.0
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.4.0
35+
image: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:1.6.0
3636
imagePullPolicy: Always
3737
readinessProbe:
3838
httpGet:

0 commit comments

Comments
 (0)