Merge branch 'argocd' of https://github.com/ilia-medvedev-codefresh/a…

…rgo-helm into argocd
ilia-medvedev-codefresh · Dec 22, 2022 · 29f82f7 · 29f82f7
2 parents 6dc538f + 9419d47
commit 29f82f7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.github/configs/ct-install.yaml b/.github/configs/ct-install.yaml
@@ -2,7 +2,7 @@
 # Don't add the 'debug' attribute, otherwise the workflow won't work anymore
 # Only Used for the CT Install Stage
 remote: origin
-target-branch: main
+#target-branch: main
 chart-dirs:
   - charts
 chart-repos:
@@ -12,4 +12,5 @@ validate-chart-schema: false
 validate-maintainers: true
 validate-yaml: true
 exclude-deprecated: true
+check-version-increment: false
 excluded-charts: []
diff --git a/.github/configs/ct-lint.yaml b/.github/configs/ct-lint.yaml
@@ -2,7 +2,7 @@
 # Don't add the 'debug' attribute, otherwise the workflow won't work anymore
 # Only Used for the CT Lint Stage
 remote: origin
-target-branch: main
+#target-branch: main
 chart-dirs:
   - charts
 chart-repos:
@@ -12,4 +12,5 @@ validate-chart-schema: false
 validate-maintainers: true
 validate-yaml: true
 exclude-deprecated: true
+check-version-increment: false
 excluded-charts: []
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -35,14 +35,14 @@ jobs:
         id: list-changed
         run: |
           ## If executed with debug this won't work anymore.
-          changed=$(ct --config ./.github/configs/ct-lint.yaml list-changed)
+          changed=$(ct --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} list-changed)
           charts=$(echo "$changed" | tr '\n' ' ' | xargs)
           if [[ -n "$changed" ]]; then
             echo "::set-output name=changed::true"
             echo "::set-output name=changed_charts::$charts"
           fi
       - name: Run chart-testing (lint)
-        run: ct lint --debug --config ./.github/configs/ct-lint.yaml --lint-conf ./.github/configs/lintconf.yaml
+        run: ct lint --debug --config ./.github/configs/ct-lint.yaml --target-branch ${{ github.base_ref }} --lint-conf ./.github/configs/lintconf.yaml
 
       - name: Run docs-testing (helm-docs)
         id: helm-docs
@@ -85,5 +85,5 @@ jobs:
           helm install redis bitnami/redis --wait --namespace redis --set auth.password=argocd --set architecture=standalone
 
       - name: Run chart-testing (install)
-        run: ct install --config ./.github/configs/ct-install.yaml
+        run: ct install --config ./.github/configs/ct-install.yaml --target-branch ${{ github.base_ref }}
         if: steps.list-changed.outputs.changed == 'true'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: Chart Publish
 on:
   push:
     branches:
-      - main
+      - argocd
 
 permissions:
   contents: read

diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -22,6 +22,7 @@ spec:
         {{- end }}
         {{- end }}
       labels:
+        codefresh-component: argocd
         {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 8 }}
         {{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.server.podLabels) }}
           {{- toYaml . | nindent 8 }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Chart Publish @@
     on:
       push:
         branches:
-          - main
+          - argocd
     permissions:
       contents: read
@@ Expand Down @@