diff --git a/Makefile b/Makefile index 34f997a0123..7778bb786a7 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) TIER=oss diff --git a/go.mod b/go.mod index 05b5cd2b74c..53e03e39723 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,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-20231025134255-eac574d4bac7 + github.com/weaveworks/tf-controller/tfctl v0.0.0-20231114144107-dc20c2735922 github.com/yannh/kubeconform v0.5.0 go.uber.org/zap v1.25.0 golang.org/x/crypto v0.14.0 diff --git a/go.sum b/go.sum index 9575fda1135..a8e264cc27d 100644 --- a/go.sum +++ b/go.sum @@ -539,8 +539,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-20231101110059-994a65055198 h1:lxF3p4ozFKz09MAkN9CO85ZzQm5JRZ8yiXm4S6o4z90= github.com/weaveworks/tf-controller/api v0.0.0-20231101110059-994a65055198/go.mod h1:201u5xXY+YI7+ggWljE0VvqMxa+zP1Y1lyRXc1RlXBc= -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/weaveworks/tf-controller/tfctl v0.0.0-20231114144107-dc20c2735922 h1:ILcu3eObI+oU1ulz7eC6zYZOsKbYuveTgSYMPRvqXfQ= +github.com/weaveworks/tf-controller/tfctl v0.0.0-20231114144107-dc20c2735922/go.mod h1:58nJlmXshwP4R+D+dmglxP51ld6KwdYA/6F8/3sEAhU= 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=