diff --git a/Makefile b/Makefile index 56d3e5ae496..958a80ad343 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ BUILD_TIME?=$(shell date +'%Y-%m-%d_%T') BRANCH?=$(shell which git > /dev/null && git rev-parse --abbrev-ref HEAD) GIT_COMMIT?=$(shell which git > /dev/null && git log -n1 --pretty='%h') VERSION?=$(shell which git > /dev/null && git describe --always --match "v*") -FLUX_VERSION=2.0.1 +FLUX_VERSION=2.1.2 CHART_VERSION=$(shell which yq > /dev/null && yq e '.version' charts/gitops-server/Chart.yaml) DEV_BUCKET_CONTAINER_IMAGE?=ghcr.io/weaveworks/gitops-bucket-server@sha256:9fa2a68032b9d67197a3d41a46b5029ffdf9a7bc415e4e7e9794faec8bc3b8e4 TIER=oss diff --git a/go.mod b/go.mod index 0988d450b49..c6701190f19 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/spf13/viper v1.13.0 github.com/tomwright/dasel v1.22.1 github.com/weaveworks/policy-agent/api v1.0.5 - github.com/weaveworks/tf-controller/tfctl v0.0.0-20230523160934-c6613bfc7fff + github.com/weaveworks/tf-controller/tfctl v0.0.0-20231025134255-eac574d4bac7 github.com/yannh/kubeconform v0.5.0 go.uber.org/zap v1.24.0 golang.org/x/crypto v0.13.0 diff --git a/go.sum b/go.sum index a9226a3a5bc..3e8417187c2 100644 --- a/go.sum +++ b/go.sum @@ -581,8 +581,8 @@ github.com/weaveworks/policy-agent/api v1.0.5 h1:4pqzzta8xPUsE9h9YhGJVg5XQ2NuAU/ github.com/weaveworks/policy-agent/api v1.0.5/go.mod h1:LlhTiipsV5GSHkL/q7Wa7qrJPZGR9Xtoq2npXTWp9bI= github.com/weaveworks/tf-controller/api v0.0.0-20230416092146-4a7dfa5b6cc4 h1:+IkLtnXzCkhJzojbadPd+UxwaTa6K/Eb2grY6LcYfeo= github.com/weaveworks/tf-controller/api v0.0.0-20230416092146-4a7dfa5b6cc4/go.mod h1:LUBkwqS7FHz/QTNuYzvWj6svehhh1djnV0Gj3OTc87E= -github.com/weaveworks/tf-controller/tfctl v0.0.0-20230523160934-c6613bfc7fff h1:7W9BOtaeNX4vka2mZelcMCv8BMBmzVPAlBO9iUZQ4qM= -github.com/weaveworks/tf-controller/tfctl v0.0.0-20230523160934-c6613bfc7fff/go.mod h1:9RFuqlMWSGaFs6qBST17YltvzNIhcTb8A+VKJ5qJnLY= +github.com/weaveworks/tf-controller/tfctl v0.0.0-20231025134255-eac574d4bac7 h1:q5qCxFXkRG49L/zL9ArcujuJT+MtQa4swQzAZApwV78= +github.com/weaveworks/tf-controller/tfctl v0.0.0-20231025134255-eac574d4bac7/go.mod h1:4DPsiECdMYBva1U9xbRt8+gnyCCc2lRMbyiHrtUOkuo= github.com/xanzy/go-gitlab v0.83.0 h1:37p0MpTPNbsTMKX/JnmJtY8Ch1sFiJzVF342+RvZEGw= github.com/xanzy/go-gitlab v0.83.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=