Merge pull request #4066 from jackfrancis/docker-image-bullseye

update to debian bullseye, buster EOL soon

Dockerfile

@@ -14,7 +14,7 @@
 
 # syntax=docker/dockerfile:1
 
-FROM --platform=linux/amd64 golang:1.20.5-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572 AS builder
+FROM --platform=linux/amd64 golang:1.20-bullseye@sha256:e88f338421aa37d614c3cf0fea40a978a943b5cc1b1b34ecff3cb7e1a6e79090 AS builder
 
 ARG ENABLE_GIT_COMMAND=true
 ARG ARCH=amd64

Makefile

@@ -122,12 +122,6 @@ $(BIN_DIR)/azure-acr-credential-provider.exe: $(PKG_CONFIG) $(wildcard cmd/acr-c
 ##@ Images
 ## --------------------------------------
 
-.PHONY: docker-pull-prerequisites
-docker-pull-prerequisites: ## Pull prerequisite images.
-	docker pull docker/dockerfile:1
-	docker pull docker.io/library/golang:buster
-	docker pull gcr.io/distroless/static:latest
-
 buildx-setup:
 	$(DOCKER_BUILDX) inspect img-builder > /dev/null 2>&1 || $(DOCKER_BUILDX) create --name img-builder --use
 	# enable qemu for arm64 build
@@ -136,7 +130,7 @@ buildx-setup:
 	docker run --rm --privileged tonistiigi/binfmt --install all
 
 .PHONY: build-ccm-image
-build-ccm-image: buildx-setup docker-pull-prerequisites ## Build controller-manager image.
+build-ccm-image: buildx-setup ## Build controller-manager image.
 	$(DOCKER_BUILDX) build \
 		--pull \
 		--output=type=$(OUTPUT_TYPE) \
@@ -150,7 +144,7 @@ build-ccm-image: buildx-setup docker-pull-prerequisites ## Build controller-mana
 		--sbom=false
 
 .PHONY: build-node-image-linux
-build-node-image-linux: buildx-setup docker-pull-prerequisites ## Build node-manager image.
+build-node-image-linux: buildx-setup ## Build node-manager image.
 	$(DOCKER_BUILDX) build \
 		--pull \
 		--output=type=$(OUTPUT_TYPE) \

cloud-node-manager.Dockerfile

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=linux/amd64 golang:1.20.5-buster AS builder
+FROM --platform=linux/amd64 golang:1.20-bullseye@sha256:e88f338421aa37d614c3cf0fea40a978a943b5cc1b1b34ecff3cb7e1a6e79090 AS builder
 
 ARG ENABLE_GIT_COMMAND=true
 ARG ARCH=amd64

e2e.Dockerfile

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.5-buster
+FROM golang:1.20-bullseye@sha256:e88f338421aa37d614c3cf0fea40a978a943b5cc1b1b34ecff3cb7e1a6e79090
 
 WORKDIR /go/src/sigs.k8s.io/cloud-provider-azure
 

tests/e2e/network/service_annotations.go

@@ -140,7 +140,7 @@ var _ = Describe("Service with annotation", Label(utils.TestSuiteLabelServiceAnn
 		// 1. Create a Service with managed PIP and check connectivity with DNS
 		// 2. Delete the Service
 		// 3. Create a Service with user assigned PIP
-		// 4. Delete the Servcie and check tags
+		// 4. Delete the Service and check tags
 		// 5. Create a Service with different name
 		// 6. Update the Service with new tag
 		By("Create a Service with managed PIP")