Renamed noauth-dev to noauth-debug, update image versions

Author: mauriciopoppe

Diff for: Dockerfile.debug

@@ -20,11 +20,11 @@ RUN CGO_ENABLED=0 go get -ldflags "-s -w -extldflags '-static'" github.com/go-de
 RUN GCE_PD_CSI_DEBUG=1 make gce-pd-driver
 
 # MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
-FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3 as base
+FROM k8s.gcr.io/build-image/debian-base-amd64:buster-v1.5.0 as mad-hack
 RUN clean-install udev
 
 # Start from Kubernetes Debian base
-FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3
+FROM k8s.gcr.io/build-image/debian-base-amd64:buster-v1.5.0
 
 # Copy source code too to correlate the binary and the breakpoints
 WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
@@ -34,7 +34,7 @@ COPY --from=builder /go/bin/dlv /go/bin/dlv
 
 # Install necessary dependencies
 RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
-COPY --from=base /lib/udev/scsi_id /lib/udev_containerized/scsi_id
+COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id
 
 # PDCSI driver isn't copied to / because of delve not being able to correlate
 # the binary and the source code, instead just run the binary where it was

Diff for: Makefile

@@ -40,9 +40,6 @@ BASE_IMAGE_20H2=mcr.microsoft.com/windows/servercore:20H2
 # Both arrays MUST be index aligned.
 WINDOWS_IMAGE_TAGS=ltsc2019 1909 2004 20H2
 WINDOWS_BASE_IMAGES=$(BASE_IMAGE_LTSC2019) $(BASE_IMAGE_1909) $(BASE_IMAGE_2004) $(BASE_IMAGE_20H2)
-# Development only
-WINDOWS_IMAGE_TAGS_DEV=ltsc2019
-WINDOWS_BASE_IMAGES_DEV=$(BASE_IMAGE_LTSC2019)
 
 all: gce-pd-driver gce-pd-driver-windows
 gce-pd-driver:
@@ -85,9 +82,9 @@ build-and-push-multi-arch: build-and-push-container-linux build-and-push-windows
 	STAGINGIMAGE="$(STAGINGIMAGE)" STAGINGVERSION="$(STAGINGVERSION)" WINDOWS_IMAGE_TAGS="$(WINDOWS_IMAGE_TAGS)" WINDOWS_BASE_IMAGES="$(WINDOWS_BASE_IMAGES)" ./manifest_osversion.sh
 	$(DOCKER) manifest push -p $(STAGINGIMAGE):$(STAGINGVERSION)
 
-build-and-push-multi-arch-dev: build-and-push-container-linux-debug build-and-push-windows-container-ltsc2019
+build-and-push-multi-arch-debug: build-and-push-container-linux-debug build-and-push-windows-container-ltsc2019
 	$(DOCKER) manifest create --amend $(STAGINGIMAGE):$(STAGINGVERSION) $(STAGINGIMAGE):$(STAGINGVERSION)_linux $(STAGINGIMAGE):$(STAGINGVERSION)_ltsc2019
-	STAGINGIMAGE="$(STAGINGIMAGE)" STAGINGVERSION="$(STAGINGVERSION)" WINDOWS_IMAGE_TAGS="$(WINDOWS_IMAGE_TAGS_DEV)" WINDOWS_BASE_IMAGES="$(WINDOWS_BASE_IMAGES_DEV)" ./manifest_osversion.sh
+	STAGINGIMAGE="$(STAGINGIMAGE)" STAGINGVERSION="$(STAGINGVERSION)" WINDOWS_IMAGE_TAGS="ltsc2019" WINDOWS_BASE_IMAGES="$(BASE_IMAGE_LTSC2019)" ./manifest_osversion.sh
 	$(DOCKER) manifest push -p $(STAGINGIMAGE):$(STAGINGVERSION)
 
 push-container: build-container

Diff for: deploy/kubernetes/README.md

@@ -16,8 +16,9 @@ The current structure for kustomization is as follows. Note that Windows support
 * `overlays`: It has the k8s minor version-specific driver manifest bundle.
   * `stable-master`: Contains deployment specs of a stable driver for k8s master.
   * `stable-{k8s-minor}`: Contains deployment specs of a stable driver for given k8s minor version release.
-  * `alpha`: Contains deployment specs for features in development. Both Linux and Windows are supported. 
+  * `alpha`: Contains deployment specs for features in development. Both Linux and Windows are supported.
   * `dev`: Based on alpha, and also contains the developer's specs for use in driver development.
+  * `noauth-debug`: Based on alpha, used for debugging purposes only, see docs/kubernetes/development.md.
   * `prow-gke-release-staging-rc-master`: Used for prow tests. Contains deployment specs of a driver for latest k8s master.
   * `prow-gke-release-staging-rc-{k8s-minor}`: Used for prow tests. Contains deployment specs of a driver for given k8s    minor version release.
   * `prow-gke-release-staging-rc-head`: Used for prow tests. Contains deployment specs of a driver with latest sidecar images, for latest k8s master.

Diff for: deploy/kubernetes/overlays/noauth-dev/controller-overlay.yaml renamed to deploy/kubernetes/overlays/noauth-debug/controller-overlay.yaml

@@ -21,24 +21,24 @@ $ ./deploy/kubernetes/delete-driver.sh
 
 ## Debugging
 
-We use https://github.com/go-delve/delve and its remote debugging feature for debugging, this feature
-is only available in the PD CSI Controller (which runs in a linux node)
+We use https://github.com/go-delve/delve and its feature for remote debugging. This feature
+is only available in the PD CSI Controller (which runs in a linux node).
 
 Requirements:
 
 - https://github.com/go-delve/delve
 
 Steps:
 
-- Build the PD CSI driver with additional compiler flags
+- Build the PD CSI driver with additional compiler flags.
 
 ```
 export GCE_PD_CSI_STAGING_VERSION=latest
 export GCE_PD_CSI_STAGING_IMAGE=image/repo/gcp-compute-persistent-disk-csi-driver
-make build-and-push-multi-arch-dev
+make build-and-push-multi-arch-debug
 ```
 
-- Update `deploy/kubernetes/overlays/noauth-dev/kustomization.yaml` to match the repo you wrote above e.g.
+- Update `deploy/kubernetes/overlays/noauth-debug/kustomization.yaml` to match the repo you wrote above e.g.
 
 ```yaml
 images:
@@ -51,7 +51,7 @@ images:
 
 ```sh
 ./deploy/kubernetes/delete-driver.sh && \
-  GCE_PD_DRIVER_VERSION=noauth-dev ./deploy/kubernetes/deploy-driver.sh
+  GCE_PD_DRIVER_VERSION=noauth-debug ./deploy/kubernetes/deploy-driver.sh
 ```
 
 At this point you could verify that delve is running in the controller logs: