From b0a1b8e7d77e264e88c4ef16293b5079a12ff0a6 Mon Sep 17 00:00:00 2001 From: PT-ATA No One Date: Thu, 14 Dec 2023 16:05:14 +0100 Subject: [PATCH] chanhe structure again --- .github/workflows/ci.yaml | 52 +++++++++++++++++++ Chart.lock => charts/vaas/Chart.lock | 0 Chart.yaml => charts/vaas/Chart.yaml | 0 .../vaas/templates}/gateway/NOTES.txt | 0 .../vaas/templates}/gateway/_helpers.tpl | 0 .../vaas/templates}/gateway/ingress.yaml | 0 .../templates}/gateway/networkpolicy.yaml | 0 .../gateway/poddisruptionbudget.yaml | 0 .../vaas/templates}/gateway/secret.yaml | 2 +- .../vaas/templates}/gateway/service.yaml | 0 .../templates}/gateway/servicemonitor.yaml | 0 .../vaas/templates}/gateway/statefulset.yaml | 0 values.yaml => charts/vaas/values.yaml | 3 ++ 13 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/ci.yaml rename Chart.lock => charts/vaas/Chart.lock (100%) rename Chart.yaml => charts/vaas/Chart.yaml (100%) rename {templates => charts/vaas/templates}/gateway/NOTES.txt (100%) rename {templates => charts/vaas/templates}/gateway/_helpers.tpl (100%) rename {templates => charts/vaas/templates}/gateway/ingress.yaml (100%) rename {templates => charts/vaas/templates}/gateway/networkpolicy.yaml (100%) rename {templates => charts/vaas/templates}/gateway/poddisruptionbudget.yaml (100%) rename {templates => charts/vaas/templates}/gateway/secret.yaml (76%) rename {templates => charts/vaas/templates}/gateway/service.yaml (100%) rename {templates => charts/vaas/templates}/gateway/servicemonitor.yaml (100%) rename {templates => charts/vaas/templates}/gateway/statefulset.yaml (100%) rename values.yaml => charts/vaas/values.yaml (98%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..b4d6ec5 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,52 @@ +name: Release Charts + +on: + push: + branches: + - main + tags: + - "*" + pull_request: + branches: + - main + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.4.0 + + - name: Add deps + run: | + helm repo add gdscan https://gdatasoftwareag.github.io/gdscan/ + helm repo add bitnami https://charts.bitnami.com/bitnami/ + + - name: Install python + uses: actions/setup-python@v4 + with: + python-version: 3.7 + + - name: Set up chart-testing + uses: helm/chart-testing-action@v2.6.0 + + - name: Run chart-testing (lint) + run: ct lint --validate-maintainers=false --charts charts/vaas + + - name: Run chart-releaser + if: github.ref == 'refs/heads/main' + uses: helm/chart-releaser-action@v1.5.0 + env: + CR_TOKEN: "${{ secrets.BOT_SECRET }}" \ No newline at end of file diff --git a/Chart.lock b/charts/vaas/Chart.lock similarity index 100% rename from Chart.lock rename to charts/vaas/Chart.lock diff --git a/Chart.yaml b/charts/vaas/Chart.yaml similarity index 100% rename from Chart.yaml rename to charts/vaas/Chart.yaml diff --git a/templates/gateway/NOTES.txt b/charts/vaas/templates/gateway/NOTES.txt similarity index 100% rename from templates/gateway/NOTES.txt rename to charts/vaas/templates/gateway/NOTES.txt diff --git a/templates/gateway/_helpers.tpl b/charts/vaas/templates/gateway/_helpers.tpl similarity index 100% rename from templates/gateway/_helpers.tpl rename to charts/vaas/templates/gateway/_helpers.tpl diff --git a/templates/gateway/ingress.yaml b/charts/vaas/templates/gateway/ingress.yaml similarity index 100% rename from templates/gateway/ingress.yaml rename to charts/vaas/templates/gateway/ingress.yaml diff --git a/templates/gateway/networkpolicy.yaml b/charts/vaas/templates/gateway/networkpolicy.yaml similarity index 100% rename from templates/gateway/networkpolicy.yaml rename to charts/vaas/templates/gateway/networkpolicy.yaml diff --git a/templates/gateway/poddisruptionbudget.yaml b/charts/vaas/templates/gateway/poddisruptionbudget.yaml similarity index 100% rename from templates/gateway/poddisruptionbudget.yaml rename to charts/vaas/templates/gateway/poddisruptionbudget.yaml diff --git a/templates/gateway/secret.yaml b/charts/vaas/templates/gateway/secret.yaml similarity index 76% rename from templates/gateway/secret.yaml rename to charts/vaas/templates/gateway/secret.yaml index 5aed631..0522f1d 100644 --- a/templates/gateway/secret.yaml +++ b/charts/vaas/templates/gateway/secret.yaml @@ -5,6 +5,6 @@ metadata: name: registry namespace: {{ .Release.Namespace }} data: - .dockerconfigjson: {{ required "You need to set the dockerconfigjson for the private registry" .Values.secret.dockerconfigjson }} + .dockerconfigjson: {{ required "You need to set the dockerconfigjson for the private registry" .Values.gateway.secret.dockerconfigjson }} type: kubernetes.io/dockerconfigjson {{- end -}} \ No newline at end of file diff --git a/templates/gateway/service.yaml b/charts/vaas/templates/gateway/service.yaml similarity index 100% rename from templates/gateway/service.yaml rename to charts/vaas/templates/gateway/service.yaml diff --git a/templates/gateway/servicemonitor.yaml b/charts/vaas/templates/gateway/servicemonitor.yaml similarity index 100% rename from templates/gateway/servicemonitor.yaml rename to charts/vaas/templates/gateway/servicemonitor.yaml diff --git a/templates/gateway/statefulset.yaml b/charts/vaas/templates/gateway/statefulset.yaml similarity index 100% rename from templates/gateway/statefulset.yaml rename to charts/vaas/templates/gateway/statefulset.yaml diff --git a/values.yaml b/charts/vaas/values.yaml similarity index 98% rename from values.yaml rename to charts/vaas/values.yaml index e073100..76aade0 100644 --- a/values.yaml +++ b/charts/vaas/values.yaml @@ -28,6 +28,9 @@ gateway: networkPolicy: enabled: false + secret: + dockerconfigjson: "" + service: type: "" http: