Merge pull request #798 from stakater/update-version-axvextm

Bump version to 1.2.0 on release-v1.2.0 branch

.github/workflows/pull_request-helm.yaml

@@ -1,72 +0,0 @@
-name: Pull Request Workflow for Helm Chart changes
-
-on:
-  pull_request:
-    branches:
-      - master
-    paths:
-      - 'deployments/kubernetes/chart/reloader/**'
-
-env:
-  DOCKER_FILE_PATH: Dockerfile
-  DOCKER_UBI_FILE_PATH: Dockerfile.ubi
-  KUBERNETES_VERSION: "1.30.0"
-  KIND_VERSION: "0.23.0"
-  REGISTRY: ghcr.io
-
-jobs:
-
-  helm-validation:
-    permissions:
-      contents: read
-
-    runs-on: ubuntu-latest
-    name: Helm Chart Validation
-
-    steps:
-
-    - name: Check out code
-      uses: actions/checkout@v4
-      with:
-        ref: ${{github.event.pull_request.head.sha}}
-        fetch-depth: 0
-
-    # Setting up helm binary
-    - name: Set up Helm
-      uses: azure/setup-helm@v4
-      with:
-        version: v3.11.3
-
-    - name: Helm chart unit tests
-      uses: d3adb5/helm-unittest-action@v2
-      with:
-        charts: deployments/kubernetes/chart/reloader
-
-    - name: Add Stakater Helm Repo
-      run: |
-        helm repo add stakater https://stakater.github.io/stakater-charts
-
-    - name: Get version for chart from helm repo
-      id: chart_eval
-      run: |
-        current_chart_version=$(helm search repo stakater/reloader | tail -n 1 | awk '{print $2}')
-        echo "CURRENT_CHART_VERSION=$(echo ${current_chart_version})" >> $GITHUB_OUTPUT
-
-    - name: Get Updated Chart version from Chart.yaml
-      uses: mikefarah/yq@master
-      id: new_chart_version
-      with:
-        cmd: yq e '.version' deployments/kubernetes/chart/reloader/Chart.yaml
-
-    - name: Check Version
-      uses: aleoyakas/check-semver-increased-action@v1
-      id: check-version
-      with:
-        current-version: ${{ steps.new_chart_version.outputs.result }}
-        previous-version: ${{ steps.chart_eval.outputs.CURRENT_CHART_VERSION }}
-
-    - name: Fail if Helm Chart version isnt updated
-      if: steps.check-version.outputs.is-version-increased != 'true'
-      run: |
-        echo "Helm Chart Version wasnt updated"
-        exit 1

.github/workflows/pull_request.yaml

@@ -1,4 +1,4 @@
-name: Pull Request Workflow for Code changes
+name: Pull Request
 
 on:
   pull_request:
@@ -14,7 +14,6 @@ on:
       - '!docs/**'
       - '!theme_common'
       - '!theme_override'
-      - '!deployments/kubernetes/chart/reloader/**'
 
 env:
   DOCKER_FILE_PATH: Dockerfile
@@ -25,7 +24,7 @@ env:
 
 jobs:
   qa:
-    uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.99
+    uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.98
     with:
       MD_CONFIG: .github/md_config.json
       DOC_SRC: README.md
@@ -163,3 +162,72 @@ jobs:
           org.opencontainers.image.source=${{ github.event.repository.clone_url }}
           org.opencontainers.image.created=${{ steps.prep.outputs.created }}
           org.opencontainers.image.revision=${{ github.sha }}
+
+    - name: Check if Helm validation needs to run
+      uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          chart:
+            - 'deployments/kubernetes/chart/reloader/**'
+
+    outputs:
+      helm_chart_changed: ${{ steps.filter.outputs.chart }}
+    
+  helm-validation:
+    permissions:
+      contents: read
+
+    runs-on: ubuntu-latest
+    name: Helm Chart Validation
+    needs:
+      - build
+
+    if: ${{ needs.build.outputs.helm_chart_changed }} == "true"  
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v4
+      with:
+        ref: ${{github.event.pull_request.head.sha}}
+        fetch-depth: 0
+
+    # Setting up helm binary
+    - name: Set up Helm
+      uses: azure/setup-helm@v4
+      with:
+        version: v3.11.3
+
+    - name: Helm chart unit tests
+      uses: d3adb5/helm-unittest-action@v2
+      with:
+        charts: deployments/kubernetes/chart/reloader
+
+    - name: Add Stakater Helm Repo
+      run: |
+        helm repo add stakater https://stakater.github.io/stakater-charts
+
+    - name: Get version for chart from helm repo
+      id: chart_eval
+      run: |
+        current_chart_version=$(helm search repo stakater/reloader | tail -n 1 | awk '{print $2}')
+        echo "CURRENT_CHART_VERSION=$(echo ${current_chart_version})" >> $GITHUB_OUTPUT
+
+    - name: Get Updated Chart version from Chart.yaml
+      uses: mikefarah/yq@master
+      id: new_chart_version
+      with:
+        cmd: yq e '.version' deployments/kubernetes/chart/reloader/Chart.yaml
+
+    - name: Check Version
+      uses: aleoyakas/check-semver-increased-action@v1
+      id: check-version
+      with:
+        current-version: ${{ steps.new_chart_version.outputs.result }}
+        previous-version: ${{ steps.chart_eval.outputs.CURRENT_CHART_VERSION }}
+
+    - name: Fail if Helm Chart version isnt updated
+      if: steps.check-version.outputs.is-version-increased != 'true'
+      run: |
+        echo "Helm Chart Version wasnt updated"
+        exit 1

.github/workflows/pull_request_docs.yaml

@@ -15,7 +15,7 @@ on:
 
 jobs:
   qa:
-    uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.99
+    uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.98
     with:
       MD_CONFIG: .github/md_config.json
       DOC_SRC: docs

.github/workflows/push-helm-chart.yaml

@@ -8,7 +8,6 @@ on:
       - master
     paths:
       - 'deployments/kubernetes/chart/reloader/**'
-      - '.github/workflows/push-helm-chart.yaml'
 
 env:
   HELM_REGISTRY_URL: "https://stakater.github.io/stakater-charts"
@@ -69,11 +68,11 @@ jobs:
           exit 1
 
       - name: Login to GHCR Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
-          registry: ${{ env.REGISTRY }}
-          username: stakater-user
-          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io/stakater
+          username: ${{ secrets.GHCR_USERNAME }}
+          password: ${{ secrets.GHCR_TOKEN }}
 
       - name: Publish Helm chart to ghcr.io
         run: |
@@ -87,7 +86,7 @@ jobs:
           branch: master
           repository: stakater-charts
           target_dir: docs
-          token: ${{ secrets.GHCR_TOKEN }}
+          token: ${{ secrets.PUBLISH_TOKEN }}
           charts_dir: deployments/kubernetes/chart/
           charts_url: ${{ env.HELM_REGISTRY_URL }}
           owner: stakater

.vale.ini

@@ -1,7 +1,7 @@
 StylesPath = styles
 MinAlertLevel = warning
 
-Packages = https://github.com/stakater/vale-package/releases/download/v0.0.41/Stakater.zip
+Packages = https://github.com/stakater/vale-package/releases/download/v0.0.40/Stakater.zip
 Vocab = Stakater
 
 # Only check MarkDown files

VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

deployments/kubernetes/chart/reloader/Chart.yaml

@@ -3,8 +3,8 @@
 apiVersion: v1
 name: reloader
 description: Reloader chart that runs on kubernetes
-version: 1.2.1
-appVersion: v1.2.0
+version: 1.1.1
+appVersion: v1.1.0
 keywords:
   - Reloader
   - kubernetes

deployments/kubernetes/chart/reloader/templates/deployment.yaml

@@ -45,7 +45,7 @@ spec:
 {{ toYaml .Values.reloader.matchLabels | indent 8 }}
 {{- end }}
     spec:
-      {{- with .Values.global.imagePullSecrets }}
+      {{- with .Values.reloader.deployment.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -73,8 +73,8 @@ spec:
       priorityClassName: {{ .Values.reloader.deployment.priorityClassName }}
       {{- end }}
       containers:
-      {{- if .Values.global.imageRegistry }}
-      - image: "{{ .Values.global.imageRegistry }}/{{ .Values.reloader.deployment.image.base }}:{{ .Values.reloader.deployment.image.tag }}"
+      {{- if $.Values.global.imageRegistry }}
+      - image: "{{ $.Values.global.imageRegistry }}/{{ .Values.reloader.deployment.image.base }}:{{ .Values.reloader.deployment.image.tag }}"
 {{- else }}
       - image: "{{ .Values.reloader.deployment.image.name }}:{{ .Values.reloader.deployment.image.tag }}"
 {{- end }}

deployments/kubernetes/chart/reloader/values.yaml

@@ -5,8 +5,6 @@ global:
   ##
   imageRegistry: ""
   imagePullSecrets: []
-  #imagePullSecrets:
-  #  - name: my-pull-secret
 
 kubernetes:
   host: https://kubernetes.default
@@ -96,11 +94,11 @@ reloader:
     labels:
       provider: stakater
       group: com.stakater.platform
-      version: v1.2.0
+      version: v1.1.0
     image:
       name: ghcr.io/stakater/reloader
       base: stakater/reloader
-      tag: v1.2.0
+      tag: v1.1.0
       pullPolicy: IfNotPresent
     # Support for extra environment variables.
     env:

deployments/kubernetes/manifests/deployment.yaml

@@ -17,7 +17,7 @@ spec:
         app: reloader-reloader
     spec:
       containers:
-        - image: "ghcr.io/stakater/reloader:v1.1.0"
+        - image: "ghcr.io/stakater/reloader:v1.2.0"
           imagePullPolicy: IfNotPresent
           name: reloader-reloader
           env:

deployments/kubernetes/reloader.yaml

@@ -101,7 +101,7 @@ spec:
             resourceFieldRef:
               divisor: "1"
               resource: limits.memory
-        image: "ghcr.io/stakater/reloader:latest"
+        image: ghcr.io/stakater/reloader:v1.2.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 5