Skip to content

Commit b18a36c

Browse files
committed
Bumped aad-pod-identity chart to v4.0.0
1 parent f02d1f3 commit b18a36c

File tree

3 files changed

+40
-20
lines changed

3 files changed

+40
-20
lines changed

terraform/aad_pod_identity_helm.tf

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,7 @@ resource "helm_release" "aad_pod_identity" {
5151
data.template_file.azureIdentities.rendered
5252
]
5353

54-
# should only be required for helm v2
55-
set {
56-
name = "installCRDs"
57-
value = "false"
58-
}
59-
60-
# allow Kubenet: https://azure.github.io/aad-pod-identity/docs/configure/aad_pod_identity_on_kubenet/
54+
# enable if using Kubenet: https://azure.github.io/aad-pod-identity/docs/configure/aad_pod_identity_on_kubenet/
6155
set {
6256
name = "nmi.allowNetworkPluginKubenet"
6357
value = "false"

terraform/helm/aad_pod_identity_values.yaml

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# source: https://github.com/Azure/aad-pod-identity/blob/v1.7.1/charts/aad-pod-identity/values.yaml
1+
# source: https://github.com/Azure/aad-pod-identity/blob/v1.7.5/charts/aad-pod-identity/values.yaml
22

33
# Default values for aad-pod-identity-helm.
44
# This is a YAML-formatted file.
@@ -15,12 +15,6 @@ image:
1515
# imagePullSecrets:
1616
# - name: myRegistryKeySecretName
1717

18-
# https://github.com/Azure/aad-pod-identity#4-optional-match-pods-in-the-namespace
19-
# By default, AAD Pod Identity matches pods to identities across namespaces.
20-
# To match only pods in the namespace containing AzureIdentity set this to true.
21-
# DEPRECATED - use 'forceNamespaced' instead.
22-
forceNameSpaced: ""
23-
2418
# https://github.com/Azure/aad-pod-identity#4-optional-match-pods-in-the-namespace
2519
# By default, AAD Pod Identity matches pods to identities across namespaces.
2620
# To match only pods in the namespace containing AzureIdentity set this to true.
@@ -51,8 +45,9 @@ operationMode: "standard"
5145

5246
mic:
5347
image: mic
54-
tag: v1.7.1
48+
tag: v1.7.5
5549

50+
# ref: https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical
5651
priorityClassName: ""
5752

5853
# log level. Uses V logs (klog)
@@ -69,14 +64,28 @@ mic:
6964

7065
podAnnotations: {}
7166

67+
podLabels: {}
68+
7269
## Node labels for pod assignment
7370
## aad-pod-identity is currently only supported on linux
7471
nodeSelector:
7572
kubernetes.io/os: linux
7673

7774
tolerations: []
75+
# - key: "CriticalAddonsOnly"
76+
# operator: "Exists"
7877

78+
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
7979
affinity: {}
80+
# nodeAffinity:
81+
# preferredDuringSchedulingIgnoredDuringExecution:
82+
# - weight 1
83+
# preference:
84+
# matchExpressions:
85+
# - key: kubernetes.azure.com/mode
86+
# operator: In
87+
# values:
88+
# - system
8089

8190
# Topology spread constraints rely on node labels to identify the topology domain(s) that each Node is in.
8291
# ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
@@ -147,8 +156,9 @@ mic:
147156

148157
nmi:
149158
image: nmi
150-
tag: v1.7.1
159+
tag: v1.7.5
151160

161+
# ref: https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical
152162
priorityClassName: ""
153163

154164
# log level. Uses V logs (klog)
@@ -165,14 +175,28 @@ nmi:
165175

166176
podAnnotations: {}
167177

178+
podLabels: {}
179+
168180
## Node labels for pod assignment
169181
## aad-pod-identity is currently only supported on linux
170182
nodeSelector:
171183
kubernetes.io/os: linux
172184

173185
tolerations: []
186+
# - key: "CriticalAddonsOnly"
187+
# operator: "Exists"
174188

189+
# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
175190
affinity: {}
191+
# nodeAffinity:
192+
# preferredDuringSchedulingIgnoredDuringExecution:
193+
# - weight 1
194+
# preference:
195+
# matchExpressions:
196+
# - key: kubernetes.azure.com/mode
197+
# operator: In
198+
# values:
199+
# - system
176200

177201
# Override iptables update interval in seconds (default is 60)
178202
ipTableUpdateTimeIntervalInSeconds: ""
@@ -221,6 +245,7 @@ rbac:
221245
# NMI requires permissions to get secrets when service principal (type: 1) is used in AzureIdentity.
222246
# If using only MSI (type: 0) in AzureIdentity, secret get permission can be disabled by setting this to false.
223247
allowAccessToSecrets: true
248+
pspEnabled: false
224249

225250
# Create azure identities and bindings
226251
# This is a map with the AzureIdentityName being the key and the rest of the blob as value in accordance
@@ -247,5 +272,6 @@ azureIdentities:
247272
# # The selector will also need to be included in labels for app deployment
248273
# selector: "demo"
249274

250-
# If true, install necessary custom resources.
251-
installCRDs: false
275+
# If provided, the userAgent string will be appended to the pod identity user agents for all
276+
# ADAL, ARM and Kube API server requests.
277+
customUserAgent: ""

terraform/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ variable "akv2k8s_chart_version" {
6565
# https://github.com/Azure/aad-pod-identity/blob/master/charts/aad-pod-identity/Chart.yaml#L4
6666
# helm search repo aad-pod-identity/aad-pod-identity
6767
variable "aad_pod_identity_chart_version" {
68-
default = "3.0.3"
68+
default = "4.0.0"
6969
}
7070

7171
# https://bitnami.com/stack/external-dns/helm
@@ -78,7 +78,7 @@ variable "external_dns_chart_version" {
7878
# https://github.com/weaveworks/kured/tree/master/charts/kured
7979
# helm search repo kured/kured
8080
variable "kured_chart_version" {
81-
default = "2.4.0"
81+
default = "2.4.1"
8282
}
8383

8484
# https://github.com/weaveworks/kured#kubernetes--os-compatibility

0 commit comments

Comments
 (0)