DataDog
diff --git a/‎.github/workflows/deps.yml‎
Lines changed: 1 addition & 3 deletions b/‎.github/workflows/deps.yml‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎.github/workflows/helm_chart_release.yaml‎
Lines changed: 2 additions & 1 deletion b/‎.github/workflows/helm_chart_release.yaml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎.github/workflows/update-deps.yaml‎
Lines changed: 4 additions & 5 deletions b/‎.github/workflows/update-deps.yaml‎
Lines changed: 4 additions & 5 deletions
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.ko.yaml‎
Lines changed: 1 addition & 1 deletion b/‎.ko.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Dockerfile‎
Lines changed: 1 addition & 1 deletion b/‎Dockerfile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Makefile‎
Lines changed: 5 additions & 2 deletions b/‎Makefile‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎OWNERS‎
Lines changed: 7 additions & 8 deletions b/‎OWNERS‎
Lines changed: 7 additions & 8 deletions
diff --git a/‎charts/aws-cloud-controller-manager/templates/daemonset.yaml‎
Lines changed: 4 additions & 0 deletions b/‎charts/aws-cloud-controller-manager/templates/daemonset.yaml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎charts/aws-cloud-controller-manager/values.yaml‎
Lines changed: 15 additions & 0 deletions b/‎charts/aws-cloud-controller-manager/values.yaml‎
Lines changed: 15 additions & 0 deletions
@@ -12,7 +12,7 @@ on:
         required: true
         default: 'master'
         type: string
-      base_ref: 
+      base_ref:
         description: 'Base git reference (tag/branch/commit) to compare against head_ref'
         required: true
         default: 'master'
@@ -42,10 +42,8 @@ jobs:
       - id: govulncheck
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: 1.21.5
           go-version-file: go.mod
       - id: govulncheck-tests-e2e
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: 1.21.5
           go-version-file: tests/e2e/go.mod
@@ -30,4 +30,5 @@ jobs:
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:
-          config: .github/cr.yaml
+          config: .github/cr.yaml
+          mark_as_latest: false
@@ -17,10 +17,10 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
-        with:
-          go-version: '1.21.5'
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+        with:
+          go-version-file: go.mod
       - name: Update Dependencies
         id: update_deps
         run: |
@@ -30,7 +30,7 @@ jobs:
           echo 'EOF' >> $GITHUB_OUTPUT
       - name: Create PR
         if: ${{ steps.update_deps.outputs.changes != '' }}
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
         with:
           title: 'Update dependencies'
           commit-message: Update dependencies
@@ -45,4 +45,3 @@ jobs:
             release-note-none
           body: |
             Updating go.mod with latest dependencies.
-
@@ -10,3 +10,4 @@ site/
 e2e.test
 .idea/
 **/*.swp
+.DS_Store
@@ -1 +1 @@
-defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.5-bookworm.0
+defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.0-bookworm.0
@@ -14,7 +14,7 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.21.5
+ARG GOLANG_IMAGE=golang:1.24.0
 
 # Datadog's base docker image
 ARG BASE_IMAGE
 
@@ -18,7 +18,7 @@ SHELL := /bin/bash
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 GOPROXY ?= $(shell go env GOPROXY)
-GIT_VERSION := $(shell git describe --dirty --tags --match='v*')
+GIT_VERSION ?= $(shell git describe --dirty --tags --match='v*')
 VERSION ?= $(GIT_VERSION)
 IMAGE_REPOSITORY ?= provider-aws/cloud-controller-manager
 IMAGE ?= $(IMAGE_REPOSITORY):$(VERSION)
@@ -110,7 +110,7 @@ ko-build-tar: ko
 
 .PHONY: ko-build-local
 ko-build-local: ko
-	KO_DOCKER_REPO="$(IMAGE_REPOSITORY)" GOFLAGS="-ldflags=-X=k8s.io/component-base/version.gitVersion=$(VERSION)" ko build --tags ${VERSION} --platform=linux/amd64 --bare ./cmd/aws-cloud-controller-manager/ --push=false --local
+	KO_DOCKER_REPO="ko.local" GOFLAGS="-ldflags=-X=k8s.io/component-base/version.gitVersion=$(VERSION)" ko build --tags ${VERSION} --platform=linux/amd64 --bare ./cmd/aws-cloud-controller-manager/ --push=false --local
 	docker tag ko.local:${VERSION} $(IMAGE)
 
 .PHONY: e2e.test
@@ -122,6 +122,9 @@ e2e.test:
 .PHONY: check
 check: verify-fmt verify-lint vet
 
+.PHONY: develop
+develop: aws-cloud-controller-manager test update-fmt check
+
 .PHONY: test
 test:
 	go test -count=1 -race -v $(shell go list ./...)
 
@@ -1,26 +1,22 @@
 approvers:
 - dims
-- justinsb
 - nckturner
-- M00nF1sh
-- andrewsykim
-- wongma7
 - olemarkus
 - hakman
 - kishorj
 - cartermckinnon
+- mmerkes
+- wongma7
+- kmala
 reviewers:
 - dims
-- justinsb
 - nckturner
-- M00nF1sh
-- andrewsykim
-- wongma7
 - olemarkus
 - hakman
 - kishorj
 - cartermckinnon
 - mmerkes
+- kmala
 emeritus_approvers:
 - zmerlynn
 - gnufied
@@ -32,3 +28,6 @@ emeritus_approvers:
 - leakingtapan
 - ayberk
 - jaypipes
+- M00nF1sh
+- andrewsykim
+- justinsb
@@ -32,6 +32,10 @@ spec:
       hostNetwork: true
       {{- end }}
       securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
 
@@ -8,6 +8,9 @@ image:
     repository: registry.k8s.io/provider-aws/cloud-controller-manager
     tag: v1.27.1
 
+# Specify image pull secrets
+imagePullSecrets: []
+
 # nameOverride overrides `cloud-controller-manager.fullname`
 nameOverride: "aws-cloud-controller-manager"
 
@@ -95,6 +98,18 @@ clusterRoleRules:
   - serviceaccounts/token
   verbs:
   - create
+- apiGroups:
+    - authentication.k8s.io
+  resources:
+    - tokenreviews
+  verbs:
+    - create
+- apiGroups:
+    - authorization.k8s.io
+  resources:
+    - subjectaccessreviews
+  verbs:
+    - create
 
 # resources -- Pod resource requests and limits.
 resources:
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.5-bookworm.0`
	`1`	`+defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.0-bookworm.0`