Merge pull request #11 from konstructio/mgmt-24

add ci for adoption of mgmt-24
konstructio · Oct 7, 2024 · 122b51c · 122b51c
2 parents 104f901 + b294bd6
commit 122b51c
Show file tree

Hide file tree

Showing 9 changed files with 324 additions and 217 deletions.
diff --git a/.argo/publish.yaml b/.argo/publish.yaml
@@ -10,7 +10,7 @@ spec:
       steps:
         - - name: publish-container
             templateRef:
-              name: cwft-kaniko
+              name: cwft-kaniko-v2
               template: build-push
               clusterScope: true
             arguments:
@@ -23,9 +23,10 @@ spec:
                   value: '{{workflow.parameters.containerRegistryURL}}'
                 - name: gitUrlNoProtocol
                   value: '{{workflow.parameters.gitUrlNoProtocol}}'
-        - - name: checkout
+
+        - - name: checkout-repos
             templateRef:
-              name: cwft-git
+              name: cwft-git-v2
               template: checkout-with-gitops
               clusterScope: true
             arguments:
@@ -36,49 +37,91 @@ spec:
                   value: '{{workflow.parameters.branch}}'
                 - name: gitUrlNoProtocol
                   value: '{{workflow.parameters.gitUrlNoProtocol}}'
-        - - name: get-initial-chart-version
+
+        - - name: get-initial-micro-chart-version
             templateRef:
-              name: cwft-helm
+              name: cwft-helm-v2
               template: get-chart-version
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
-                  from: '{{steps.checkout.outputs.artifacts.repo-source}}'
+                  from: '{{steps.checkout-repos.outputs.artifacts.repo-source}}'
               parameters:
                 - name: appName
                   value: '{{workflow.parameters.appName}}'
                 - name: chartDir
                   value: 'charts/{{workflow.parameters.appName}}'
-        - - name: set-chart-versions
+
+        - - name: set-micro-chart-versions
             templateRef:
-              name: cwft-helm
-              template: set-chart-versions
+              name: cwft-helm-v2
+              template: set-micro-chart-versions
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
-                  from: '{{steps.checkout.outputs.artifacts.repo-source}}'
+                  from: '{{steps.checkout-repos.outputs.artifacts.repo-source}}'
               parameters:
                 - name: appName
                   value: '{{workflow.parameters.appName}}'
                 - name: chartDir
                   value: 'charts/{{workflow.parameters.appName}}'
                 - name: chartVersion
-                  value: '{{steps.get-initial-chart-version.outputs.result}}-rc.{{workflow.parameters.shortSha}}'
+                  value: '{{steps.get-initial-micro-chart-version.outputs.result}}-rc.{{workflow.parameters.shortSha}}'
                 - name: shortSha
                   value: '{{workflow.parameters.shortSha}}'
-        - - name: publish-helm-chart
+
+        - - name: publish-micro-helm-chart
             templateRef:
-              name: cwft-helm
+              name: cwft-helm-v2
               template: publish-chart
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
-                  from: '{{steps.set-chart-versions.outputs.artifacts.repo-source}}'
+                  from: '{{steps.set-micro-chart-versions.outputs.artifacts.repo-source}}'
               parameters:
                 - name: appName
                   value: '{{workflow.parameters.appName}}'
                 - name: chartDir
                   value: 'charts/{{workflow.parameters.appName}}'
+
+        - - name: set-environment-version-for-macro-chart
+            templateRef:
+              name: cwft-helm-v2
+              template: set-environment-version-for-macro-chart
+              clusterScope: true
+            arguments:
+              artifacts:
+                - name: repo-source
+                  from: '{{steps.set-micro-chart-versions.outputs.artifacts.repo-source}}'
+              parameters:
+                - name: fullChartPath
+                  value: '{{workflow.parameters.gitopsDestinationFile}}'
+                - name: chartVersion
+                  value: '{{steps.get-initial-micro-chart-version.outputs.result}}-rc.{{workflow.parameters.shortSha}}'
+                - name: environment
+                  value: '{{workflow.parameters.environment}}'
+
+        - - name: commit-micro-chart-increment
+            templateRef:
+              name: cwft-git-v2
+              template: pull-commit-sign-push
+              clusterScope: true
+            arguments:
+              artifacts:
+                - name: repo-source
+                  from: '{{steps.set-environment-version-for-macro-chart.outputs.artifacts.repo-source}}'
+              parameters:
+                - name: repoName
+                  value: 'gitops'
+                - name: gitUrlNoProtocol
+                  value: '{{workflow.parameters.gitUrlNoProtocol}}'
+                - name: commitMessage
+                  # Please, be careful updating this message, it must comply with:
+                  # github skip ci rule: https://github.blog/changelog/2021-02-08-github-actions-skip-pull-request-and-push-workflows-with-skip-ci/
+                  # github skip ci rule: https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs
+                  # gitlab skip ci rule: https://devops.stackexchange.com/questions/6809/is-there-a-ci-skip-option-in-gitlab-ci
+                  # in case, the rule is disbaled or don't work this step will create a circular trigger of builds and bumps of version.
+                  value: "[skip ci] [CI SKIP] setting {{workflow.parameters.appName}} {{workflow.parameters.environment}} to chart version '{{steps.get-initial-micro-chart-version.outputs.result}}-rc.{{workflow.parameters.shortSha}}'\n\nskip-checks:true"
diff --git a/.argo/release.yaml b/.argo/release.yaml
@@ -6,9 +6,10 @@ spec:
   templates:
     - name: main
       steps:
