Merge pull request #1935 from fluxcd/update-components

Update toolkit components
Update github.com/fluxcd/pkg/ssa to v0.1.0
2026-03-01 11:16:56 +00:00 · 2021-10-13 15:04:51 +03:00 · 2021-10-13 14:43:35 +03:00 · 2021-10-13 11:16:40 +00:00 · 2021-10-13 14:16:03 +03:00 · 2021-10-13 11:50:16 +01:00
14 changed files with 55 additions and 45 deletions
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -27,7 +27,7 @@ jobs:
        uses: engineerd/setup-kind@v0.5.0
        with:
          version: v0.11.1
-          image: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
+          image: kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
          config: .github/kind/config.yaml # disable KIND-net
      - name: Setup envtest
        uses: fluxcd/pkg/actions/envtest@main
--- a/go.mod
+++ b/go.mod
@@ -10,11 +10,11 @@ require (
 	github.com/fluxcd/helm-controller/api v0.12.0
 	github.com/fluxcd/image-automation-controller/api v0.15.0
 	github.com/fluxcd/image-reflector-controller/api v0.12.0
-	github.com/fluxcd/kustomize-controller/api v0.15.1
-	github.com/fluxcd/notification-controller/api v0.17.0
+	github.com/fluxcd/kustomize-controller/api v0.15.5
+	github.com/fluxcd/notification-controller/api v0.17.1
 	github.com/fluxcd/pkg/apis/meta v0.10.0
 	github.com/fluxcd/pkg/runtime v0.12.0
-	github.com/fluxcd/pkg/ssa v0.0.1
+	github.com/fluxcd/pkg/ssa v0.1.0
 	github.com/fluxcd/pkg/ssh v0.0.5
 	github.com/fluxcd/pkg/untar v0.0.5
 	github.com/fluxcd/pkg/version v0.0.1
--- a/go.sum
+++ b/go.sum
@@ -228,10 +228,10 @@ github.com/fluxcd/image-automation-controller/api v0.15.0 h1:KI350vt5JahE43D17Vy
 github.com/fluxcd/image-automation-controller/api v0.15.0/go.mod h1:XvrEEpM1rVU+x1gQeXB/dj56w1dmOJRraTxQWOiuNME=
 github.com/fluxcd/image-reflector-controller/api v0.12.0 h1:ghdbOUmbNaPi/jVfNnI3xzvhudXBZx6xUld/OLNSVXM=
 github.com/fluxcd/image-reflector-controller/api v0.12.0/go.mod h1:lgQHGFz29OHmDU5Jwg689C/M+P/f9ujt6NS0zCLT0BQ=
-github.com/fluxcd/kustomize-controller/api v0.15.1 h1:xyMta7ICzoSKNkRWejH2sflo3dF7umP6To74+3NhdTk=
-github.com/fluxcd/kustomize-controller/api v0.15.1/go.mod h1:OhnZuXBeDl4NqbDZgpYKRg8nmsmeUIddH3vX8wxym9A=
-github.com/fluxcd/notification-controller/api v0.17.0 h1:HrTX6EThmvbW3I+uKJyaggcNnRsLxogc6q7A3nXZ9tQ=
-github.com/fluxcd/notification-controller/api v0.17.0/go.mod h1:t28GMWMLiLqho+ikpZrldv22/vmCsFdQR8vdJluxknc=
+github.com/fluxcd/kustomize-controller/api v0.15.5 h1:PibDIrwLArcDQfrbn9u4kcDbE+/uRjo/YzGkJGXkgmc=
+github.com/fluxcd/kustomize-controller/api v0.15.5/go.mod h1:OhnZuXBeDl4NqbDZgpYKRg8nmsmeUIddH3vX8wxym9A=
+github.com/fluxcd/notification-controller/api v0.17.1 h1:99nQKil/vDwSxxjyxRKxa4/DoRu9F8JoMMJkRqLGMqU=
+github.com/fluxcd/notification-controller/api v0.17.1/go.mod h1:t28GMWMLiLqho+ikpZrldv22/vmCsFdQR8vdJluxknc=
 github.com/fluxcd/pkg/apis/kustomize v0.1.0/go.mod h1:gEl+W5cVykCC3RfrCaqe+Pz+j4lKl2aeR4dxsom/zII=
 github.com/fluxcd/pkg/apis/kustomize v0.2.0 h1:jhu2QHvs+j3Zo9rR6w8hkO3LSC6h3M37zY5ejufOmxY=
 github.com/fluxcd/pkg/apis/kustomize v0.2.0/go.mod h1:gEl+W5cVykCC3RfrCaqe+Pz+j4lKl2aeR4dxsom/zII=
@@ -239,8 +239,8 @@ github.com/fluxcd/pkg/apis/meta v0.10.0 h1:N7wVGHC1cyPdT87hrDC7UwCwRwnZdQM46PBSL
 github.com/fluxcd/pkg/apis/meta v0.10.0/go.mod h1:CW9X9ijMTpNe7BwnokiUOrLl/h13miwVr/3abEQLbKE=
 github.com/fluxcd/pkg/runtime v0.12.0 h1:BPZZ8bBkimpqGAPXqOf3LTaw+tcw6HgbWyCuzbbsJGs=
 github.com/fluxcd/pkg/runtime v0.12.0/go.mod h1:EyaTR2TOYcjL5U//C4yH3bt2tvTgIOSXpVRbWxUn/C4=
-github.com/fluxcd/pkg/ssa v0.0.1 h1:XUMhPyziWC7JkRWFO/61lc/7Qu+/T1lCz2f7nvbO+vU=
-github.com/fluxcd/pkg/ssa v0.0.1/go.mod h1:QisgqnXXnHKNfdnrpJ3wQrwuto111mvdNcKkfe9Cwvk=
+github.com/fluxcd/pkg/ssa v0.1.0 h1:JqKuujOpH/L+WlNJx7wdLhLOPzA7EnQl2oMAGKzIAss=
+github.com/fluxcd/pkg/ssa v0.1.0/go.mod h1:B/6V2gF3zq3P6EstM/qTmOEUf3YgOh1ybFfAAmG4Shw=
 github.com/fluxcd/pkg/ssh v0.0.5 h1:rnbFZ7voy2JBlUfMbfyqArX2FYaLNpDhccGFC3qW83A=
 github.com/fluxcd/pkg/ssh v0.0.5/go.mod h1:7jXPdXZpc0ttMNz2kD9QuMi3RNn/e0DOFbj0Tij/+Hs=
 github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk=
--- a/install/flux.sh
+++ b/install/flux.sh
@@ -87,7 +87,13 @@ setup_tmp() {

 # Find version from Github metadata
 get_release_version() {
-    METADATA_URL="https://api.github.com/repos/${GITHUB_REPO}/releases/latest"
+    if [[ -n "${FLUX_VERSION}" ]]; then
+      SUFFIX_URL="tags/v${FLUX_VERSION}"
+    else
+      SUFFIX_URL="latest"
+    fi
+
+    METADATA_URL="https://api.github.com/repos/${GITHUB_REPO}/releases/${SUFFIX_URL}"

    info "Downloading metadata ${METADATA_URL}"
    download "${TMP_METADATA}" "${METADATA_URL}"
--- a/internal/utils/apply.go
+++ b/internal/utils/apply.go
@@ -50,6 +50,10 @@ func Apply(ctx context.Context, kubeConfigPath string, kubeContext string, manif
 		return "", fmt.Errorf("no Kubernetes objects found at: %s", manifestPath)
 	}

+	if err := ssa.SetNativeKindsDefaults(objs); err != nil {
+		return "", err
+	}
+
 	changeSet, err := resourceManager.ApplyAllStaged(ctx, objs, false, time.Minute)
 	if err != nil {
 		return "", err
--- a/manifests/bases/kustomize-controller/kustomization.yaml
+++ b/manifests/bases/kustomize-controller/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.1/kustomize-controller.crds.yaml
- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.1/kustomize-controller.deployment.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.5/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.5/kustomize-controller.deployment.yaml
 - account.yaml
 patchesJson6902:
 - target:
--- a/manifests/bases/notification-controller/kustomization.yaml
+++ b/manifests/bases/notification-controller/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
- https://github.com/fluxcd/notification-controller/releases/download/v0.17.0/notification-controller.crds.yaml
- https://github.com/fluxcd/notification-controller/releases/download/v0.17.0/notification-controller.deployment.yaml
+- https://github.com/fluxcd/notification-controller/releases/download/v0.17.1/notification-controller.crds.yaml
+- https://github.com/fluxcd/notification-controller/releases/download/v0.17.1/notification-controller.deployment.yaml
 - account.yaml
 patchesJson6902:
  - target:
--- a/manifests/crds/kustomization.yaml
+++ b/manifests/crds/kustomization.yaml
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - https://github.com/fluxcd/source-controller/releases/download/v0.16.0/source-controller.crds.yaml
- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.1/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.5/kustomize-controller.crds.yaml
 - https://github.com/fluxcd/helm-controller/releases/download/v0.12.0/helm-controller.crds.yaml
- https://github.com/fluxcd/notification-controller/releases/download/v0.17.0/notification-controller.crds.yaml
+- https://github.com/fluxcd/notification-controller/releases/download/v0.17.1/notification-controller.crds.yaml
 - https://github.com/fluxcd/image-reflector-controller/releases/download/v0.12.0/image-reflector-controller.crds.yaml
 - https://github.com/fluxcd/image-automation-controller/releases/download/v0.15.0/image-automation-controller.crds.yaml
--- a/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml
+++ b/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml
@@ -50,16 +50,16 @@ spec:
              $(RECONCILE_SH)

              apply-secret() {
-                /kbin/kubectl create secret generic "${1}" \
-                  --from-literal=token="${2}" \
-                  --from-literal=address="${3}" \
+                /kbin/kubectl create secret generic "$1" \
+                  --from-literal=token="$2" \
+                  --from-literal=address="$3" \
                  --dry-run=client -o=yaml \
                  | grep -v "creationTimestamp:" \
                  | /kbin/kubectl apply -f -
              }

              pause_loop() {
-                sleep "${SYNC_PERIOD:-3600}" || true
+                sleep "$SYNC_PERIOD" || true
              }

              graceful_exit() {
@@ -71,8 +71,8 @@ spec:
                    | tr [ %
                  )"
                # shellcheck disable=SC2086
-                if [ "${job_ids}" ]; then
-                  kill ${job_ids}
+                if [ "$job_ids" ]; then
+                  kill $job_ids
                fi
                wait
                echo "Graceful exit -- $(date)"
@@ -80,7 +80,7 @@ spec:

              trap graceful_exit INT TERM

-              echo "Loop started (period: ${SYNC_PERIOD} s) -- $(date)"
+              echo "Loop started (period: $SYNC_PERIOD s) -- $(date)"
              while true; do
                reconcile & wait $!
                pause_loop & wait $!
--- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml
+++ b/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml
@@ -52,9 +52,9 @@ spec:
                  $(RECONCILE_SH)

                  apply-secret() {
-                    /kbin/kubectl create secret generic "${1}" \
-                      --from-literal=token="${2}" \
-                      --from-literal=address="${3}" \
+                    /kbin/kubectl create secret generic "$1" \
+                      --from-literal=token="$2" \
+                      --from-literal=address="$3" \
                      --dry-run=client -o=yaml \
                      | grep -v "creationTimestamp:" \
                      | /kbin/kubectl apply -f -
--- a/manifests/integrations/registry-credentials-sync/_base/sync.yaml
+++ b/manifests/integrations/registry-credentials-sync/_base/sync.yaml
@@ -46,17 +46,17 @@ spec:
          $(RECONCILE_SH)

          apply-secret() {
-            /kbin/kubectl create secret docker-registry "${1}" \
-              --docker-password="${2}" \
-              --docker-username="${3}" \
-              --docker-server="${4}" \
+            /kbin/kubectl create secret docker-registry "$1" \
+              --docker-password="$2" \
+              --docker-username="$3" \
+              --docker-server="$4" \
              --dry-run=client -o=yaml \
              | grep -v "creationTimestamp:" \
              | /kbin/kubectl apply -f -
          }

          pause_loop() {
-            sleep "${SYNC_PERIOD:-3600}" || true
+            sleep "$SYNC_PERIOD" || true
          }

          graceful_exit() {
@@ -68,8 +68,8 @@ spec:
                | tr [ %
              )"
            # shellcheck disable=SC2086
-            if [ "${job_ids}" ]; then
-              kill ${job_ids}
+            if [ "$job_ids" ]; then
+              kill $job_ids
            fi
            wait
            echo "Graceful exit -- $(date)"
@@ -77,7 +77,7 @@ spec:

          trap graceful_exit INT TERM

-          echo "Loop started (period: ${SYNC_PERIOD} s) -- $(date)"
+          echo "Loop started (period: $SYNC_PERIOD s) -- $(date)"
          while true; do
            reconcile & wait $!
            pause_loop & wait $!
--- a/manifests/integrations/registry-credentials-sync/_cronjobs/_base/sync.yaml
+++ b/manifests/integrations/registry-credentials-sync/_cronjobs/_base/sync.yaml
@@ -48,10 +48,10 @@ spec:
              $(RECONCILE_SH)

              apply-secret() {
-                /kbin/kubectl create secret docker-registry "${1}" \
-                  --docker-password="${2}" \
-                  --docker-username="${3}" \
-                  --docker-server="${4}" \
+                /kbin/kubectl create secret docker-registry "$1" \
+                  --docker-password="$2" \
+                  --docker-username="$3" \
+                  --docker-server="$4" \
                  --dry-run=client -o=yaml \
                  | grep -v "creationTimestamp:" \
                  | /kbin/kubectl apply -f -
--- a/tests/azure/go.mod
+++ b/tests/azure/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/fluxcd/helm-controller/api v0.12.0
 	github.com/fluxcd/image-automation-controller/api v0.15.0
 	github.com/fluxcd/image-reflector-controller/api v0.12.0
-	github.com/fluxcd/kustomize-controller/api v0.15.1
-	github.com/fluxcd/notification-controller/api v0.17.0
+	github.com/fluxcd/kustomize-controller/api v0.15.5
+	github.com/fluxcd/notification-controller/api v0.17.1
 	github.com/fluxcd/pkg/apis/meta v0.10.1
 	github.com/fluxcd/pkg/runtime v0.12.1
 	github.com/fluxcd/source-controller/api v0.16.0
--- a/tests/azure/go.sum
+++ b/tests/azure/go.sum
@@ -197,10 +197,10 @@ github.com/fluxcd/image-automation-controller/api v0.15.0 h1:KI350vt5JahE43D17Vy
 github.com/fluxcd/image-automation-controller/api v0.15.0/go.mod h1:XvrEEpM1rVU+x1gQeXB/dj56w1dmOJRraTxQWOiuNME=
 github.com/fluxcd/image-reflector-controller/api v0.12.0 h1:ghdbOUmbNaPi/jVfNnI3xzvhudXBZx6xUld/OLNSVXM=
 github.com/fluxcd/image-reflector-controller/api v0.12.0/go.mod h1:lgQHGFz29OHmDU5Jwg689C/M+P/f9ujt6NS0zCLT0BQ=
-github.com/fluxcd/kustomize-controller/api v0.15.1 h1:xyMta7ICzoSKNkRWejH2sflo3dF7umP6To74+3NhdTk=
-github.com/fluxcd/kustomize-controller/api v0.15.1/go.mod h1:OhnZuXBeDl4NqbDZgpYKRg8nmsmeUIddH3vX8wxym9A=
-github.com/fluxcd/notification-controller/api v0.17.0 h1:HrTX6EThmvbW3I+uKJyaggcNnRsLxogc6q7A3nXZ9tQ=
-github.com/fluxcd/notification-controller/api v0.17.0/go.mod h1:t28GMWMLiLqho+ikpZrldv22/vmCsFdQR8vdJluxknc=
+github.com/fluxcd/kustomize-controller/api v0.15.5 h1:PibDIrwLArcDQfrbn9u4kcDbE+/uRjo/YzGkJGXkgmc=
+github.com/fluxcd/kustomize-controller/api v0.15.5/go.mod h1:OhnZuXBeDl4NqbDZgpYKRg8nmsmeUIddH3vX8wxym9A=
+github.com/fluxcd/notification-controller/api v0.17.1 h1:99nQKil/vDwSxxjyxRKxa4/DoRu9F8JoMMJkRqLGMqU=
+github.com/fluxcd/notification-controller/api v0.17.1/go.mod h1:t28GMWMLiLqho+ikpZrldv22/vmCsFdQR8vdJluxknc=
 github.com/fluxcd/pkg/apis/kustomize v0.1.0/go.mod h1:gEl+W5cVykCC3RfrCaqe+Pz+j4lKl2aeR4dxsom/zII=
 github.com/fluxcd/pkg/apis/kustomize v0.2.0 h1:jhu2QHvs+j3Zo9rR6w8hkO3LSC6h3M37zY5ejufOmxY=
 github.com/fluxcd/pkg/apis/kustomize v0.2.0/go.mod h1:gEl+W5cVykCC3RfrCaqe+Pz+j4lKl2aeR4dxsom/zII=
Author	SHA1	Message	Date
Stefan Prodan	da87e16321	Merge pull request #1935 from fluxcd/update-components Update toolkit components	2021-10-13 15:04:51 +03:00
Stefan Prodan	f7aa3e7e1b	Update github.com/fluxcd/pkg/ssa to v0.1.0 Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-10-13 14:43:35 +03:00
fluxcdbot	deacfd6c03	Update toolkit components - kustomize-controller to v0.15.5 https://github.com/fluxcd/kustomize-controller/blob/v0.15.5/CHANGELOG.md - notification-controller to v0.17.1 https://github.com/fluxcd/notification-controller/blob/v0.17.1/CHANGELOG.md Signed-off-by: GitHub <noreply@github.com>	2021-10-13 11:16:40 +00:00
Stefan Prodan	3e8d1ae1d5	Merge pull request #1732 from timja/kustomize-substitute-fixes Avoid substitution issue in kustomize credentials sync	2021-10-13 14:16:03 +03:00
Tim Jacomb	08f5ca39b0	Avoid substitution issue in kustomize credentials sync Signed-off-by: Tim Jacomb <tim.jacomb@hmcts.net>	2021-10-13 11:50:16 +01:00
Stefan Prodan	31da363495	Merge pull request #1925 from fluxcd/update-components Update kustomize-controller to v0.15.4	2021-10-12 13:32:09 +03:00
fluxcdbot	2ecd99d317	Update toolkit components - kustomize-controller to v0.15.4 https://github.com/fluxcd/kustomize-controller/blob/v0.15.4/CHANGELOG.md Signed-off-by: GitHub <noreply@github.com>	2021-10-12 10:15:51 +00:00
Stefan Prodan	59c3d84182	Merge pull request #1847 from OakNorthAI/let-user-set-version-to-install feature: let user specify what version of flux-cli they want to install	2021-10-12 13:15:11 +03:00
Jakub Baron	641d5378f8	Merge branch 'main' into let-user-set-version-to-install	2021-10-11 12:39:37 +01:00
Stefan Prodan	08512e5c43	Merge pull request #1919 from fluxcd/fix-ssa Fix SSA upstream bugs for Kubernetes < 1.22	2021-10-10 18:43:41 +03:00
Stefan Prodan	8f7f7b23e8	Downgrade e2e tests to Kubernetes v1.19 Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-10-10 16:43:21 +03:00
Stefan Prodan	2eb6ba5a48	Apply SSA fix to flux install and bootstrap Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-10-10 16:08:16 +03:00
Stefan Prodan	03df386f9e	Update kustomize-controller to v0.15.2 Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2021-10-10 16:07:36 +03:00
Jakub Baron	b16f1fc260	feature: let user specify what version of flux-cli they want to install Signed-off-by: Jakub Baron <jakub.baron@oaknorth.com>	2021-09-21 12:36:47 +01:00