Merge pull request #153 from cloudify-cosmo/NE-27440-fastly-waf

[NE-27440] - Adding fastly option do deploy with the worker.
cloudify-cosmo · Apr 18, 2024 · b5b80e6 · b5b80e6
2 parents 27dd4fc + 25ba717
commit b5b80e6
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 29 deletions.
diff --git a/cloudify-manager-worker/CHANGELOG.md b/cloudify-manager-worker/CHANGELOG.md
@@ -12,6 +12,28 @@ Provides a release information for each version splitted by the next sections
 
 </br>
 
+# [v0.4.9]
+
+## Changed
+
+- statefulset has now the fastly sidecar container
+
+## Added
+
+- values for fastly sidecar image
+
+## Fixed
+
+-
+
+## Removed
+
+-
+
+## Upgrade notes
+
+- in case you want to deploy the worker with Fastly WAF you need to provide the secret for fastly that needs to include values for accesskey and secretkey (Fastly Agent). Additionaly set fastly.enabled=true during install, by default its not enabled.
+
 # [v0.4.8]
 
 ## Changed

diff --git a/cloudify-manager-worker/Chart.yaml b/cloudify-manager-worker/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: cloudify-manager-worker
 description: Cloudify manager worker
-version: 0.4.8
+version: 0.4.9
 dependencies:
   - name: rabbitmq
     version: "8.29.0"

diff --git a/cloudify-manager-worker/templates/_helpers.tpl b/cloudify-manager-worker/templates/_helpers.tpl
@@ -118,4 +118,8 @@ Return values or placeholders for replace in script
     {{- else -}}
         {{- .Values.config.security.adminPassword -}}
     {{- end -}}
-{{- end -}}
+{{- end -}}
+
+{{- define "fastly.image" -}}
+{{- printf "%s/%s:%s" .Values.fastly.repo .Values.fastly.image_name .Values.fastly.tag }}
+{{- end }}
diff --git a/cloudify-manager-worker/templates/service.yaml b/cloudify-manager-worker/templates/service.yaml
@@ -12,7 +12,11 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.http.port }}
+      {{- if .Values.fastly.enabled }}
+      targetPort: 8002
+      {{- else }}
       targetPort: {{ .Values.service.http.port }}
+      {{- end }}
       protocol: TCP
       name: http
     - port: {{ .Values.service.https.port }}

diff --git a/cloudify-manager-worker/templates/statefulset.yaml b/cloudify-manager-worker/templates/statefulset.yaml
@@ -255,7 +255,45 @@ spec:
         {{- end }}
         {{- end }}
         {{- end }}
+      {{- if .Values.fastly.enabled }}
+      - name: sigsci-agent
+        image: {{ include "fastly.image" . }}
+        imagePullPolicy: Always
+        env:
+        - name: SIGSCI_ACCESSKEYID
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.fastly.existingFastlySecretName }}
+              key: {{ .Values.fastly.existingFastlyAccessKeyName }}
+        - name: SIGSCI_SECRETACCESSKEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.fastly.existingFastlySecretName }}
+              key: {{ .Values.fastly.existingFastlySecretAccessKeyName }}
+        # Configure the revproxy listener to listen on a new port 8001
+        # forwarding to the app on the original port 8000 as the upstream
+        - name: SIGSCI_REVPROXY_LISTENER
+          value: "http:{listener='http://0.0.0.0:8002',upstreams='http://0.0.0.0:80',access-log='/dev/stdout'}"
+        ports:
+          - containerPort: 8002
+            protocol: TCP
+        securityContext:
+          # The sigsci-agent container should run with its root filesystem read only
+          readOnlyRootFilesystem: true
+        volumeMounts:
+        # Default volume mount location for sigsci-agent writeable data
+        # NOTE: Also change `SIGSCI_SHARED_CACHE_DIR` (default `/sigsci/tmp/cache`)
+        #       if mountPath is changed, but best not to change.
+        - name: sigsci-tmp
+          mountPath: /sigsci/tmp
+      {{- end }}
       volumes:
+      # Define a volume where sigsci-agent will write temp data and share the socket file,
+      # which is required with the root filesystem is mounted read only
+      {{- if .Values.fastly.enabled }}
+      - name: sigsci-tmp
+        emptyDir: {}
+      {{- end }}
       - name: run
         emptyDir:
           medium: Memory