+
         - - name: checkout
             templateRef:
-              name: cwft-git
+              name: cwft-git-v2
               template: checkout-with-gitops
               clusterScope: true
             arguments:
@@ -19,9 +20,10 @@ spec:
                   value: '{{workflow.parameters.branch}}'
                 - name: gitUrlNoProtocol
                   value: '{{workflow.parameters.gitUrlNoProtocol}}'
-        - - name: get-initial-chart-version
+
+        - - name: get-semver-chart-version
             templateRef:
-              name: cwft-helm
+              name: cwft-helm-v2
               template: get-chart-version
               clusterScope: true
             arguments:
@@ -33,109 +35,110 @@ spec:
                   value: '{{workflow.parameters.appName}}'
                 - name: chartDir
                   value: 'charts/{{workflow.parameters.appName}}'
-        - - name: set-chart-versions
+
+        - - name: get-chart-version
             templateRef:
-              name: cwft-helm
-              template: set-chart-versions
+              name: cwft-helm-v2
+              template: get-macro-chart-version-from-gitops-repo
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
                   from: '{{steps.checkout.outputs.artifacts.repo-source}}'
               parameters:
-                - name: appName
-                  value: '{{workflow.parameters.appName}}'
-                - name: chartDir
-                  value: 'charts/{{workflow.parameters.appName}}'
-                - name: chartVersion
-                  value: '{{steps.get-initial-chart-version.outputs.result}}'
-                - name: shortSha
-                  value: '{{workflow.parameters.shortSha}}'
-        - - name: publish-helm-chart
+                - name: gitopsSourceFile
+                  value: '{{workflow.parameters.gitopsSourceFile}}'
+
+        - - name: get-shortsha-from-rc
             templateRef:
-              name: cwft-helm
-              template: publish-chart
+              name: cwft-helm-v2
+              template: get-shortsha-from-rc
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
-                  from: '{{steps.set-chart-versions.outputs.artifacts.repo-source}}'
+                  from: '{{steps.checkout.outputs.artifacts.repo-source}}'
               parameters:
-                - name: appName
-                  value: '{{workflow.parameters.appName}}'
-                - name: chartDir
-                  value: 'charts/{{workflow.parameters.appName}}'
-        - - name: set-environment-version
+                - name: rcVersion
+                  value: '{{steps.get-chart-version.outputs.result}}'
+
+        - - name: set-micro-chart-versions
             templateRef:
-              name: cwft-helm
-              template: set-environment-version
+              name: cwft-helm-v2
+              template: set-micro-chart-versions
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
                   from: '{{steps.checkout.outputs.artifacts.repo-source}}'
               parameters:
-                - name: fullChartPath
-                  value: 'registry/{{workflow.parameters.clusterName}}/components/{{workflow.parameters.environment}}/{{workflow.parameters.appName}}/Chart.yaml'
+                - name: appName
+                  value: '{{workflow.parameters.appName}}'
+                - name: chartDir
+                  value: 'charts/{{workflow.parameters.appName}}'
                 - name: chartVersion
-                  value: '{{steps.get-initial-chart-version.outputs.result}}'
-                - name: environment
-                  value: '{{workflow.parameters.environment}}'
-        - - name: commit-production
+                  value: '{{steps.get-semver-chart-version.outputs.result}}'
+                - name: shortSha
+                  value: '{{steps.get-shortsha-from-rc.outputs.result}}'
+
+        - - name: publish-micro-helm-chart
             templateRef:
-              name: cwft-git
-              template: pull-commit-push
+              name: cwft-helm-v2
+              template: publish-chart
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
-                  from: '{{steps.set-environment-version.outputs.artifacts.repo-source}}'
+                  from: '{{steps.set-micro-chart-versions.outputs.artifacts.repo-source}}'
               parameters:
