Changed name to petshop

Author: rofrano

Makefile

@@ -1,8 +1,8 @@
 # These can be overidden with env vars.
-REGISTRY ?= cluster-registry:32000
+REGISTRY ?= cluster-registry:5000
 NAMESPACE ?= nyu-devops
-IMAGE_NAME ?= lab-flask-bdd
-IMAGE_TAG ?= 1.0
+IMAGE_NAME ?= petshop
+IMAGE_TAG ?= 1.0.0
 IMAGE ?= $(REGISTRY)/$(NAMESPACE)/$(IMAGE_NAME):$(IMAGE_TAG)
 PLATFORM ?= "linux/amd64,linux/arm64"
 CLUSTER ?= nyu-devops
@@ -61,7 +61,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 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
@@ -71,7 +71,7 @@ cluster-rm: ## Remove a K3D Kubernetes cluster
 ##@ Deploy
 
 .PHONY: push
-image-push: ## Push to a Docker image registry
+push: ## Push to a Docker image registry
 	$(info Logging into IBM Cloud cluster $(CLUSTER)...)
 	docker push $(IMAGE)
 
@@ -80,6 +80,11 @@ deploy: ## Deploy the service on local Kubernetes
 	$(info Deploying service locally...)
 	kubectl apply -f k8s/
 
+.PHONY: undeploy
+undeploy: ## Delete the deployment on local Kubernetes
+	$(info Removing service on Kubernetes...)
+	kubectl delete -f k8s/
+
 ############################################################
 # COMMANDS FOR BUILDING THE IMAGE
 ############################################################

README.md

@@ -78,22 +78,64 @@ Pytest is configured to automatically include the flags `--pspec --cov=service -
 
 These tests require the service to be running because unlike the the TDD unit tests that test the code locally, these BDD integration tests are using Selenium to manipulate a web page on a running server.
 
-Run the tests using `behave`
+#### Run using two shells
 
 Start the server in a separate bash shell:
 
 ```sh
 honcho start
 ```
 
-Then start behave in your original bash shell:
+Then start `behave` in your original bash shell:
 
 ```sh
 behave
 ```
 
 You will see the results of the tests scroll down yur screen using the familiar red/green/refactor colors.
 
+#### Run using Kubernetes
+
+You can also use Kubernetes to host your application and test against it with BDD. The commands to do this are:
+
+```bash
+make cluster
+make build
+make push
+make deploy
+```
+
+What did these commands do?
+
+| Command | What does it do? |
+|---------|------------------|
+| make cluster | Creates a local Kubernetes cluster using `k3d` |
+| make build | Builds the Docker image |
+| make push | Pushes the image to the local Docker registry |
+| make deploy | Deploys the application using the image that was just built and pushed |
+
+Now you can just run `behave` against the application running in the local Kubernetes cluster
+
+```bash
+behave
+```
+
+### See what images are in the local registry
+
+You can use the `curl` command to query what images you have pushed to your local Docker registry. This will return `JSON` so you might want to use the silent flag `-s` and pipe it through `jq` like this:
+
+```bash
+curl -XGET http://localhost:5000/v2/_catalog -s | jq
+```
+
+That will return all of the image names without the tags.
+
+To get the tags use:
+
+```bash
+curl -XGET http://localhost:5000/v2/<image-name>/tags/list -s | jq
+```
+
 ## What's featured in the project?
 
 ```text
@@ -108,7 +150,7 @@ You will see the results of the tests scroll down yur screen using the familiar
 
 ## License
 
-Copyright (c) 2016, 2023, John J. Rofrano. All rights reserved.
+Copyright (c) 2016, 2024, John J. Rofrano. All rights reserved.
 
 Licensed under the Apache License. See [LICENSE](LICENSE)
 

k3d-config.yaml

@@ -1,6 +1,6 @@
 apiVersion: k3d.io/v1alpha3
 kind: Simple
-name: devops
+name: nyu-devops
 servers: 1
 agents: 1
 ports:
@@ -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":
         endpoint:
-          - http://cluster-registry:32000
+          - http://cluster-registry:5000

k8s/deployment.yaml

@@ -1,31 +1,29 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: lab-flask-bdd
+  name: petshop
   labels:
-    app: lab-flask-bdd
+    app: petshop
 spec:
-  replicas: 2
+  replicas: 1
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 0%
       maxUnavailable: 50%
   selector:
     matchLabels:
-      app: lab-flask-bdd
+      app: petshop
   template:
     metadata:
       labels:
-        app: lab-flask-bdd
+        app: petshop
     spec:
-      imagePullSecrets:
-      - name: all-icr-io
       restartPolicy: Always
       containers:
-      - name: lab-flask-bdd
-        # image: cluster-registry:32000/lab-flask-bdd:1.0
-        image: lab-flask-bdd
+      - name: petshop
+        image: cluster-registry:5000/nyu-devops/petshop:1.0.0
+        # image: petshop
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 8080

k8s/ingress.yaml

@@ -2,7 +2,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: lab-flask-bdd
+  name: petshop
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
@@ -13,6 +13,6 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: lab-flask-bdd
+            name: petshop
             port:
               number: 8080

k8s/postgresql.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: postgres
-          image: postgres:alpine
+          image: postgres:15-alpine
           ports:
             - containerPort: 5432
               protocol: TCP

k8s/service.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: lab-flask-bdd
+  name: petshop
 spec:
   selector:
-    app: lab-flask-bdd
+    app: petshop
   type: ClusterIP
   internalTrafficPolicy: Local
   ports: