chore: Fix spell checking config (argoproj-labs#577)

Signed-off-by: satoru <satorulogic@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> docs: Fixed typo (argoproj-labs#589) Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Preallocate space for slices with known size (argoproj-labs#575) Signed-off-by: satoru <satorulogic@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> ci: Fix codegen and update kustomize to post-2.0 (argoproj-labs#590) * ci: Fix codegen Signed-off-by: jannfis <jann@mistrust.net> * Fix tar call Signed-off-by: jannfis <jann@mistrust.net> --------- Signed-off-by: jannfis <jann@mistrust.net> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> feat: Respect original parameter overrides with git write-back (argoproj-labs#573) * Fix original override not respected Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add writeOverrides unittest Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add helm override commit test Signed-off-by: KS. Yim <ks.yim@linecorp.com> * lint Signed-off-by: KS. Yim <ks.yim@linecorp.com> * fix shadowed err Signed-off-by: KS. Yim <ks.yim@linecorp.com> --------- Signed-off-by: KS. Yim <ks.yim@linecorp.com> Co-authored-by: KS. Yim <ks.yim@linecorp.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Update to newer argocd version for better API compatibility (argoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore(deps): upgrade dependencies for fix vulnerabilities (argoproj-labs#599) Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: tighten securityContext to comply with restricted PSS (argoproj-labs#600) makes argocd-image-updater compatible with restricted Pod Security Standard Signed-off-by: Takeo Sawada <myc.monad@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> feat: Add possibility to specify write-back GIT repository as annotation (argoproj-labs#424) * Add possibility to specify write-back GIT repository as annotation. Signed-off-by: flozzone <flozzone@gmail.com> * Update golangci-lint to 1.52.2. Signed-off-by: flozzone <flozzone@gmail.com> * Replace deprecated golangci linters with 'unused' linter. Signed-off-by: flozzone <flozzone@gmail.com> * Fix Goimport issues. Signed-off-by: flozzone <flozzone@gmail.com> --------- Signed-off-by: flozzone <flozzone@gmail.com> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: support ocischema.DeserializedImageIndex in registry client Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix test Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> merge master Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix go mods Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> refactor: use shared function to reduce duplication Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> merge master Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> fix go mods Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> Fix after rebase Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore: Fix spell checking config (argoproj-labs#577) Signed-off-by: satoru <satorulogic@gmail.com> docs: Fixed typo (argoproj-labs#589) chore: Preallocate space for slices with known size (argoproj-labs#575) Signed-off-by: satoru <satorulogic@gmail.com> ci: Fix codegen and update kustomize to post-2.0 (argoproj-labs#590) * ci: Fix codegen Signed-off-by: jannfis <jann@mistrust.net> * Fix tar call Signed-off-by: jannfis <jann@mistrust.net> --------- Signed-off-by: jannfis <jann@mistrust.net> feat: Respect original parameter overrides with git write-back (argoproj-labs#573) * Fix original override not respected Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add writeOverrides unittest Signed-off-by: KS. Yim <ks.yim@linecorp.com> * Add helm override commit test Signed-off-by: KS. Yim <ks.yim@linecorp.com> * lint Signed-off-by: KS. Yim <ks.yim@linecorp.com> * fix shadowed err Signed-off-by: KS. Yim <ks.yim@linecorp.com> --------- Signed-off-by: KS. Yim <ks.yim@linecorp.com> Co-authored-by: KS. Yim <ks.yim@linecorp.com> chore: Update to newer argocd version for better API compatibility (argoproj-labs#594) * fix: update go mods to use newer argocd app definition Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix deps and tests Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> * fix spelling Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> --------- Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com> chore(deps): upgrade dependencies for fix vulnerabilities (argoproj-labs#599) Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com> fix: tighten securityContext to comply with restricted PSS (argoproj-labs#600) makes argocd-image-updater compatible with restricted Pod Security Standard Signed-off-by: Takeo Sawada <myc.monad@gmail.com>
jessebye · Sep 1, 2023 · a753e62 · a753e62
1 parent 568e6b9
commit a753e62
Show file tree

Hide file tree

Showing 26 changed files with 1,603 additions and 788 deletions.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -5,26 +5,18 @@ bacd
 CVE
 credref
 DEBU
-DEBU
 dockerhub
 eec
 fbd
 ffb
 gitlab
 jfrog
-JFrog
 mep
-mypass
 myregistry
-myuser
-otherapp
 repocreds
 rollbacked
 someimage
 somerepo
 ssw
-wildcard
 wildcards
-wohoo
 yyyy
-YYYY
diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml
@@ -35,12 +35,17 @@ jobs:
       - name: Install Kustomize v2
         run: |
           set -xo pipefail
-          KUSTOMIZE_VERSION=2.0.2
-          URL="https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64"
-          BINNAME=kustomize2
-          curl -sLf --retry 3 -o /tmp/kustomize2 "$URL"
-          sudo mv /tmp/kustomize2 /usr/local/bin/kustomize2
-          chmod +x /usr/local/bin/kustomize2
+          URL="https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.1.0/kustomize_v5.1.0_linux_amd64.tar.gz"
+          BINNAME=kustomize
+          curl -sLf --retry 3 -o /tmp/kustomize.tar.gz "$URL"
+          chksum=$(sha256sum /tmp/kustomize.tar.gz | awk '{ print $1; }')
+          if test "${chksum}" != "52f4cf1ba34d38fd55a9bef819e329c9a4561f5f57f8f539346038ab5026dda8"; then
+            echo "Checksum mismatch" >&2
+            exit 1
+          fi
+          tar -C /tmp -xvzf /tmp/kustomize.tar.gz
+          sudo mv /tmp/kustomize /usr/local/bin/kustomize
+          chmod +x /usr/local/bin/kustomize
       - name: Run make manifests
         run: |
           make manifests

diff --git a/.golangci.yml b/.golangci.yml
@@ -16,4 +16,4 @@ linters-settings:
   goimports:
     local-prefixes: github.com/argoproj-labs/argocd-image-updater
 service:
-  golangci-lint-version: 1.26.0
+  golangci-lint-version: 1.52.2
diff --git a/docs/basics/authentication.md b/docs/basics/authentication.md
@@ -1,7 +1,7 @@
 # Authentication in Argo CD Image Updater
 
 There are several scenarios where Argo CD Image Updater needs to authenticate
-to external systems in order to fulfil its duties. 
+to external systems in order to fulfill its duties. 
 
 ## <a name="auth-kubernetes"></a>Authentication to Kubernetes
 
@@ -207,7 +207,7 @@ echo "someuser:s0mep4ssw0rd"
 
 When executing on Kubernetes, the script to be executed must exist in the
 Image Updater container's file system. You can either mount the script from
-a config map, or use an init container to copy it. Make sure that the script
+a configmap, or use an init container to copy it. Make sure that the script
 is executable.
 
 For example, if above script would exist at `/usr/local/bin/creds.sh`, it

diff --git a/docs/basics/update-methods.md b/docs/basics/update-methods.md
@@ -3,7 +3,7 @@
 ## Overview
 
 Argo CD Image Updater supports several methods to propagate new versions of the
-images to Argo CD. These methods are also refered to as *write back methods*.
+images to Argo CD. These methods are also referred to as *write back methods*.
 
 Currently, the following methods are supported:
 
@@ -144,6 +144,22 @@ kubectl -n argocd-image-updater create secret generic git-creds \
   --from-file=sshPrivateKey=~/.ssh/id_rsa
 ```
 
+### <a name="method-git-repository"></a>Specifying a repository when using a Helm repository in repoURL
+
+By default, Argo CD Image Updater will use the value found in the Application
+spec at `.spec.source.repoURL` as Git repository to checkout. But when using
+a Helm repository as `.spec.source.repoURL` GIT will simply fail. To manually
+specify the repository to push the changes, specify the 
+annotation `argocd-image-updater.argoproj.io/git-repository` on the Application
+manifest.
+
+The value of this annotation will define the Git repository to use, for example the
+following would use a GitHub's repository:
+
+```yaml
+argocd-image-updater.argoproj.io/git-repository: git@github.com:example/example.git
+```
+
 ### <a name="method-git-branch"></a>Specifying a branch to commit to
 
 By default, Argo CD Image Updater will use the value found in the Application
@@ -162,7 +178,7 @@ argocd-image-updater.argoproj.io/git-branch: main
 
 ### <a name="method-git-base-commit-branch"></a>Specifying a separate base and commit branch
 
-By default, Argo CD Imager Updater will checkout, commit, and push back to the
+By default, Argo CD Image Updater will checkout, commit, and push back to the
 same branch specified above. There are many scenarios where this is not
 desired or possible, such as when the default branch is protected. You can
 add a separate write-branch by modifying `argocd-image-updater.argoproj.io/git-branch`

diff --git a/docs/basics/update.md b/docs/basics/update.md
@@ -18,7 +18,7 @@ The workflow of Argo CD Image Updater can be described as follows:
   annotation holds a list of image names that should be updated, and is a
   mandatory annotation for Argo CD Image Updater to indicate it should
   process this `Application`. Read more about the syntax expected in this
-  annotations's value in the [marking images for update](#TODO)
+  annotation's value in the [marking images for update](#TODO)
   section in this doc.
 
 * For each image found in the list, Argo CD Image Updater will first check

diff --git a/docs/install/reference.md b/docs/install/reference.md
@@ -123,7 +123,7 @@ Only process applications that have a valid annotation and match the given
 syntax of `key=value`. For e.g, `custom.label/name=xyz` would be a valid label
 that can be supplied through this parameter. Any applications carrying this 
 exact label will be considered as candidates for image updates. This parameter
-currently does not support patten matching on label values (e.g `customer.label/name=*-staging`)
+currently does not support pattern matching on label values (e.g `customer.label/name=*-staging`)
 and only accepts a single label to match applications against. 
 
 **--max-concurrency *number* **

diff --git a/ext/git/mocks/Client.go b/ext/git/mocks/Client.go