diff --git a/cloudify-manager-worker/values.yaml b/cloudify-manager-worker/values.yaml
@@ -60,6 +60,15 @@ initContainers:
         memory: 50Mi
         cpu: 0.1
 
+fastly:
+  existingFastlySecretName: fastly-sigsci
+  existingFastlyAccessKeyName: accesskeyid
+  existingFastlySecretAccessKeyName: secretaccesskey
+  enabled: false
+  repo: signalsciences
+  image_name: sigsci-agent
+  tag: latest
+
 # -- Parameters group for connection to PostgreSQL database
 # @default -- object
 db:

diff --git a/index.yaml b/index.yaml
@@ -2,23 +2,23 @@ apiVersion: v1
 entries:
   cloudify-manager-aio:
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.862878+06:00"
+    created: "2024-04-18T11:50:44.367033922+02:00"
     description: Cloudify manager aio
     digest: 1b9234bb0847d72808100aefdbb4014589096e95ab951c265e59e7d710bb5e41
     name: cloudify-manager-aio
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-aio-0.1.2.tgz
     version: 0.1.2
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.862309+06:00"
+    created: "2024-04-18T11:50:44.366278317+02:00"
     description: Cloudify manager aio
     digest: 87513b0b0cde8febdc88794f6d8bb626ccdf4901b1f29d60e0ea033e8cbb470f
     name: cloudify-manager-aio
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-aio-0.1.1.tgz
     version: 0.1.1
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.861868+06:00"
+    created: "2024-04-18T11:50:44.365923951+02:00"
     description: Cloudify manager aio
     digest: eb298bcebfd78a1a36cb305b4b5d09c383388953f71adb9355f5c5b4a3c52838
     name: cloudify-manager-aio
@@ -27,7 +27,24 @@ entries:
     version: 0.1.0
   cloudify-manager-worker:
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.924364+06:00"
+    created: "2024-04-18T11:50:44.54980118+02:00"
+    dependencies:
+    - condition: rabbitmq.deploy
+      name: rabbitmq
+      repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+      version: 8.29.0
+    - condition: postgresql.deploy
+      name: postgresql
+      repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+      version: 10.15.0
+    description: Cloudify manager worker
+    digest: fc955f48b5dfe3ea588959b1b3f7e469982ce783805d95175b25ccb3db7bec9d
+    name: cloudify-manager-worker
+    urls:
+    - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.9.tgz
+    version: 0.4.9
+  - apiVersion: v2
+    created: "2024-04-18T11:50:44.534283103+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -44,7 +61,7 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.8.tgz
     version: 0.4.8
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.91898+06:00"
+    created: "2024-04-18T11:50:44.51950174+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -61,7 +78,7 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.7.tgz
     version: 0.4.7
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.913359+06:00"
+    created: "2024-04-18T11:50:44.505800804+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -78,7 +95,7 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.6.tgz
     version: 0.4.6
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.907695+06:00"
+    created: "2024-04-18T11:50:44.489880278+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -95,7 +112,7 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.5.tgz
     version: 0.4.5
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.902508+06:00"
+    created: "2024-04-18T11:50:44.468631191+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -112,7 +129,7 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.4.tgz
     version: 0.4.4
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.896735+06:00"
+    created: "2024-04-18T11:50:44.451982982+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -129,7 +146,7 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.3.tgz
     version: 0.4.3
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.890774+06:00"
+    created: "2024-04-18T11:50:44.430691288+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -146,7 +163,7 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.2.tgz
     version: 0.4.2
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.884992+06:00"
+    created: "2024-04-18T11:50:44.414704659+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -163,7 +180,7 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.1.tgz
     version: 0.4.1
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.879413+06:00"
+    created: "2024-04-18T11:50:44.403135225+02:00"
     dependencies:
     - condition: rabbitmq.deploy
       name: rabbitmq
