Merge pull request #3 from fastly/grigor/helm-chart-deployment

Add local dependancies and CI check

.github/workflows/deploy-helm-chart.yml

@@ -0,0 +1,39 @@
+# name: Deploy Helm Chart
+
+# on:
+#   workflow_dispatch:
+#   pull_request:
+#     branches: ["release"]
+#     paths:
+#       - stable/jfrog-platform/**
+#   push:
+#     branches: ["release"]
+#     paths:
+#       - stable/jfrog-platform/**
+
+# jobs:
+#   check:
+#     runs-on: forge-amd64-dagger
+#     steps:
+#       - name: Checkout
+#         uses: actions/checkout@v4
+#       - name: Checkout elevation-data
+#         uses: actions/checkout@v4
+#         with:
+#           repository: fastly/elevation-data
+
+    #   - name: Conftest
+    #     uses: fastly/forge/actions/dagger@actions-v1
+    #     if: github.ref != 'refs/heads/release'
+    #     with:
+    #       verb: call
+    #       module: .forge/dagger-modules/standard/registry/
+    #       args: --vault-token="env:VAULT_TOKEN" helm  elevation-conftest --chart ./jfrog-helm-charts/stable/jfrog-platform/ --additional-values ./elevation-data/workloads/dev-usc1/jfrog-platform/jfrog-platform.yaml
+
+    #   - name: Conftest
+    #     uses: fastly/forge/actions/dagger@actions-v1
+    #     if: github.ref == 'refs/heads/release'
+    #     with:
+    #       verb: call
+    #       module: .forge/dagger-modules/standard/registry/
+    #       args: --vault-token="env:VAULT_TOKEN" helm  push --chart ./jfrog-helm-charts/stable/jfrog-platform/ --additional-values ./elevation-data/workloads/dev-usc1/jfrog-platform/jfrog-platform.yaml

stable/jfrog-platform/Chart.lock

@@ -3,14 +3,14 @@ dependencies:
   repository: https://charts.jfrog.io/
   version: 15.5.20
 - name: rabbitmq
-  repository: https://charts.jfrog.io/
-  version: 11.9.3
+  repository: file://local_dependancy_charts/rabbitmq
+  version: 14.6.6
 - name: artifactory
   repository: https://charts.jfrog.io/
   version: 107.104.10
 - name: xray
-  repository: https://charts.jfrog.io/
-  version: 103.107.21
+  repository: file://local_dependancy_charts/xray
+  version: 103.111.15
 - name: catalog
   repository: https://charts.jfrog.io/
   version: 101.13.0
@@ -20,5 +20,5 @@ dependencies:
 - name: worker
   repository: https://charts.jfrog.io/
   version: 101.118.0
-digest: sha256:d1a0a0f3cdf278643b2059fd78afda7b1e722602dd675186f30810f8eccdca7f
-generated: "2025-02-26T18:21:48.98957-05:00"
+digest: sha256:4289db49e8f4654cb464dbd65d218f44748b9f6878f8dfac385c10639bcbc28f
+generated: "2025-03-02T14:43:40.121376-05:00"

stable/jfrog-platform/Chart.yaml

@@ -7,16 +7,16 @@ dependencies:
   version: 15.5.20
 - condition: rabbitmq.enabled
   name: rabbitmq
-  repository: https://charts.jfrog.io/
-  version: 11.9.3
+  repository: file://local_dependancy_charts/rabbitmq
+  version: 14.6.6
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
   version: 107.104.10
 - condition: xray.enabled
   name: xray
-  repository: https://charts.jfrog.io/
-  version: 103.107.21
+  repository: file://local_dependancy_charts/xray
+  version: 103.111.15
 - condition: catalog.enabled
   name: catalog
   repository: https://charts.jfrog.io/

stable/jfrog-platform/INTERNAL_CHAGELOG.md

@@ -0,0 +1,2 @@
+* Added rabbitmq dependency locally to modify chart template to configure EmtpyDisk size to pass elevation conftest
+* Added xray local dependency until templating issue fixed when rabbitmq credential secret set https://github.com/jfrog/charts/pull/1968

stable/jfrog-platform/local_dependancy_charts/rabbitmq/.helmignore

@@ -0,0 +1,25 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+# img folder
+img/
+# Changelog
+CHANGELOG.md

stable/jfrog-platform/local_dependancy_charts/rabbitmq/CHANGELOG.md

@@ -0,0 +1,5 @@
+* Removed all the explicit namespace definition from the resources
+* In template/statefulset.yaml added size limit for empty disk definition
+volumes:
+    - name: empty-dir
+      sizeLimit: 1Gi

stable/jfrog-platform/local_dependancy_charts/rabbitmq/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 2.20.5
+digest: sha256:5b98791747a148b9d4956b81bb8635f49a0ae831869d700d52e514b8fd1a2445
+generated: "2024-07-16T12:17:21.995344+02:00"

stable/jfrog-platform/local_dependancy_charts/rabbitmq/Chart.yaml

@@ -0,0 +1,31 @@
+annotations:
+  category: Infrastructure
+  images: |
+    - name: os-shell
+      image: docker.io/bitnami/os-shell:12-debian-12-r26
+    - name: rabbitmq
+      image: docker.io/bitnami/rabbitmq:3.13.6-debian-12-r1
+  licenses: Apache-2.0
+apiVersion: v2
+appVersion: 3.13.6
+dependencies:
+- name: common
+  repository: oci://registry-1.docker.io/bitnamicharts
+  tags:
+  - bitnami-common
+  version: 2.x.x
+description: RabbitMQ is an open source general-purpose message broker that is designed
+  for consistent, highly-available messaging scenarios (both synchronous and asynchronous).
+home: https://bitnami.com
+icon: https://bitnami.com/assets/stacks/rabbitmq/img/rabbitmq-stack-220x234.png
+keywords:
+- rabbitmq
+- message queue
+- AMQP
+maintainers:
+- name: Broadcom, Inc. All Rights Reserved.
+  url: https://github.com/bitnami/charts
+name: rabbitmq
+sources:
+- https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq
+version: 14.6.6