+semver: patch add checksum on configmaps to cause deployment rollout on change

ilia-medvedev-codefresh · web-flow · commit 061f3c4e03d1 · 2022-09-18T10:10:32.000+03:00
diff --git a/codefresh-tunnel-client/templates/client-config.yaml b/codefresh-tunnel-client/templates/client-config.yaml
@@ -4,7 +4,6 @@ metadata:
   name: codefresh-tunnel-client-config
 data:
   frpc.ini: |-
-    frpc.ini: |-
     [common]
     server_addr = {{ required "tunnelServer.host is required" .Values.tunnelServer.host }}
     server_port = {{ required "tunnelServer.port is required" .Values.tunnelServer.port }}
diff --git a/codefresh-tunnel-client/templates/deployment.yaml b/codefresh-tunnel-client/templates/deployment.yaml
@@ -5,6 +5,8 @@ metadata:
   labels:
     app: {{ include "codefresh-tunnel-client.name" .}}
     release: {{ .Release.Name }}
+  annotations:
+      checksum/config: {{ include (print $.Template.BasePath "/client-config.yaml") . | sha256sum }}
 spec:
   replicas: 1
   selector:
diff --git a/codefresh-tunnel-client/tests/client_config_test.yaml b/codefresh-tunnel-client/tests/client_config_test.yaml
@@ -0,0 +1,29 @@
+suite: Test client config
+templates:
+  - client-config.yaml
+tests:
+  - it: When non are provided should fail
+    values:
+    - values/missing-server.yaml
+    asserts:
+      - failedTemplate:
+          errorMessage: "tunnelServer.host is required"
+  - it: Forward to is possible to corresponts to values
+    values:
+    - values/required-values.yaml
+    - values/forward-to.yaml
+    asserts:
+    - matchRegex: 
+        path: data.frpc\.ini
+        pattern: ".*local_ip = test.*"
+    - matchRegex: 
+        path: data.frpc\.ini
+        pattern: ".*local_port = 1234.*"
+    - matchRegex: 
+        path: data.frpc\.ini
+        pattern: ".*locations = /test.*"
+    - matchRegex: 
+        path: data.frpc\.ini
+        pattern: '.mysubdomain.*'
+
+    
diff --git a/codefresh-tunnel-client/tests/client_config_tests.yaml b/codefresh-tunnel-client/tests/client_config_tests.yaml
diff --git a/codefresh-tunnel-client/tests/deployment_test.yaml b/codefresh-tunnel-client/tests/deployment_test.yaml
@@ -0,0 +1,21 @@
+suite: Test client deployment
+templates:
+  - deployment.yaml
+  - client-config.yaml
+tests:
+  - it: Config hash exists
+    values:
+    - values/required-values.yaml
+    template: deployment.yaml
+    asserts:
+      - isNotNull: 
+          path: metadata.annotations.checksum/config
+  - it: Image correctly set
+    template: deployment.yaml
+    values:
+    - values/required-values.yaml
+    - values/image.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: myrepo/tunnel-client:1
diff --git a/codefresh-tunnel-client/tests/values/forward-to.yaml b/codefresh-tunnel-client/tests/values/forward-to.yaml
@@ -0,0 +1,11 @@
+tunnelServer:
+    host: server
+    port: 443
+
+tunnel:
+  subdomainPrefix: mysubdomain
+  forwardTo:
+    type: http
+    host: test
+    port: 1234
+    location: /test
diff --git a/codefresh-tunnel-client/tests/values/image.yaml b/codefresh-tunnel-client/tests/values/image.yaml
@@ -0,0 +1,3 @@
+image:
+  repository: myrepo/tunnel-client
+  tag: "1"
diff --git a/codefresh-tunnel-client/tests/values/required-values.yaml b/codefresh-tunnel-client/tests/values/required-values.yaml
@@ -0,0 +1,7 @@
+tunnelServer:
+    host: server
+    port: 443
+tunnel:
+  # Subdomain is defined on the sever. The client sets it's prefix. For example, if the subdomain host on server
+  # is tunnels.example setting this value to would make the tunnel acces
+  subdomainPrefix: mysubdomain
diff --git a/codefresh-tunnel-server/templates/tunnel-server-deployment.yaml b/codefresh-tunnel-server/templates/tunnel-server-deployment.yaml
@@ -5,6 +5,8 @@ metadata:
   labels:
     app: {{ include "codefresh-tunnel-server.name" .}}
     release: {{ .Release.Name }}
