Merge branch 'main' into wait-for-postgres

- remove PCI

Author: aclevername

Dockerfile

@@ -1,5 +1,6 @@
 FROM golang:1.18-alpine as builder
 
+ARG version
 WORKDIR /app
 
 COPY . ./
@@ -17,4 +18,6 @@ COPY --from=builder /app/views/ ./views/
 
 EXPOSE 8080
 
-CMD [ "/app/todo-server" ]
+ARG version
+ENV VERSION=${version}
+CMD [ "/app/todo-server" ]

README.md

@@ -1,6 +1,8 @@
 # Sample Golang To Do app
 
-The application code is based on a [blog](https://blog.logrocket.com/building-simple-app-go-postgresql/) published by Emmanuel John.
+The application code is based on a
+[blog](https://blog.logrocket.com/building-simple-app-go-postgresql/) published
+by Emmanuel John.
 
 ## Running
 

ci/Jenkinsfile

@@ -1,33 +1,23 @@
-podTemplate(yaml: '''
-              apiVersion: v1
-              kind: Pod
-              spec:
-                serviceAccountName: example-knative-jenkins-deployer
-                containers:
-                - name: kubectl
-                  image: bitnami/kubectl:1.22.13
-                  imagePullPolicy: Always
-                  command:
-                  - sleep
-                  args:
-                  - 99d
-                  securityContext:
-                    runAsUser: 0
-'''
-  ) {
+podTemplate(
+  serviceAccount: 'example-knative-jenkins-deployer',
+  containers: [
+    containerTemplate(name: 'deploy', image: 'bitnami/kubectl:1.22.13', command: 'sleep', args: '99d', runAsUser: '0')
+  ]) {
 
-  node(POD_LABEL) {
-    stage('Deploy application') {
-      git branch: 'main', url: 'https://github.com/syntasso/sample-golang-app.git'
-      container('kubectl') {
-        sh '''
-        kubectl apply --filename ./k8s/serving.yaml
-        until [ "$(curl -s -o /dev/null -w "%{http_code}" -H "host: todo.default.local.gd" kourier.kourier-system.svc.cluster.local)" -eq "200" ]
-        do
-          sleep 2
-        done
-        '''
-      }
-    }
-  }
+		node(POD_LABEL) {
+			stage('deploy') {
+				git branch: 'workshop-refactor', url: 'https://github.com/syntasso/sample-golang-app.git'
+				container('deploy') {
+					sh '''
+					kubectl apply --filename ./k8s/app.yaml
+					until [ "$(curl -s -o /dev/null -w "%{http_code}" -H "host: todo.local.gd" nginx-nginx-ingress.default.svc.cluster.local)" -eq "200" ]
+					do
+						sleep 2
+					done
+					'''
+				}
+			}
+		}
 }
+
+

k8s/app.yaml

@@ -0,0 +1,67 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: todo-ingress-resource-backend
+  namespace: default
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: todo.local.gd
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: todo
+            port:
+              number: 8080
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: todo
+  namespace: default
+spec:
+  selector:
+    run: todo
+  ports:
+  - name: web
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  type: ClusterIP
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    run: todo
+  name: todo
+  namespace: default
+spec:
+  selector:
+    matchLabels:
+      run: todo
+  template:
+    metadata:
+      labels:
+        run: todo
+    spec:
+      containers:
+      - image: syntasso/sample-todo-app:v0.1.2
+        ports:
+        - containerPort: 8080
+        env:
+          - name: PGPASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: postgres.acid-example-postgresql.credentials.postgresql.acid.zalan.do
+                key: password
+          - name: PGHOST
+            value: acid-example-postgresql.default.svc.cluster.local
+          - name: DBNAME
+            value: bestdb
+        imagePullPolicy: IfNotPresent
+        name: todo

k8s/service-account.yaml

@@ -25,8 +25,20 @@ metadata:
   namespace: default
 rules:
   - apiGroups:
-      - serving.knative.dev
+      - ""
     resources:
       - services
     verbs:
       - "*"
+  - apiGroups:
+      - "networking.k8s.io"
+    resources:
+      - ingresses
+    verbs:
+      - "*"
+  - apiGroups:
+      - apps
+    resources:
+      - deployments
+    verbs:
+      - "*"

k8s/serving.yaml

@@ -27,6 +27,9 @@ func main() {
 
 	connStr := fmt.Sprintf("postgresql://%s:%s@%s/%s?sslmode=%s", pgUser, pgPassword, pgHost, dbName, pgSSLMode)
 
+	version := os.Getenv("VERSION")
+	fmt.Println("Version: ", version)
+
 	// Connect to database
 	db, err := sql.Open("postgres", connStr)
 	if err != nil {
@@ -50,7 +53,7 @@ func main() {
 	})
 
 	app.Get("/", func(c *fiber.Ctx) error {
-		return getTodos(c, db)
+		return getTodos(c, db, version)
 	})
 
 	app.Post("/", func(c *fiber.Ctx) error {
@@ -89,7 +92,7 @@ func main() {
 	log.Println(app.Listen(fmt.Sprintf(":%v", port)))
 }
 
-func getTodos(c *fiber.Ctx, db *sql.DB) error {
+func getTodos(c *fiber.Ctx, db *sql.DB, version string) error {
 	var res string
 	var todos []string
 	rows, err := db.Query("SELECT * FROM todos")
@@ -104,12 +107,10 @@ func getTodos(c *fiber.Ctx, db *sql.DB) error {
 		todos = append(todos, res)
 	}
 
-	containsCC := os.Getenv("CONTAINS_CC") == "true"
-
 	return c.Render("index", fiber.Map{
 		"Todos":      todos,
 		"Enterprise": os.Getenv("ENTERPRISE"),
-		"PCI":        containsCC,
+		"Version":    version,
 	})
 }
 

main.go

@@ -23,19 +23,18 @@
                     {{ if .Enterprise }}
                         <br /><strong class="text-secondary">Enterprise Edition™️</strong>
                     {{ end }}
-
-                    {{ if .PCI }}
-                        <br /><strong class="text-secondary">PCI-Safe Edition™️</strong>
+                    {{ if .Version }}
+                    <br /><strong class="text-secondary">Version {{ .Version }}</strong>
                     {{ end }}
                </div>
            </div>
        </div>
        <!-- Create todo section -->
        <div class="row m-1 p-3">
            <div class="col col-11 mx-auto">
-               <form action="/" method="POST" class="row bg-white rounded shadow-sm p-2 add-todo-wrapper align-items-center justify-content-center">
+               <form action="/" method="POST" autocomplete="off" class="row bg-white rounded shadow-sm p-2 add-todo-wrapper align-items-center justify-content-center">
                    <div class="col">
-                       <input name="Item" class="form-control form-control-lg border-0 add-todo-input bg-transparent rounded" type="text" placeholder="Add new ..">
+                       <input name="Item" autocomplete="off" class="form-control form-control-lg border-0 add-todo-input bg-transparent rounded" type="text" placeholder="Add new ..">
                    </div>
                    <div class="col-auto px-0 mx-0 mr-2">
                        <button type="submit" class="btn btn-primary">Add</button>