Merge pull request #259 from clmccart/patch/devcont_quickstart

Patch quickstart workflow for devcontainer

.devcontainer/Dockerfile

@@ -10,8 +10,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Configure apt, install packages and tools
 RUN apt-get update \
+    # 
+    # Install recommended utils
     && apt-get -y install --no-install-recommends apt-utils 2>&1 \
     #
+    # Install sudo
+    && apt-get -y install sudo \
+    #
     # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
     && apt-get -y install git procps lsb-release \
     #
@@ -75,11 +80,10 @@ ENV PATH="/usr/local/kubebuilder/bin:${PATH}"
 
 ENV GO111MODULE=on
 
-# Set the default shell to bash instead of sh
-ENV AZURE_CLIENT_ID=""
-ENV AZURE_CLIENT_SECRET=""
-ENV AZURE_SUBSCRIPTION_ID=""
-ENV AZURE_TENANT_ID=""
+ENV AZURE_CLIENT_ID="${AZURE_CLIENT_ID}"
+ENV AZURE_CLIENT_SECRET="${AZURE_CLIENT_SECRET}"
+ENV AZURE_SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}"
+ENV AZURE_TENANT_ID="${AZURE_TENANT_ID}"
 ENV KUBECONFIG="/root/.kube/kind-config-kind"
 
 COPY ./Makefile ./
@@ -88,4 +92,5 @@ RUN make install-kubebuilder
 RUN make install-kustomize
 RUN make install-test-dependency
 
+# Set the default shell to bash instead of sh
 ENV SHELL /bin/bash

.gitignore

@@ -45,3 +45,6 @@ cover-existing.html
 coverage-existing.txt
 report-existing.xml
 testlogs-existing.txt
+
+# manager output from build
+manager

Dockerfile

@@ -19,11 +19,11 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:latest
-ENV AZURE_SUBSCRIPTION_ID ""
-ENV AZURE_TENANT_ID ""
-ENV AZURE_CLIENT_ID ""
-ENV AZURE_CLIENT_SECRET ""
-ENV REQUEUE_AFTER ""
+ENV AZURE_CLIENT_ID "${AZURE_CLIENT_ID}"
+ENV AZURE_CLIENT_SECRET "{AZURE_CLIENT_SECRET}"
+ENV AZURE_SUBSCRIPTION_ID "${AZURE_SUBSCRIPTION_ID}"
+ENV AZURE_TENANT_ID "${AZURE_TENANT_ID}"
+ENV REQUEUE_AFTER "30"
 WORKDIR /
 COPY --from=builder /workspace/manager .
 ENTRYPOINT ["/manager"]

Makefile

@@ -33,7 +33,7 @@ api-test: generate fmt vet manifests
 	go tool cover -html=coverage.txt -o cover.html
 
 # Run tests
-test: generate fmt vet manifests
+test: generate fmt vet manifests 
 	TEST_USE_EXISTING_CLUSTER=false TEST_CONTROLLER_WITH_MOCKS=true go test -v -coverprofile=coverage.txt -covermode count ./api/... ./controllers/... ./pkg/resourcemanager/eventhubs/...  ./pkg/resourcemanager/resourcegroups/...  ./pkg/resourcemanager/storages/... 2>&1 | tee testlogs.txt
 	go-junit-report < testlogs.txt  > report.xml
 	go tool cover -html=coverage.txt -o cover.html
@@ -53,7 +53,7 @@ run: generate fmt vet
 	go run ./main.go
 
 # Install CRDs into a cluster
-install: manifests
+install: generate
 	kubectl apply -f config/crd/bases
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
@@ -87,7 +87,7 @@ vet:
 	go vet ./...
 
 # Generate code
-generate: controller-gen
+generate: manifests
 	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/...
 
 # Build the docker image
@@ -157,9 +157,10 @@ endif
 	make install-cert-manager
 
 	#create image and load it into cluster
+	make install
 	IMG="docker.io/controllertest:1" make docker-build
 	kind load docker-image docker.io/controllertest:1 --loglevel "trace"
-	make install
+
 	kubectl get namespaces
 	kubectl get pods --namespace cert-manager
 	@echo "Waiting for cert-manager to be ready"