fix: security fixes (#649)

virtual-kubelet · Aug 14, 2024 · 64d592e · 64d592e
1 parent 33a4e56
commit 64d592e
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 14 deletions.
diff --git a/.github/workflows/aks-addon-tests.yml b/.github/workflows/aks-addon-tests.yml
@@ -5,7 +5,7 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  pull_request_target:
+  pull_request:
     branches: [master]
     paths-ignore: ['docs/**', '**.md', '**.mdx', '**.png', '**.jpg']
   push:
@@ -14,7 +14,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  GO_VERSION: '1.20'    # Common versions
+  GO_VERSION: '1.22'    # Common versions
   E2E_IMG_TAG: 'e2e-ci'
 
 permissions:

diff --git a/.github/workflows/create-release-pull-request.yml b/.github/workflows/create-release-pull-request.yml
@@ -38,7 +38,7 @@ jobs:
           ref: "${{ github.event.inputs.based_on_branch }}"
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
       - name: update release manifest
         run: make release-manifest
         env:

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -15,7 +15,7 @@ permissions:
 env:
   REGISTRY: ghcr.io
   # Common versions
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.22'
 
 jobs:
   check-tag:

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -5,18 +5,18 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - master
-      - release-**
+      - release-**-**
     types: [ opened, ready_for_review, reopened ]
     paths:
       - '.github/workflows/chart.yml'
       - 'charts/**'
 
 env:
   REGISTRY: ghcr.io
-  GO_VERSION: '1.20' # Common versions
+  GO_VERSION: '1.22' # Common versions
   E2E_IMG_TAG: "e2e-ci"
 
 permissions:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.22'
 
 jobs:
   lint:

diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
@@ -18,7 +18,7 @@ permissions:
 
 env:
   # Common versions
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.22'
   IMAGE_NAME: 'virtual-kubelet'
 
 jobs:

diff --git a/.github/workflows/publish-init-container-image.yml b/.github/workflows/publish-init-container-image.yml
@@ -22,7 +22,7 @@ permissions:
 
 env:
   # Common versions
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.22'
   INIT_IMAGE_NAME: 'init-validation'
 
 jobs:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.22'
 
 permissions:
   pull-requests: write

diff --git a/docker/init-container/Dockerfile b/docker/init-container/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22 as builder
 ARG TARGETARCH
 
 WORKDIR /workspace

diff --git a/docker/virtual-kubelet/Dockerfile b/docker/virtual-kubelet/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22 as builder
 ARG TARGETOS
 ARG TARGETARCH
 ARG TARGETVARIANT

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/virtual-kubelet/azure-aci
 
-go 1.20
+go 1.22.4
+
+toolchain go1.22.5
 
 require (
 	contrib.go.opencensus.io/exporter/ocagent v0.7.0

diff --git a/go.sum b/go.sum
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ on: @@
     env:
       # Common versions
-      GO_VERSION: '1.20'
+      GO_VERSION: '1.22'
     jobs:
       lint:
@@ Expand Down @@