Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/test/e2e/k8s-c918c9900b
Browse files Browse the repository at this point in the history
  • Loading branch information
aramase authored Jun 5, 2024
2 parents 7f7122f + fcb1e3f commit 54a98c1
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/azwi-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
env:
AZURE_CLIENT_ID: 0dcfc182-7b36-4e23-b53f-a27c929a9e4e
AZURE_TENANT_ID: bc2d60ab-9b1d-45bd-8a3b-3a18ae865e3a
SERVICE_ACCOUNT_ISSUER: "https://azwi.blob.core.windows.net/oidc-test/"
SERVICE_ACCOUNT_ISSUER: "https://raw.githubusercontent.com/Azure/azure-workload-identity/testing-manifests/"
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?= v1.2.2
IMAGE_VERSION ?= v1.3.0

ORG_PATH := github.com/Azure
PROJECT_NAME := azure-workload-identity
Expand Down
4 changes: 2 additions & 2 deletions charts/workload-identity-webhook/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: workload-identity-webhook
description: A Helm chart to install the azure-workload-identity webhook
type: application
version: 1.2.2
appVersion: v1.2.2
version: 1.3.0
appVersion: v1.3.0
home: https://github.com/Azure/azure-workload-identity
sources:
- https://github.com/Azure/azure-workload-identity
2 changes: 1 addition & 1 deletion charts/workload-identity-webhook/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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: `v1.2.2` |
| image.release | The image release tag to use | Current release version: `v1.3.0` |
| imagePullSecrets | Image pull secrets to use for retrieving images from private registries | `[]` |
| nodeSelector | The node selector to use for pod scheduling | `kubernetes.io/os: linux` |
| resources | The resource request/limits for the container image | limits: 100m CPU, 30Mi, requests: 100m CPU, 20Mi |
Expand Down
2 changes: 1 addition & 1 deletion charts/workload-identity-webhook/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
release: v1.2.2
release: v1.3.0
imagePullSecrets: []
nodeSelector:
kubernetes.io/os: linux
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Kustomization
images:
- name: manager
newName: mcr.microsoft.com/oss/azure/workload-identity/webhook
newTag: v1.2.2
newTag: v1.3.0
configMapGenerator:
- literals:
- AZURE_TENANT_ID="${AZURE_TENANT_ID}"
Expand Down
2 changes: 1 addition & 1 deletion deploy/azure-wi-webhook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ spec:
envFrom:
- configMapRef:
name: azure-wi-webhook-config
image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v1.2.2
image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v1.3.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 6
Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/installation/mutating-admission-webhook.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ The deployment YAML contains the environment variables we defined above and we r
Install the webhook using the deployment YAML via `kubectl apply -f` and `envsubst`:

```bash
curl -sL https://github.com/Azure/azure-workload-identity/releases/download/v1.2.2/azure-wi-webhook.yaml | envsubst | kubectl apply -f -
curl -sL https://github.com/Azure/azure-workload-identity/releases/download/v1.3.0/azure-wi-webhook.yaml | envsubst | kubectl apply -f -
```

<details>
Expand Down
4 changes: 2 additions & 2 deletions examples/migration/pod-with-proxy-init-and-proxy-sidecar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
serviceAccountName: workload-identity-sa
initContainers:
- name: init-networking
image: mcr.microsoft.com/oss/azure/workload-identity/proxy-init:v1.2.2
image: mcr.microsoft.com/oss/azure/workload-identity/proxy-init:v1.3.0
securityContext:
capabilities:
add:
Expand All @@ -26,6 +26,6 @@ spec:
ports:
- containerPort: 80
- name: proxy
image: mcr.microsoft.com/oss/azure/workload-identity/proxy:v1.2.2
image: mcr.microsoft.com/oss/azure/workload-identity/proxy:v1.3.0
ports:
- containerPort: 8000
4 changes: 2 additions & 2 deletions manifest_staging/charts/workload-identity-webhook/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: workload-identity-webhook
description: A Helm chart to install the azure-workload-identity webhook
type: application
version: 1.2.2
appVersion: v1.2.2
version: 1.3.0
appVersion: v1.3.0
home: https://github.com/Azure/azure-workload-identity
sources:
- https://github.com/Azure/azure-workload-identity
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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: `v1.2.2` |
| image.release | The image release tag to use | Current release version: `v1.3.0` |
| imagePullSecrets | Image pull secrets to use for retrieving images from private registries | `[]` |
| nodeSelector | The node selector to use for pod scheduling | `kubernetes.io/os: linux` |
| resources | The resource request/limits for the container image | limits: 100m CPU, 30Mi, requests: 100m CPU, 20Mi |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
release: v1.2.2
release: v1.3.0
imagePullSecrets: []
nodeSelector:
kubernetes.io/os: linux
Expand Down
2 changes: 1 addition & 1 deletion manifest_staging/deploy/azure-wi-webhook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ spec:
envFrom:
- configMapRef:
name: azure-wi-webhook-config
image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v1.2.2
image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v1.3.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 6
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/podidentity/detect.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var (

const (
imageRepository = "mcr.microsoft.com/oss/azure/workload-identity"
imageTag = "v1.2.2"
imageTag = "v1.3.0"

proxyInitImageName = "proxy-init"
proxyImageName = "proxy"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: workload-identity-webhook
description: A Helm chart to install the azure-workload-identity webhook
type: application
version: 1.2.2
appVersion: v1.2.2
version: 1.3.0
appVersion: v1.3.0
home: https://github.com/Azure/azure-workload-identity
sources:
- https://github.com/Azure/azure-workload-identity
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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: `v1.2.2` |
| image.release | The image release tag to use | Current release version: `v1.3.0` |
| imagePullSecrets | Image pull secrets to use for retrieving images from private registries | `[]` |
| nodeSelector | The node selector to use for pod scheduling | `kubernetes.io/os: linux` |
| resources | The resource request/limits for the container image | limits: 100m CPU, 30Mi, requests: 100m CPU, 20Mi |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
release: v1.2.2
release: v1.3.0
imagePullSecrets: []
nodeSelector:
kubernetes.io/os: linux
Expand Down

0 comments on commit 54a98c1

Please sign in to comment.