Merge pull request #28 from nyu-devops/su24-updates

Updates for Summer 2024 Semester

Author: rofrano

.devcontainer/scripts/install-tools.sh

@@ -34,3 +34,9 @@ echo "Installing Skaffold..."
 echo "**********************************************************************"
 curl -Lo skaffold "https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-$ARCH"
 sudo install skaffold /usr/local/bin/
+
+echo "**********************************************************************"
+echo "Installing DevSpace..."
+echo "**********************************************************************"
+curl -Lo devspace "https://github.com/loft-sh/devspace/releases/latest/download/devspace-linux-$ARCH"
+sudo install -c -m 0755 devspace /usr/local/bin

Makefile

@@ -1,5 +1,5 @@
 # These can be overidden with env vars.
-REGISTRY ?= cluster-registry:32000
+REGISTRY ?= cluster-registry:5000
 IMAGE_NAME ?= hitcounter
 IMAGE_TAG ?= 1.0
 IMAGE ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
@@ -65,7 +65,7 @@ secret: ## Generate a secret hex key
 .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 cluster create nyu-devops --agents 1 --registry-create cluster-registry:0.0.0.0:32000 --port '8080:80@loadbalancer'
+	k3d cluster create nyu-devops --agents 1 --registry-create cluster-registry:0.0.0.0:5000 --port '8080:80@loadbalancer'
 
 .PHONY: cluster-rm
 cluster-rm: ## Remove a K3D Kubernetes cluster

k3d-config.yaml

@@ -11,9 +11,9 @@ registries:
   create: 
     name: cluster-registry
     host: "0.0.0.0"
-    hostPort: "32000"
+    hostPort: "5000"
   config: |
     mirrors:
-      "cluster-registry:32000":
+      "cluster-registry:5000":
         endpoint:
-          - http://cluster-registry:32000
+          - http://cluster-registry:5000

k8s/deployment.yaml

@@ -22,7 +22,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: hitcounter
-        image: cluster-registry:32000/hitcounter:1.0
+        image: cluster-registry:5000/hitcounter:1.0
         # image: hitcounter
         imagePullPolicy: IfNotPresent
         ports:
@@ -33,7 +33,7 @@ spec:
             valueFrom:
               secretKeyRef:
                 name: redis-creds
-                key: uri
+                key: database-uri
         resources:
           limits:
             cpu: "0.25"

k8s/secret.yaml

@@ -1,11 +1,11 @@
 # These can also be created from the command line using environment variables
 #
-# kubectl create secret generic redis-creds --from-literal=uri=$DATABASE_URI
+# kubectl create secret generic redis-creds --from-literal=database-uri=$DATABASE_URI
 #
 ---
 apiVersion: v1
 kind: Secret
 metadata:
   name: redis-creds
 data:
-  uri: cmVkaXM6Ly86QHJlZGlzOjYzNzkvMA==
+  database-uri: cmVkaXM6Ly86QHJlZGlzOjYzNzkvMA==

skaffold.env

@@ -1 +1 @@
-SKAFFOLD_DEFAULT_REPO=cluster-registry:32000
+SKAFFOLD_DEFAULT_REPO=cluster-registry:5000