Merge pull request #119 from estahn/next

update kube-webhook-certgen (#116)
estahn · Jan 24, 2023 · a9969d9 · a9969d9
2 parents 40ac700 + 67e9c38
commit a9969d9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/.github/workflows/helm-docs.yml b/.github/workflows/helm-docs.yml
@@ -0,0 +1,26 @@
+name: Update helm-docs
+
+on: pull_request
+
+env:
+  HELM_DOCS_VERSION: "1.11.0"
+
+jobs:
+  helm-docs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Install binaries
+      run: |
+        mkdir -p $GITHUB_WORKSPACE/bin
+        echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
+        curl -sSL https://github.com/norwoodj/helm-docs/releases/download/v${{env.HELM_DOCS_VERSION}}/helm-docs_${{env.HELM_DOCS_VERSION}}_Linux_x86_64.tar.gz | tar xvfz - --overwrite -C $GITHUB_WORKSPACE/bin
+
+    - run: helm-docs
+
+    - uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        file_pattern: 'charts/**/README.md'
+        commit_message: 'docs: update helm-docs'
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -5,9 +5,6 @@ on:
   push:
     branches: [main]
 
-env:
-  HELM_DOCS_VERSION: "1.11.0"
-
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
@@ -17,14 +14,6 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-python@v4.5.0
     - uses: actions/setup-node@v3.6.0
-    - name: Install binaries
-      run: |
-        mkdir -p $GITHUB_WORKSPACE/bin
-        echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
-        curl -sSL https://github.com/norwoodj/helm-docs/releases/download/v${{env.HELM_DOCS_VERSION}}/helm-docs_${{env.HELM_DOCS_VERSION}}_Linux_x86_64.tar.gz | tar xvfz - --overwrite -C $GITHUB_WORKSPACE/bin
     - uses: pre-commit/action@v3.0.0
-
-    # Used to commit generated helm-docs
-    - uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        file_pattern: 'charts/**/README.md'
+      env:
+        SKIP: helm-docs
diff --git a/charts/k8s-image-swapper/Chart.yaml b/charts/k8s-image-swapper/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: k8s-image-swapper
 description: Mirror images into your own registry and swap image references automatically.
 type: application
-version: 1.1.1
+version: 1.1.2
 appVersion: 1.3.0
 home: https://github.com/estahn/charts/tree/main/charts/k8s-image-swapper
 keywords:
@@ -15,7 +15,7 @@ maintainers:
     name: estahn
 annotations:
   artifacthub.io/changes: |
-    - "Update README.md"
+    - "Update kube-webhook-certgen"
   artifacthub.io/images: |
     - name: k8s-image-webhook
       image: ghcr.io/estahn/k8s-image-swapper:1.3.0
diff --git a/charts/k8s-image-swapper/README.md b/charts/k8s-image-swapper/README.md
@@ -1,6 +1,6 @@
 # k8s-image-swapper
 
-![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
+![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
 
 Mirror images into your own registry and swap image references automatically.
 
@@ -41,8 +41,8 @@ Mirror images into your own registry and swap image references automatically.
 | nodeSelector | object | `{}` |  |
 | patch.enabled | bool | `true` |  |
 | patch.image.pullPolicy | string | `"IfNotPresent"` |  |
-| patch.image.repository | string | `"jettech/kube-webhook-certgen"` |  |
-| patch.image.tag | string | `"v1.5.2"` |  |
+| patch.image.repository | string | `"k8s.gcr.io/ingress-nginx/kube-webhook-certgen"` |  |
+| patch.image.tag | string | `"v1.3.0"` |  |
 | patch.nodeSelector | object | `{}` |  |
 | patch.podAnnotations | object | `{}` |  |
 | patch.priorityClassName | string | `""` |  |

diff --git a/charts/k8s-image-swapper/values.yaml b/charts/k8s-image-swapper/values.yaml
@@ -81,8 +81,8 @@ hostNetwork: false
 patch:
   enabled: true
   image:
-    repository: jettech/kube-webhook-certgen
-    tag: v1.5.2
+    repository: k8s.gcr.io/ingress-nginx/kube-webhook-certgen
+    tag: v1.3.0
     pullPolicy: IfNotPresent
   priorityClassName: ""
   podAnnotations: {}