Start using includes

2024-01-11 18:28:08 +01:00 · 2024-01-11 18:28:08 +01:00 · fba4b8d3b6
parent e55a24dbd6
commit fba4b8d3b6
4 changed files with 133 additions and 130 deletions
--- a/charts/gitops-server.yaml
+++ b/charts/gitops-server.yaml
@ -0,0 +1,68 @@
+name: weave-gitops
+repository: weave
+version: 4.0.15
+variables:
+  target_repo: app-gitops-server
+mirrors:
+  - apps-git
+extensions:
+  - name: Add VPA
+    source_dir: ./extensions/vpa-gitops-server
+    target_dir: templates/gs-vpa
+patches:
+  - name: Git patch
+    git:
+      path: ./patches/git/gitops-server.patch
+  - name: Generate values.schema
+    custom_command:
+      commands:
+        - helm schema-gen values.yaml > values.schema.json
+  - name: Git patch for values schema
+    git:
+      path: ./patches/git/gitops-server-values-schema.patch
+  - name: Git patch for test-job security
+    git:
+      path: ./patches/git/gitops-server-test-job.patch
+  # -- Update Chart.ymal
+  - name: Change the chart name
+    yq:
+      op: Replace
+      file: Chart.yaml
+      key: .name
+      value: gitops-server
+  - name: Set the home URL
+    yq:
+      op: Add
+      file: Chart.yaml
+      key: .home
+      value: https://github.com/giantswarm/gitops-server-app
+  - name: set the icon url
+    yq:
+      op: Add
+      file: Chart.yaml
+      key: .icon
+      value: https://s.giantswarm.io/app-icons/weaveworks/1/icon_light.svg
+  - name: Add keywords
+    yq:
+      op: Add
+      file: Chart.yaml
+      key: .keywords
+      value: '["gitops", "flux"]'
+  - name: Add team annotation
+    yq:
+      op: Add
+      key: .annotations."application.giantswarm.io/team"
+      value: team-honeybadger
+      file: Chart.yaml
+  - name: Add team annotation
+    yq:
+      op: Add
+      key: .annotations."config.giantswarm.io/version"
+      value: 1.x.x
+      file: Chart.yaml
+  - name: yamlfmt
+    custom_command:
+      commands:
+        - "cat <<EOT >> .yamlfmt\n  formatter:\n    pad_line_comments: 2\nEOT"
+        - yamlfmt values.yaml --conf ./yamlfmt.yaml
+        - rm -f yamlfmt.yaml
--- a/charts/zot.yaml
+++ b/charts/zot.yaml
@ -0,0 +1,44 @@
+name: zot
+repository: zot-git
+extensions:
+  - name: Add VPA
+    source_dir: ./extensions/vpa
+    target_dir: templates/gs-vpa
+  - name: Add values for CI
+    source_dir: ./extensions/ci-values
+    target_dir: ci
+variables:
+  target_repo: zot-app
+patches:
+  - name: Add team annotation
+    yq:
+      op: Add
+      key: .annotations."application.giantswarm.io/team"
+      value: team-honeybadger
+      file: Chart.yaml
+  - name:
+    yq:
+      op: Add
+      key: .home
+      value: https://github.com/giantswarm/flux-app
+      file: Chart.yaml
+  - name:
+    yq:
+      op: Add
+      key: .engine
+      value: gtpl
+      file: Chart.yaml
+  - name: Git patch
+    git:
+      path: ./patches/git/zot.patch
+        #      - name: Regexp patches
+        #        regexp:
+        #          path: ./patches/regexp
+  - name: yamlfmt
+    custom_command:
+      commands:
+        - "cat <<EOT >> .yamlfmt\n  formatter:\n    pad_line_comments: 2\nEOT"
+        - yamlfmt values.yaml --conf ./yamlfmt.yaml
+        - rm -f yamlfmt.yaml
+mirrors:
+  - apps-git
--- a/helmule.yaml
+++ b/helmule.yaml
@ -1,136 +1,14 @@
+include:
+  - kind: Repositories
+    path: ./repositories.yaml
+  - kind: Charts
+    path: ./charts/zot.yaml
+  - kind: Charts
+    path: ./charts/gitops-server.yaml
+
 variables:
  global: example

