Updated cluster registry name

Author: rofrano

Makefile

@@ -1,11 +1,13 @@
 # These can be overidden with env vars.
-REGISTRY ?= rofrano
+REGISTRY ?= cluster-registry:32000
 IMAGE_NAME ?= hitcounter
 IMAGE_TAG ?= 1.0
 IMAGE ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
 PLATFORM ?= "linux/amd64,linux/arm64"
 CLUSTER ?= nyu-devops
 
+.SILENT:
+
 .PHONY: help
 help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
@@ -50,19 +52,25 @@ run: ## Run the service
 	$(info Starting service...)
 	honcho start
 
+.PHONY: secret
+secret: ## Generate a secret hex key
+	$(info Generating a new secret key...)
+	python3 -c 'import secrets; print(secrets.token_hex())'
+
 ##@ Kubernetes
 
+# k3d registry create registry.local --port 5000
+# k3d cluster create devops --agents 1 --registry-use k3d-registry.local:5000 --port '8080:80@loadbalancer'
+
 .PHONY: cluster
 cluster: ## Create a K3D Kubernetes cluster with load balancer and registry
 	$(info Creating Kubernetes cluster with a registry and 1 worker node...)
-	k3d registry create registry.local --port 5000
-	k3d cluster create devops --agents 1 --registry-use k3d-registry.local:5000 --port '8080:80@loadbalancer'
+	k3d cluster create nyu-devops --agents 1 --registry-create cluster-registry:0.0.0.0:32000 --port '8080:80@loadbalancer'
 
 .PHONY: cluster-rm
 cluster-rm: ## Remove a K3D Kubernetes cluster
 	$(info Removing Kubernetes cluster...)
-	k3d cluster delete devops
-	k3d registry delete registry.local
+	k3d cluster delete nyu-devops
 
 .PHONY: tekton
 tekton: ## Install Tekton
@@ -89,7 +97,7 @@ knative: ## Install Knative
 .PHONY: deploy
 depoy: ## Deploy the service on local Kubernetes
 	$(info Deploying service locally...)
-	kubectl apply -k kustomize/overlay/local
+	kubectl apply -f k8s/
 
 ############################################################
 # COMMANDS FOR BUILDING THE IMAGE
@@ -112,7 +120,7 @@ build:	## Build all of the project Docker images
 .PHONY: buildx
 buildx:	## Build multi-platform image with buildx
 	$(info Building multi-platform image $(IMAGE) for $(PLATFORM)...)
-	docker buildx build --file Dockerfile  --pull --platform=$(PLATFORM) --tag $(IMAGE) --load .
+	docker buildx build --file Dockerfile  --pull --platform=$(PLATFORM) --tag $(IMAGE) --push .
 
 .PHONY: remove
 remove:	## Stop and remove the buildx builder

k8s/deployment.yaml

@@ -22,8 +22,8 @@ spec:
       restartPolicy: Always
       containers:
       - name: hitcounter
-        # image: k3d-registry.local:5000/hitcounter:1.0
-        image: hitcounter
+        image: cluster-registry:32000/hitcounter:1.0
+        # image: hitcounter
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 8080

skaffold.env

@@ -1 +1 @@
-SKAFFOLD_DEFAULT_REPO=k3d-registry.local:5000
+SKAFFOLD_DEFAULT_REPO=cluster-registry:32000

skaffold.yaml

@@ -14,7 +14,7 @@ test:
   - context: .
     image: hitcounter
     custom:
-      - command: export DATABASE_URI=redis://localhost:6379/0 green
+      - command: export RETRY_COUNT=1; DATABASE_URI=redis://localhost:6379/0 green
 manifests:
   rawYaml:
     - k8s/deployment.yaml