+  annotations:
+      checksum/config: {{ include (print $.Template.BasePath "/server-config.yaml") . | sha256sum }}
 spec:
 {{- include "codefresh-tunnel-server.deploymentScale" . | nindent 2 }}  
   selector:
diff --git a/codefresh-tunnel-server/tests/deployment_image_test.yaml b/codefresh-tunnel-server/tests/deployment_image_test.yaml
diff --git a/codefresh-tunnel-server/tests/deployments_test.yaml b/codefresh-tunnel-server/tests/deployments_test.yaml
@@ -0,0 +1,71 @@
+suite: Test deployments
+templates:
+  - tunnel-server-deployment.yaml
+  - router-deployment.yaml
+  - server-config.yaml
+tests:
+  - it: Server image
+    template: tunnel-server-deployment.yaml
+    values:
+      - ./values/images.yaml
+    asserts:
+    - equal:
+          path: spec.template.spec.containers[0].image
+          value: myrepo/tunnel-server:1
+  - it: plugin image
+    template: tunnel-server-deployment.yaml
+    values:
+      - ./values/images.yaml
+    asserts:
+    - equal:
+          path: spec.template.spec.containers[1].image
+          value: myrepo/tunnel-plugin:2
+  - it: router image
+    template: router-deployment.yaml
+    values:
+      - ./values/images.yaml
+    asserts:
+    - equal:
+          path: spec.template.spec.containers[0].image
+          value: myrepo/tunnel-router:3
+  - it: Config hash exists
+    template: tunnel-server-deployment.yaml
+    values:
+    - ./values/deployment-tests.yaml
+    asserts:
+      - isNotNull: 
+          path: metadata.annotations.checksum/config
+  - it: server resources set
+    template: tunnel-server-deployment.yaml
+    values:
+      - ./values/deployment-tests.yaml
+    asserts:
+    - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: '100Mi'
+    - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: '100m'
+  - it: plugin resources set
+    template: tunnel-server-deployment.yaml
+    values:
+      - ./values/deployment-tests.yaml
+    asserts:
+    - equal:
+          path: spec.template.spec.containers[1].resources.requests.memory
+          value: '100Mi'
+    - equal:
+          path: spec.template.spec.containers[1].resources.requests.cpu
+          value: '100m'
+  - it: router resources set
+    template: router-deployment.yaml
+    values:
+      - ./values/deployment-tests.yaml
+    asserts:
+    - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: '100Mi'
+    - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: '100m'
+  
diff --git a/codefresh-tunnel-server/tests/server_redis_url_test.yaml b/codefresh-tunnel-server/tests/server_redis_url_test.yaml
@@ -2,6 +2,7 @@ suite: Test deployments for correct setting of Redis URL environment variable
 templates:
   - tunnel-server-deployment.yaml
   - router-deployment.yaml
+  - server-config.yaml
 tests:
   - it: if only url is set use it
     template: tunnel-server-deployment.yaml
diff --git a/codefresh-tunnel-server/tests/values/deployment-tests.yaml b/codefresh-tunnel-server/tests/values/deployment-tests.yaml
@@ -0,0 +1,24 @@
+server:
+  resources:
+    requests:
+      cpu: '100m'
+      memory: '100Mi'
+
+plugin:
+  resources:
+    requests:
+      cpu: '100m'
+      memory: '100Mi'
+
+scaling:
+  enabled: true
+  redisURL:
+    url: 'test'
+  router:
+    resources:
+      requests:
+        cpu: '100m'
+        memory: '100Mi'
+      
+
+      

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+image:`
	`2`	`+ repository: myrepo/tunnel-client`
	`3`	`+ tag: "1"`