From 8ecae6cdf9743e1c07379ba4d4d5668557d1efea Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 13:25:41 -0400 Subject: [PATCH 1/9] update gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fb5eb80e..c2a3daa7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,5 @@ /.charts-build-scripts *.DS_Store dev/ -kubeconfig.yaml +kubeconfig*.yaml get_helm.sh \ No newline at end of file From e2c3f6f9db497acc7e10ef60dde4f66f995b610d Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 13:26:00 -0400 Subject: [PATCH 2/9] Add additional logging for codegen --- pkg/helm-locker/codegen/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/helm-locker/codegen/main.go b/pkg/helm-locker/codegen/main.go index 84870058..1f5b3e4e 100644 --- a/pkg/helm-locker/codegen/main.go +++ b/pkg/helm-locker/codegen/main.go @@ -24,6 +24,7 @@ func main() { } os.Unsetenv("GOPATH") + logrus.Info("Generating controller boilerplate") controllergen.Run(args.Options{ OutputPackage: "github.com/rancher/prometheus-federator/pkg/helm-locker/generated", Boilerplate: "gen/boilerplate.go.txt", From e0e4068055818c47a431d9d5f3c462b59567be93 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 13:38:04 -0400 Subject: [PATCH 3/9] update golang --- go.mod | 4 +++- tests/go.mod | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 7130f8f1..3854395e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/rancher/prometheus-federator -go 1.22.3 +go 1.22 + +toolchain go1.22.8 replace ( k8s.io/api => k8s.io/api v0.22.3 diff --git a/tests/go.mod b/tests/go.mod index e907fb55..c4b9a35e 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,6 +1,8 @@ module example.com -go 1.22.3 +go 1.22.0 + +toolchain go1.23.1 require ( github.com/caarlos0/env/v11 v11.0.0 From 3a4ea54c93abab741fd8e7a0dd1eb3268d1251ba Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 13:43:39 -0400 Subject: [PATCH 4/9] Update helm cli binary to v3.13.3-rancher1 --- package/Dockerfile-prometheus-federator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Dockerfile-prometheus-federator b/package/Dockerfile-prometheus-federator index ba8b2623..2c9dc53f 100644 --- a/package/Dockerfile-prometheus-federator +++ b/package/Dockerfile-prometheus-federator @@ -4,7 +4,7 @@ FROM --platform=$BUILDPLATFORM rancher/mirrored-tonistiigi-xx:1.3.0 AS xx FROM --platform=$BUILDPLATFORM registry.suse.com/bci/golang:1.22 AS helm # Clone repository once, and reuse it for target archs. -ARG HELM_VERSION=release-v3.9.0 +ARG HELM_VERSION=v3.13.3-rancher1 ADD --keep-git-dir=true https://github.com/rancher/helm.git#${HELM_VERSION} /helm RUN cd /helm && go mod download From 2910d51933531817c937f04e69cd0af3c0576793 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 13:47:36 -0400 Subject: [PATCH 5/9] Also update dapper's helm version --- Dockerfile.dapper | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index bf0a36b0..6377f434 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,6 +1,7 @@ FROM registry.suse.com/bci/golang:1.22 AS helm +ARG HELM_VERSION=v3.13.3-rancher1 RUN zypper -n install git -RUN git -C / clone --branch release-v3.9.0 --depth=1 https://github.com/rancher/helm +RUN git -C / clone --branch $HELM_VERSION --depth=1 https://github.com/rancher/helm RUN make -C /helm FROM registry.suse.com/bci/golang:1.22 From ce02c5004c939b1ffb3b1b01aa4d161e39f2e39d Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 14:03:31 -0400 Subject: [PATCH 6/9] Add new info on branching and notes to remove past info in the future --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index c9aa8370..71a56291 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,19 @@ For more info on _Helm Locker_, see the [dedicated README file](README-helm-lock For more information, see the [Getting Started guide](docs/prometheus-federator/gettingstarted.md). +### Branches and Releases +This is the current branch strategy for `rancher/backup-restore-operator`, it may change in the future. + +| Branch | Tag | Rancher | +|----------------|----------|------------------------| +| `main` | `head` | `main` branch (`head`) | +| `release/v1.0` | `v1.x.x` | `v2.9.x` | +| `release/v0.0` | `v0.x.x` | `v2.8.x` | + +> [!NOTE] +> We are starting our new Branch strategy officially in 2.10, the prior Rancher versions will receive updates to their new versions once cleared for backporting. + + ## More Info Prometheus Federator is an operator (powered by [`rancher/helm-project-operator`](README-helm-project-operator.md) and [`rancher/charts-build-scripts`](README-helm-locker.md)) that manages deploying one or more Project Monitoring Stacks composed of the following set of resources that are scoped to project namespaces: @@ -54,6 +67,10 @@ For more information, see the [Developing guide](docs/prometheus-federator/devel ## Versioning and Releasing For Rancher +> [!NOTE] +> We are starting our new Branch strategy officially in 2.10, the prior Rancher versions will receive updates to their new versions once cleared for backporting. +> Once we fully adopt this branching and release process, we will remove this note. + While this repository does maintain a standalone Helm repository for vanilla Helm users to consume directly, users of Rancher will see forked versions of these chart releases available on Rancher's Apps & Marketplace; the forked chart releases are maintained in the [`rancher/charts`](https://github.com/rancher/charts) repository on being released from a `dev-vX.X` branch to a `release-vX.X` branch, where `X.X` corresponds to the Rancher `${Major}.${Minor}` version that the users is using (i.e. Rancher `2.7`). **The chart in rancher/charts is generally the version that is intended for use in production since that is the chart that will be tested by Rancher's QA team.** Generally, these charts will match stable versions of charts available in this repository, so non-Rancher users **should** be able to safely use those versions in this repository for production use cases (at their own risk). From c3df434ea531b2b3297a8ded5c82ea3c267c95e6 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 14:29:18 -0400 Subject: [PATCH 7/9] Add dapper temp file to ignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c2a3daa7..0d4b31bd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,6 @@ *.DS_Store dev/ kubeconfig*.yaml -get_helm.sh \ No newline at end of file +get_helm.sh +Dockerfile.dapper* +!Dockerfile.dapper \ No newline at end of file From b7a88000675bf189b829cfe16d1c1296a244478f Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 14:35:05 -0400 Subject: [PATCH 8/9] Add patch to docker dapper image --- Dockerfile.dapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 6377f434..3d291193 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -11,7 +11,7 @@ COPY --from=docker.io/docker/buildx-bin:0.17.1 /buildx /usr/libexec/docker/cli-p ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH -RUN zypper -n install git docker vim less file curl wget +RUN zypper -n install git docker vim less file curl wget patch RUN go install golang.org/x/tools/cmd/goimports@latest RUN if [ "${ARCH}" == "amd64" ]; then \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.2; \ From 6572fb1f312aa2029429e980542ab117431d86ac Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Mon, 28 Oct 2024 14:52:15 -0400 Subject: [PATCH 9/9] Correct versions stuff - we'd use 1.x for main/2.10 --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 71a56291..c4f766e4 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,7 @@ This is the current branch strategy for `rancher/backup-restore-operator`, it ma | Branch | Tag | Rancher | |----------------|----------|------------------------| | `main` | `head` | `main` branch (`head`) | -| `release/v1.0` | `v1.x.x` | `v2.9.x` | -| `release/v0.0` | `v0.x.x` | `v2.8.x` | +| `release/v0.0` | `v0.x.x` | `v2.9.x`, `v2.8.x` | > [!NOTE] > We are starting our new Branch strategy officially in 2.10, the prior Rancher versions will receive updates to their new versions once cleared for backporting.