release: update manifest and helm charts for v0.5.0 (#183)

* release: update manifest and helm charts for v0.5.0 * fix: install the latest released charts from gh-pages Signed-off-by: GitHub <[email protected]> Co-authored-by: chewong <[email protected]> Co-authored-by: Ernest Wong <[email protected]>
Azure · Sep 28, 2021 · fc1c981 · fc1c981
1 parent ac22d57
commit fc1c981
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ REGISTRY ?= mcr.microsoft.com/oss/azure/workload-identity
 PROXY_IMAGE_NAME := proxy
 INIT_IMAGE_NAME := proxy-init
 WEBHOOK_IMAGE_NAME := webhook
-IMAGE_VERSION ?= v0.4.0
+IMAGE_VERSION ?= v0.5.0
 
 ORG_PATH := github.com/Azure
 PROJECT_NAME := azure-workload-identity

diff --git a/charts/workload-identity-webhook/Chart.yaml b/charts/workload-identity-webhook/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: workload-identity-webhook
 description: A Helm chart to install the azure-workload-identity webhook
 type: application
-version: 0.4.0
-appVersion: v0.4.0
+version: 0.5.0
+appVersion: v0.5.0
 home: https://github.com/Azure/azure-workload-identity
 sources:
   - https://github.com/Azure/azure-workload-identity
diff --git a/charts/workload-identity-webhook/README.md b/charts/workload-identity-webhook/README.md
@@ -32,10 +32,10 @@ helm upgrade -n azure-workload-identity-system [RELEASE_NAME] azure-workload-ide
 | Parameter          | Description                                                              | Default                                                 |
 | :----------------- | :----------------------------------------------------------------------- | :------------------------------------------------------ |
 | labels             | The labels to add to the azure-workload-identity webhook pods            | `azure-workload-identity.io/system: "true"`             |
-| replicaCount       | The number of azure-workload-identity replicas to deploy for the webhook | `1`                                                     |
+| replicaCount       | The number of azure-workload-identity replicas to deploy for the webhook | `2`                                                     |
 | image.repository   | Image repository                                                         | `mcr.microsoft.com/oss/azure/workload-identity/webhook` |
 | image.pullPolicy   | Image pullPolicy                                                         | `IfNotPresent`                                          |
-| image.release      | The image release tag to use                                             | Current release version: `v0.4.0`                       |
+| image.release      | The image release tag to use                                             | Current release version: `v0.5.0`                       |
 | nodeSelector       | The node selector to use for pod scheduling                              | `kubernetes.io/os: linux`                               |
 | arcCluster         | Specify if it runs on Arc cluster                                        | `false`                                                 |
 | resources          | The resource request/limits for the container image                      | limits: 100m CPU, 30Mi, requests: 100m CPU, 20Mi        |
@@ -46,6 +46,7 @@ helm upgrade -n azure-workload-identity-system [RELEASE_NAME] azure-workload-ide
 | service.targetPort | Service target port                                                      | `9443`                                                  |
 | azureTenantID      | [**REQUIRED**] Azure tenant ID                                           | ``                                                      |
 | azureEnvironment   | Azure Environment                                                        | `AzurePublicCloud`                                      |
+| logEncoder         | The log encoder to use for the webhook manager (`json`, `console`)       | `console`                                               |
 
 ## Contributing Changes
 

diff --git a/...s/workload-identity-webhook/templates/azure-wi-webhook-controller-manager-deployment.yaml b/...s/workload-identity-webhook/templates/azure-wi-webhook-controller-manager-deployment.yaml
@@ -27,6 +27,7 @@ spec:
       containers:
       - args:
         - --arc-cluster={{ .Values.arcCluster }}
+        - --log-encoder={{ .Values.logEncoder }}
         command:
         - /manager
         env:

diff --git a/charts/workload-identity-webhook/values.yaml b/charts/workload-identity-webhook/values.yaml
@@ -2,14 +2,14 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-labels: 
+labels:
   azure-workload-identity.io/system: "true"
-replicaCount: 1
+replicaCount: 2
 image:
   repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  release: v0.4.0
+  release: v0.5.0
 nodeSelector:
   kubernetes.io/os: linux
 arcCluster: false
@@ -28,3 +28,4 @@ service:
   targetPort: 9443
 azureEnvironment: AzurePublicCloud
 azureTenantID:
+logEncoder: console
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: manager
   newName: mcr.microsoft.com/oss/azure/workload-identity/webhook
-  newTag: v0.4.0
+  newTag: v0.5.0
 configMapGenerator:
 - literals:
   - AZURE_TENANT_ID="${AZURE_TENANT_ID}"

diff --git a/deploy/azure-wi-webhook.yaml b/deploy/azure-wi-webhook.yaml
@@ -139,7 +139,7 @@ metadata:
   name: azure-wi-webhook-controller-manager
   namespace: azure-workload-identity-system
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       azure-workload-identity.io/system: "true"
@@ -162,7 +162,7 @@ spec:
         envFrom:
         - configMapRef:
             name: azure-wi-webhook-config
-        image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v0.4.0
+        image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v0.5.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/manifest_staging/charts/workload-identity-webhook/Chart.yaml b/manifest_staging/charts/workload-identity-webhook/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: workload-identity-webhook
 description: A Helm chart to install the azure-workload-identity webhook
 type: application
-version: 0.4.0
-appVersion: v0.4.0
+version: 0.5.0
+appVersion: v0.5.0
 home: https://github.com/Azure/azure-workload-identity
 sources:
   - https://github.com/Azure/azure-workload-identity
diff --git a/manifest_staging/charts/workload-identity-webhook/README.md b/manifest_staging/charts/workload-identity-webhook/README.md
@@ -35,7 +35,7 @@ helm upgrade -n azure-workload-identity-system [RELEASE_NAME] azure-workload-ide
 | replicaCount       | The number of azure-workload-identity replicas to deploy for the webhook | `2`                                                     |
 | image.repository   | Image repository                                                         | `mcr.microsoft.com/oss/azure/workload-identity/webhook` |
 | image.pullPolicy   | Image pullPolicy                                                         | `IfNotPresent`                                          |
-| image.release      | The image release tag to use                                             | Current release version: `v0.4.0`                       |
+| image.release      | The image release tag to use                                             | Current release version: `v0.5.0`                       |
 | nodeSelector       | The node selector to use for pod scheduling                              | `kubernetes.io/os: linux`                               |
 | arcCluster         | Specify if it runs on Arc cluster                                        | `false`                                                 |
 | resources          | The resource request/limits for the container image                      | limits: 100m CPU, 30Mi, requests: 100m CPU, 20Mi        |

diff --git a/manifest_staging/charts/workload-identity-webhook/values.yaml b/manifest_staging/charts/workload-identity-webhook/values.yaml
@@ -9,7 +9,7 @@ image:
   repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  release: v0.4.0
+  release: v0.5.0
 nodeSelector:
   kubernetes.io/os: linux
 arcCluster: false

diff --git a/manifest_staging/deploy/azure-wi-webhook.yaml b/manifest_staging/deploy/azure-wi-webhook.yaml
@@ -162,7 +162,7 @@ spec:
         envFrom:
         - configMapRef:
             name: azure-wi-webhook-config
-        image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v0.4.0
+        image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v0.5.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -98,13 +98,16 @@ main() {
 
 test_helm_chart() {
   readonly HELM="${REPO_ROOT}/hack/tools/bin/helm"
-  ${KUBECTL} create namespace azure-workload-identity-system
 
-  # test helm upgrade from chart to manifest_staging/chart
-
-  ${HELM} install workload-identity-webhook "${REPO_ROOT}/charts/workload-identity-webhook" \
+  # test helm upgrade from the latest released chart to manifest_staging/chart
+  # TODO(chewong) switch to https://azure.github.io/azure-workload-identity/charts once it is available
+  git checkout origin/gh-pages -- "${REPO_ROOT}/charts/"
+  # shellcheck disable=SC2086
+  LATEST_CHART_TARBALL="$(find ${REPO_ROOT}/charts/workload-identity-webhook-*.tgz | sort | tail -n 1)"
+  ${HELM} install workload-identity-webhook "${LATEST_CHART_TARBALL}" \
     --set azureTenantID="${AZURE_TENANT_ID}" \
     --namespace azure-workload-identity-system \
+    --create-namespace \
     --wait
   poll_webhook_readiness
   # TODO(chewong): enable init containers test once v0.5.0 is released

diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/Chart.yaml b/third_party/open-policy-agent/gatekeeper/helmify/static/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: workload-identity-webhook
 description: A Helm chart to install the azure-workload-identity webhook
 type: application
-version: 0.4.0
-appVersion: v0.4.0
+version: 0.5.0
+appVersion: v0.5.0
 home: https://github.com/Azure/azure-workload-identity
 sources:
   - https://github.com/Azure/azure-workload-identity
diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/README.md b/third_party/open-policy-agent/gatekeeper/helmify/static/README.md
@@ -35,7 +35,7 @@ helm upgrade -n azure-workload-identity-system [RELEASE_NAME] azure-workload-ide
 | replicaCount       | The number of azure-workload-identity replicas to deploy for the webhook | `2`                                                     |
 | image.repository   | Image repository                                                         | `mcr.microsoft.com/oss/azure/workload-identity/webhook` |
 | image.pullPolicy   | Image pullPolicy                                                         | `IfNotPresent`                                          |
-| image.release      | The image release tag to use                                             | Current release version: `v0.4.0`                       |
+| image.release      | The image release tag to use                                             | Current release version: `v0.5.0`                       |
 | nodeSelector       | The node selector to use for pod scheduling                              | `kubernetes.io/os: linux`                               |
 | arcCluster         | Specify if it runs on Arc cluster                                        | `false`                                                 |
 | resources          | The resource request/limits for the container image                      | limits: 100m CPU, 30Mi, requests: 100m CPU, 20Mi        |

diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml b/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml
@@ -9,7 +9,7 @@ image:
   repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  release: v0.4.0
+  release: v0.5.0
 nodeSelector:
   kubernetes.io/os: linux
 arcCluster: false