-                - name: repoName
-                  value: 'gitops'
-                - name: gitUrlNoProtocol
-                  value: '{{workflow.parameters.gitUrlNoProtocol}}'
-                - name: commitMessage
-                  value: 'setting {{workflow.parameters.appName}} {{workflow.parameters.environment}} to chart version {{steps.get-initial-chart-version.outputs.result}}'
-        - - name: increment-chart-minor
+                - name: appName
+                  value: '{{workflow.parameters.appName}}'
+                - name: chartDir
+                  value: 'charts/{{workflow.parameters.appName}}'
+
+        - - name: release-and-tag-main-with-notes
             templateRef:
-              name: cwft-helm
-              template: increment-chart-minor
+              name: cwft-git-v2
+              template: release-and-tag-main-with-notes
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
-                  from: '{{steps.set-environment-version.outputs.artifacts.repo-source}}'
+                  from: '{{steps.set-micro-chart-versions.outputs.artifacts.repo-source}}'
               parameters:
+                - name: orgName
+                  value: 'konstructio'
                 - name: appName
                   value: '{{workflow.parameters.appName}}'
-                - name: chartDir
-                  value: 'charts/{{workflow.parameters.appName}}'
-                - name: chartVersion
-                  value: '{{steps.get-initial-chart-version.outputs.result}}'
-        - - name: get-published-chart-version
+                - name: tagName
+                  value: '{{steps.get-semver-chart-version.outputs.result}}'
+
+        - - name: increment-micro-chart-minor
             templateRef:
-              name: cwft-helm
-              template: get-chart-version
+              name: cwft-helm-v2
+              template: increment-chart-minor
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
-                  from: '{{steps.increment-chart-minor.outputs.artifacts.repo-source}}'
+                  from: '{{steps.set-micro-chart-versions.outputs.artifacts.repo-source}}'
               parameters:
                 - name: appName
                   value: '{{workflow.parameters.appName}}'
                 - name: chartDir
                   value: 'charts/{{workflow.parameters.appName}}'
-        - - name: commit-chart-increment
+                - name: chartVersion
+                  value: '{{steps.get-chart-version.outputs.result}}'
+
+        - - name: commit-micro-chart-increment
             templateRef:
-              name: cwft-git
-              template: pull-commit-push
+              name: cwft-git-v2
+              template: pull-commit-sign-push
               clusterScope: true
             arguments:
               artifacts:
                 - name: repo-source
-                  from: '{{steps.increment-chart-minor.outputs.artifacts.repo-source}}'
+                  from: '{{steps.increment-micro-chart-minor.outputs.artifacts.repo-source}}'
               parameters:
                 - name: repoName
                   value: '{{workflow.parameters.appName}}'
@@ -147,4 +150,38 @@ spec:
                   # github skip ci rule: https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs
                   # gitlab skip ci rule: https://devops.stackexchange.com/questions/6809/is-there-a-ci-skip-option-in-gitlab-ci
                   # in case, the rule is disbaled or don't work this step will create a circular trigger of builds and bumps of version.
-                  value: "[skip ci] [CI SKIP] setting {{workflow.parameters.appName}} {{workflow.parameters.environment}} to chart version {{steps.get-published-chart-version.outputs.result}}\n\nskip-checks:true"
+                  value: "[skip ci] [CI SKIP] bumping {{workflow.parameters.appName}} {{workflow.parameters.environment}} minor version\n\nskip-checks:true"
+
+        - - name: set-environment-version
+            templateRef:
+              name: cwft-helm-v2
+              template: set-environment-version-for-macro-chart
+              clusterScope: true
+            arguments:
+              artifacts:
+                - name: repo-source
+                  from: '{{steps.checkout.outputs.artifacts.repo-source}}'
+              parameters:
+                - name: fullChartPath
+                  value: '{{workflow.parameters.gitopsDestinationFile}}'
+                - name: chartVersion
+                  value: '{{steps.get-semver-chart-version.outputs.result}}'
+                - name: environment
+                  value: '{{workflow.parameters.environment}}'
+
+        - - name: commit
+            templateRef:
+              name: cwft-git-v2
+              template: pull-commit-sign-push
+              clusterScope: true
+            arguments:
+              artifacts:
+                - name: repo-source
+                  from: '{{steps.set-environment-version.outputs.artifacts.repo-source}}'
+              parameters:
+                - name: repoName
+                  value: 'gitops'
+                - name: gitUrlNoProtocol
+                  value: '{{workflow.parameters.gitUrlNoProtocol}}'
+                - name: commitMessage
+                  value: 'setting {{workflow.parameters.appName}} {{workflow.parameters.environment}} to chart version {{steps.get-semver-chart-version.outputs.result}}'