Merge pull request #1925 from fluxcd/update-components

Update kustomize-controller to v0.15.4
Update toolkit components
2026-03-04 04:06:56 +00:00 · 2021-10-12 13:32:09 +03:00 · 2021-10-12 10:15:51 +00:00 · 2021-10-12 13:15:11 +03:00 · 2021-10-11 12:39:37 +01:00 · 2021-09-21 12:36:47 +01:00
5 changed files with 13 additions and 7 deletions
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ 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.2
+	github.com/fluxcd/kustomize-controller/api v0.15.4
 	github.com/fluxcd/notification-controller/api v0.17.0
 	github.com/fluxcd/pkg/apis/meta v0.10.0
 	github.com/fluxcd/pkg/runtime v0.12.0
--- a/go.sum
+++ b/go.sum
@@ -228,8 +228,8 @@ 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.2 h1:6MEt9ke7eQeRZsFPv+OzPeXuURS9axCIFgV3KopDOmo=
-github.com/fluxcd/kustomize-controller/api v0.15.2/go.mod h1:OhnZuXBeDl4NqbDZgpYKRg8nmsmeUIddH3vX8wxym9A=
+github.com/fluxcd/kustomize-controller/api v0.15.4 h1:nKfz8eeOwxjBYl16fH9nN/CKa4qN4+j0ttOPbMDndF4=
+github.com/fluxcd/kustomize-controller/api v0.15.4/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/pkg/apis/kustomize v0.1.0/go.mod h1:gEl+W5cVykCC3RfrCaqe+Pz+j4lKl2aeR4dxsom/zII=
--- 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/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.2/kustomize-controller.crds.yaml
- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.2/kustomize-controller.deployment.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.4/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.4/kustomize-controller.deployment.yaml
 - account.yaml
 patchesJson6902:
 - target:
--- a/manifests/crds/kustomization.yaml
+++ b/manifests/crds/kustomization.yaml
@@ -2,7 +2,7 @@ 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.2/kustomize-controller.crds.yaml
+- https://github.com/fluxcd/kustomize-controller/releases/download/v0.15.4/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/image-reflector-controller/releases/download/v0.12.0/image-reflector-controller.crds.yaml
Author	SHA1	Message	Date
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
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