Skip to content

Commit 39eb8a9

Browse files
committed
Renamed noauth-dev to noauth-debug, update image versions
1 parent 2c3a835 commit 39eb8a9

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

Diff for: Dockerfile.debug

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ RUN CGO_ENABLED=0 go get -ldflags "-s -w -extldflags '-static'" github.com/go-de
2020
RUN GCE_PD_CSI_DEBUG=1 make gce-pd-driver
2121

2222
# MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
23-
FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3 as base
23+
FROM k8s.gcr.io/build-image/debian-base-amd64:buster-v1.5.0 as mad-hack
2424
RUN clean-install udev
2525

2626
# Start from Kubernetes Debian base
27-
FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3
27+
FROM k8s.gcr.io/build-image/debian-base-amd64:buster-v1.5.0
2828

2929
# Copy source code too to correlate the binary and the breakpoints
3030
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
3434

3535
# Install necessary dependencies
3636
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
37-
COPY --from=base /lib/udev/scsi_id /lib/udev_containerized/scsi_id
37+
COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id
3838

3939
# PDCSI driver isn't copied to / because of delve not being able to correlate
4040
# the binary and the source code, instead just run the binary where it was

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ build-and-push-multi-arch: build-and-push-container-linux build-and-push-windows
8585
STAGINGIMAGE="$(STAGINGIMAGE)" STAGINGVERSION="$(STAGINGVERSION)" WINDOWS_IMAGE_TAGS="$(WINDOWS_IMAGE_TAGS)" WINDOWS_BASE_IMAGES="$(WINDOWS_BASE_IMAGES)" ./manifest_osversion.sh
8686
$(DOCKER) manifest push -p $(STAGINGIMAGE):$(STAGINGVERSION)
8787

88-
build-and-push-multi-arch-dev: build-and-push-container-linux-debug build-and-push-windows-container-ltsc2019
88+
build-and-push-multi-arch-debug: build-and-push-container-linux-debug build-and-push-windows-container-ltsc2019
8989
$(DOCKER) manifest create --amend $(STAGINGIMAGE):$(STAGINGVERSION) $(STAGINGIMAGE):$(STAGINGVERSION)_linux $(STAGINGIMAGE):$(STAGINGVERSION)_ltsc2019
9090
STAGINGIMAGE="$(STAGINGIMAGE)" STAGINGVERSION="$(STAGINGVERSION)" WINDOWS_IMAGE_TAGS="$(WINDOWS_IMAGE_TAGS_DEV)" WINDOWS_BASE_IMAGES="$(WINDOWS_BASE_IMAGES_DEV)" ./manifest_osversion.sh
9191
$(DOCKER) manifest push -p $(STAGINGIMAGE):$(STAGINGVERSION)

Diff for: deploy/kubernetes/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ The current structure for kustomization is as follows. Note that Windows support
1616
* `overlays`: It has the k8s minor version-specific driver manifest bundle.
1717
* `stable-master`: Contains deployment specs of a stable driver for k8s master.
1818
* `stable-{k8s-minor}`: Contains deployment specs of a stable driver for given k8s minor version release.
19-
* `alpha`: Contains deployment specs for features in development. Both Linux and Windows are supported.
19+
* `alpha`: Contains deployment specs for features in development. Both Linux and Windows are supported.
2020
* `dev`: Based on alpha, and also contains the developer's specs for use in driver development.
21+
* `noauth-debug`: Based on alpha, used for debugging purposes only, see docs/kubernetes/development.md.
2122
* `prow-gke-release-staging-rc-master`: Used for prow tests. Contains deployment specs of a driver for latest k8s master.
2223
* `prow-gke-release-staging-rc-{k8s-minor}`: Used for prow tests. Contains deployment specs of a driver for given k8s minor version release.
2324
* `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: docs/kubernetes/development.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ $ ./deploy/kubernetes/delete-driver.sh
2121

2222
## Debugging
2323

24-
We use https://github.com/go-delve/delve and its remote debugging feature for debugging, this feature
25-
is only available in the PD CSI Controller (which runs in a linux node)
24+
We use https://github.com/go-delve/delve and its feature for remote debugging. This feature
25+
is only available in the PD CSI Controller (which runs in a linux node).
2626

2727
Requirements:
2828

2929
- https://github.com/go-delve/delve
3030

3131
Steps:
3232

33-
- Build the PD CSI driver with additional compiler flags
33+
- Build the PD CSI driver with additional compiler flags.
3434

3535
```
3636
export GCE_PD_CSI_STAGING_VERSION=latest
3737
export GCE_PD_CSI_STAGING_IMAGE=image/repo/gcp-compute-persistent-disk-csi-driver
38-
make build-and-push-multi-arch-dev
38+
make build-and-push-multi-arch-debug
3939
```
4040

41-
- Update `deploy/kubernetes/overlays/noauth-dev/kustomization.yaml` to match the repo you wrote above e.g.
41+
- Update `deploy/kubernetes/overlays/noauth-debug/kustomization.yaml` to match the repo you wrote above e.g.
4242

4343
```yaml
4444
images:
@@ -51,7 +51,7 @@ images:
5151
5252
```sh
5353
./deploy/kubernetes/delete-driver.sh && \
54-
GCE_PD_DRIVER_VERSION=noauth-dev ./deploy/kubernetes/deploy-driver.sh
54+
GCE_PD_DRIVER_VERSION=noauth-debug ./deploy/kubernetes/deploy-driver.sh
5555
```
5656

5757
At this point you could verify that delve is running in the controller logs:

0 commit comments

Comments
 (0)