-repositories:
-  # -- Because their helm repo seems not to be accessible
-  - name: zot-git
-    git:
-      url: https://github.com/project-zot/helm-charts.git
-      git_ref: main
-      # git_ref: zot-0.1.42
-      path: charts
-  - name: weave
-    helm:
-      url: https://helm.gitops.weave.works
-charts:
-  # -------------------------------------------------------------------
-  # -- Zot Application
-  # -------------------------------------------------------------------
-  - name: zot
-    repository: zot-git
-    extensions:
-      - name: Add VPA
-        source_dir: ./extensions/vpa
-        target_dir: templates/gs-vpa
-      - name: Add values for CI
-        source_dir: ./extensions/ci-values
-        target_dir: ci
-    variables:
-      target_repo: zot-app
-    patches:
-      - name: Add team annotation
-        yq:
-          op: Add
-          key: .annotations."application.giantswarm.io/team"
-          value: team-honeybadger
-          file: Chart.yaml
-      - name:
-        yq:
-          op: Add
-          key: .home
-          value: https://github.com/giantswarm/flux-app
-          file: Chart.yaml
-      - name:
-        yq:
-          op: Add
-          key: .engine
-          value: gtpl
-          file: Chart.yaml
-      - name: Git patch
-        git:
-          path: ./patches/git/zot.patch
-            #      - name: Regexp patches
-            #        regexp:
-            #          path: ./patches/regexp
-      - name: yamlfmt
-        custom_command:
-          commands:
-            - "cat <<EOT >> .yamlfmt\n  formatter:\n    pad_line_comments: 2\nEOT"
-            - yamlfmt values.yaml --conf ./yamlfmt.yaml
-            - rm -f yamlfmt.yaml
-    mirrors:
-      - apps-git
-  # -------------------------------------------------------------------
-  # -- GitOps Server Application
-  # -------------------------------------------------------------------
-  - name: weave-gitops
-    repository: weave
-    version: 4.0.15
-    variables:
-      target_repo: app-gitops-server
-    mirrors:
-      - apps-git
-    extensions:
-      - name: Add VPA
-        source_dir: ./extensions/vpa-gitops-server
-        target_dir: templates/gs-vpa
-    patches:
-      - name: Git patch
-        git:
-          path: ./patches/git/gitops-server.patch
-      - name: Generate values.schema
-        custom_command:
-          commands:
-            - helm schema-gen values.yaml > values.schema.json
-      - name: Git patch for values schema
-        git:
-          path: ./patches/git/gitops-server-values-schema.patch
-      - name: Git patch for test-job security
-        git:
-          path: ./patches/git/gitops-server-test-job.patch
-      # -- Update Chart.ymal
-      - name: Change the chart name
-        yq:
-          op: Replace
-          file: Chart.yaml
-          key: .name
-          value: gitops-server
-      - name: Set the home URL
-        yq:
-          op: Add
-          file: Chart.yaml
-          key: .home
-          value: https://github.com/giantswarm/gitops-server-app
-      - name: set the icon url
-        yq:
-          op: Add
-          file: Chart.yaml
-          key: .icon
-          value: https://s.giantswarm.io/app-icons/weaveworks/1/icon_light.svg
-      - name: Add keywords
-        yq:
-          op: Add
-          file: Chart.yaml
-          key: .keywords
-          value: '["gitops", "flux"]'
-      - name: Add team annotation
-        yq:
-          op: Add
-          key: .annotations."application.giantswarm.io/team"
-          value: team-honeybadger
-          file: Chart.yaml
-      - name: Add team annotation
-        yq:
-          op: Add
-          key: .annotations."config.giantswarm.io/version"
-          value: 1.x.x
-          file: Chart.yaml
-      - name: yamlfmt
-        custom_command:
-          commands:
-            - "cat <<EOT >> .yamlfmt\n  formatter:\n    pad_line_comments: 2\nEOT"
-            - yamlfmt values.yaml --conf ./yamlfmt.yaml
-            - rm -f yamlfmt.yaml
 mirrors:
  - name: apps-git
    git:
--- a/repositories.yaml
+++ b/repositories.yaml
@ -0,0 +1,13 @@
+# ---------------------------------------------------------------------
+# -- Repositories
+# --------------------------------------------------------------------
+- name: zot-git
+  # -- Because their helm repo seems not to be accessible
+  git:
+    url: https://github.com/project-zot/helm-charts.git
+    git_ref: main
+    # git_ref: zot-0.1.42
+    path: charts
+- name: weave
+  helm:
+    url: https://helm.gitops.weave.works