Merge branch 'main' into bumpmsgraph

Azure · Aug 1, 2024 · 9324861 · 9324861
2 parents e58ddaa + d7cb1b6
commit 9324861
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 24 deletions.
diff --git a/.github/workflows/azwi-build.yaml b/.github/workflows/azwi-build.yaml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         # TODO(aramase): add windows test env
-        env: [ubuntu-20.04, macos-11]
+        env: [ubuntu-20.04, macos-13]
     runs-on: ${{ matrix.env }}
     steps:
       - name: Harden Runner

diff --git a/.github/workflows/azwi-e2e.yaml b/.github/workflows/azwi-e2e.yaml
@@ -102,7 +102,7 @@ jobs:
       fail-fast: false
       matrix:
         # TODO(aramase): add windows test env
-        env: [ubuntu-20.04, macos-11]
+        env: [ubuntu-20.04, macos-13]
     runs-on: ${{ matrix.env }}
     steps:
       - name: Harden Runner

diff --git a/.pipelines/nightly.yaml b/.pipelines/nightly.yaml
@@ -131,14 +131,12 @@ jobs:
         value: "true"
     strategy:
       matrix:
-        kind_v1_26_14:
-          KIND_NODE_VERSION: v1.26.14
-        kind_v1_27_11:
-          KIND_NODE_VERSION: v1.27.11
-        kind_v1_28_7:
-          KIND_NODE_VERSION: v1.28.7
-        kind_v1_29_2:
-          KIND_NODE_VERSION: v1.29.2
+        kind_v1_28_9:
+          KIND_NODE_VERSION: v1.28.9
+        kind_v1_29_4:
+          KIND_NODE_VERSION: v1.29.4
+        kind_v1_30_2:
+          KIND_NODE_VERSION: v1.30.2
     steps:
       - script: make test-e2e
         displayName: Webhook E2E test suite

diff --git a/.pipelines/pr.yaml b/.pipelines/pr.yaml
@@ -127,20 +127,16 @@ jobs:
       - group: e2e-environment-variables
     strategy:
       matrix:
-        kind_v1_26_14:
-          KIND_NODE_VERSION: v1.26.14
+        kind_v1_28_9:
+          KIND_NODE_VERSION: v1.28.9
           LOCAL_ONLY: "true"
           TEST_HELM_CHART: "true"
-        kind_v1_27_11:
-          KIND_NODE_VERSION: v1.27.11
+        kind_v1_29_4:
+          KIND_NODE_VERSION: v1.29.4
           LOCAL_ONLY: "true"
           TEST_HELM_CHART: "true"
-        kind_v1_28_7:
-          KIND_NODE_VERSION: v1.28.7
-          LOCAL_ONLY: "true"
-          TEST_HELM_CHART: "true"
-        kind_v1_29_2:
-          KIND_NODE_VERSION: v1.29.2
+        kind_v1_30_2:
+          KIND_NODE_VERSION: v1.30.2
           LOCAL_ONLY: "true"
           TEST_HELM_CHART: "true"
     steps:

diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ GINKGO_VER := v2.1.6
 GINKGO_BIN := ginkgo
 GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
 
-KIND_VER := v0.21.0
+KIND_VER := v0.23.0
 KIND_BIN := kind
 KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
 

diff --git a/README.md b/README.md
@@ -7,10 +7,9 @@ Azure AD Workload Identity is the next iteration of [Azure AD Pod Identity][1] t
 
 | Kubernetes Version | Supported |
 | ------------------ | --------- |
+| 1.30               | ✅         |
 | 1.29               | ✅         |
 | 1.28               | ✅         |
-| 1.27               | ✅         |
-| 1.26               | ✅         |
 
 ## Installation
 

diff --git a/docker/proxy-init.Dockerfile b/docker/proxy-init.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} registry.k8s.io/build-image/distroless-iptables:v0.5.4
+FROM --platform=${TARGETPLATFORM:-linux/amd64} registry.k8s.io/build-image/distroless-iptables:v0.6.1
 
 COPY ./init/init-iptables.sh /bin/
 RUN chmod +x /bin/init-iptables.sh