@@ -180,115 +197,115 @@ entries:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.4.0.tgz
     version: 0.4.0
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.873418+06:00"
+    created: "2024-04-18T11:50:44.387097462+02:00"
     description: Cloudify manager worker
     digest: a1c6492b7a48a59d53d8023175a6fa47ff7c92e633e17fc948ef4a07929dcf13
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.3.1.tgz
     version: 0.3.1
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.872358+06:00"
+    created: "2024-04-18T11:50:44.384913021+02:00"
     description: Cloudify manager worker
     digest: f4be1b7f7b7528a8bbd84ef90e98c20a7755a02fc96e4ce4bb4b794c595e6612
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.3.0.tgz
     version: 0.3.0
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.871141+06:00"
+    created: "2024-04-18T11:50:44.383168501+02:00"
     description: Cloudify manager worker
     digest: bf3f693fd45b888e1e5dc9a99013171f047ea7b49ecf46310735715ccb42b079
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.2.7.tgz
     version: 0.2.7
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.870125+06:00"
+    created: "2024-04-18T11:50:44.381362112+02:00"
     description: Cloudify manager worker
     digest: 1a3a32ef3a3c44e85105ff2e0673183e53762b6a3534e593124391cef3b8a918
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.2.6.tgz
     version: 0.2.6
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.869402+06:00"
+    created: "2024-04-18T11:50:44.380048778+02:00"
     description: Cloudify manager worker
     digest: d8d926425bbe1e9624395fba419f3b6db84e07f4fe5d9f361b4a6e15383ff009
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.2.5.tgz
     version: 0.2.5
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.868679+06:00"
+    created: "2024-04-18T11:50:44.37761151+02:00"
     description: Cloudify manager worker
     digest: 55d0e2950e049bc4922e06e4c93a0cf8edfd515289f44e7a402dd03ebde6466b
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.2.4.tgz
     version: 0.2.4
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.867463+06:00"
+    created: "2024-04-18T11:50:44.37620098+02:00"
     description: Cloudify manager worker
     digest: 27529bf446f1fe22d27efda4774907d42d0b4b6c42b1f2da2810d04d643f2731
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.2.3.tgz
     version: 0.2.3
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.866897+06:00"
+    created: "2024-04-18T11:50:44.375081189+02:00"
     description: Cloudify manager worker
     digest: 73bf0874a78a2b7100d84da2c2f1193ddd3a41922569f8d882b6ca922741212e
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.2.2.tgz
     version: 0.2.2
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.866372+06:00"
+    created: "2024-04-18T11:50:44.374135391+02:00"
     description: Cloudify manager worker
     digest: c9b0ff87fb5066fadd7566e319539c39f9ffef299f080f7f3344494c1d600b69
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.2.1.tgz
     version: 0.2.1
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.865842+06:00"
+    created: "2024-04-18T11:50:44.373232933+02:00"
     description: Cloudify manager worker
     digest: 80913e82632feb31425f15cadab587f1937db4662f403eee86f059ed5de06f38
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.2.0.tgz
     version: 0.2.0
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.8653+06:00"
+    created: "2024-04-18T11:50:44.372230489+02:00"
     description: Cloudify manager worker
     digest: 52469c8723a55c4bdcc6bc1e4a54c81f56f77fca8801d1c08bdf483351b5aef8
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.1.9.tgz
     version: 0.1.9
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.864779+06:00"
+    created: "2024-04-18T11:50:44.371232942+02:00"
     description: Cloudify manager worker
     digest: 72d440f79390779f88d0498051455a8266663ec7cf3d5112beb2f4e5e17d9dc8
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.1.8.tgz
     version: 0.1.8
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.864232+06:00"
+    created: "2024-04-18T11:50:44.369165061+02:00"
     description: Cloudify manager worker
     digest: 54e536daefaeeb04334a4457d9a3c50a76dd3b703907ff01092d146d8fbf4b2b
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.1.7.tgz
     version: 0.1.7
   - apiVersion: v2
-    created: "2023-07-20T18:36:13.863527+06:00"
+    created: "2024-04-18T11:50:44.368054673+02:00"
     description: Cloudify manager worker
     digest: 08ef470c4884d9326666df25412c2b15efeee313d7f5edcac370b96620dba6a6
     name: cloudify-manager-worker
     urls:
     - https://cloudify-cosmo.github.io/cloudify-helm/packages/cloudify-manager-worker-0.1.6.tgz
     version: 0.1.6
-generated: "2023-07-20T18:36:13.861295+06:00"
+generated: "2024-04-18T11:50:44.365276074+02:00"
diff --git a/packages/cloudify-manager-worker-0.4.9.tgz b/packages/cloudify-manager-worker-0.4.9.tgz