Update

.github/dependabot.yml

@@ -5,10 +5,10 @@ updates:
     schedule:
       interval: "daily"
     reviewers:
-      - "weaveworks/pesto"
+      - "@bigkevmcd"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     reviewers:
-      - "weaveworks/pesto"
+      - "@bigkevmcd"

.github/workflows/ci.yaml

@@ -32,24 +32,27 @@ jobs:
         run: git config --global url."https://${GITHUB_BUILD_USERNAME}:${GITHUB_BUILD_TOKEN}@github.com".insteadOf "https://github.com"
 
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
           cache: true
 
       - name: Test
         run: make test
 
+      - name: e2e Tests
+        run: make e2e-tests
+
   build-docs:
     runs-on: ubuntu-latest
     permissions:
       contents: read # for actions/checkout to fetch code
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0 # for git describe
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
@@ -74,7 +77,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0 # for git describe
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
@@ -84,15 +87,15 @@ jobs:
         run: echo "::set-output name=VERSION::$(make version)"
 
       - name: Log in to the Container registry
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.5.0
+        uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
@@ -102,11 +105,8 @@ jobs:
           GITHUB_BUILD_TOKEN: ${{ secrets.BUILD_BOT_PERSONAL_ACCESS_TOKEN }}
         run: git config --global url."https://${GITHUB_BUILD_USERNAME}:${GITHUB_BUILD_TOKEN}@github.com".insteadOf "https://github.com"
 
-      - name: go mod vendor
-        run: go mod vendor
-
       - name: Build and push Docker image
-        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
         with:
           context: .
           push: true
@@ -123,26 +123,20 @@ jobs:
       contents: read # for actions/checkout to fetch code
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0 # for git describe
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
-      - name: Configure git for private modules
-        env:
-          GITHUB_BUILD_USERNAME: ${{ secrets.BUILD_BOT_USER }}
-          GITHUB_BUILD_TOKEN: ${{ secrets.BUILD_BOT_PERSONAL_ACCESS_TOKEN }}
-        run: git config --global url."https://${GITHUB_BUILD_USERNAME}:${GITHUB_BUILD_TOKEN}@github.com".insteadOf "https://github.com"
-
       - name: Install Helm
         run: |
           wget --no-verbose https://get.helm.sh/helm-v3.12.1-linux-amd64.tar.gz
-          tar -zxvf helm-v3.12.1-linux-amd64.tar.gz
+          tar -zxvf helm-v3.14.2-linux-amd64.tar.gz
           mv linux-amd64/helm /usr/local/bin/helm
           helm version
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

Dockerfile

@@ -1,14 +1,11 @@
 # Build the manager binary
-FROM golang:1.20 as builder
-ARG TARGETOS
-ARG TARGETARCH
+FROM golang:1.23 as builder
 ARG VERSION
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
-COPY vendor vendor
 
 # Copy the go source
 COPY main.go main.go
@@ -17,12 +14,7 @@ COPY api/ api/
 COPY controllers/ controllers/
 COPY pkg/ pkg/
 
-# Build
-# the GOARCH has not a default value to allow the binary be built according to the host where the command
-# was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO
-# the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
-# by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager -ldflags "-X main.Version=${VERSION}" main.go version.go
+RUN CGO_ENABLED=0 GOOS=linux go build -a -o manager -ldflags "-X main.Version=${VERSION}" main.go version.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

Makefile

@@ -7,7 +7,7 @@ CHART_VERSION := $(shell echo $(VERSION) | sed 's/^v//')
 # Image URL to use all building/pushing image targets
 IMG ?= ghcr.io/weaveworks/gitopssets-controller:${VERSION}
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.31.0
 GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
 CHART_REGISTRY ?= ghcr.io/weaveworks/charts
 
@@ -63,7 +63,7 @@ vet: ## Run go vet against code.
 
 .PHONY: test
 test: manifests generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test ./... -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $(go list ./... | grep -v tests\/e2e) -coverprofile cover.out
 
 .PHONY: e2e-tests
 e2e-tests: manifests generate fmt vet envtest ## Run tests.
@@ -80,19 +80,14 @@ build: manifests generate fmt vet ## Build manager binary.
 run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./main.go ./version.go ${RUN_ARGS}
 
-.PHONY: vendor
-vendor: ## Update vendor directory.
-	go mod tidy
-	go mod vendor
-
 version:
 	@echo $(VERSION)
 
 # If you wish built the manager image targeting other platforms you can use the --platform flag.
 # (i.e. docker build --platform linux/arm64 ). However, you must enable docker buildKit for it.
 # More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: docker-build
-docker-build: test vendor ## Build docker image with the manager.
+docker-build: ## Build docker image with the manager.
 	docker build -t ${IMG} --build-arg VERSION=${VERSION} .
 
 .PHONY: docker-push
@@ -158,7 +153,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.10.0
+CONTROLLER_TOOLS_VERSION ?= v0.16.1
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
@@ -238,4 +233,4 @@ echo "Downloading $(2)" ;\
 GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 rm -rf $$TMP_DIR ;\
 }
-endef
+endef

PROJECT

@@ -1,16 +1,16 @@
-domain: weave.works
+domain: gitops.pro
 layout:
 - go.kubebuilder.io/v3
 projectName: gitopssets-controller
-repo: github.com/weaveworks/gitopssets-controller
+repo: github.com/gitops-tools/gitopssets-controller
 resources:
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
-  domain: weave.works
+  domain: gitops.pro
   group: templates
   kind: GitOpsSet
-  path: github.com/weaveworks/gitopssets-controller/api/v1alpha1
+  path: github.com/gitops-tools/gitopssets-controller/api/v1alpha1
   version: v1alpha1
 version: "3"

README.md

@@ -126,4 +126,4 @@ More information can be found via the [Kubebuilder Documentation](https://book.k
 
 ## License
 
-Copyright 2023.
+Copyright 2025.

api/v1alpha1/doc.go

@@ -1,3 +1,3 @@
 // Package v1alpha1 contains API Schema definitions for the gitopssets v1alpha1 API group
-// +groupName=templates.weave.works
+// +groupName=sets.gitops.pro
 package v1alpha1

api/v1alpha1/gitopsset_types.go

@@ -2,15 +2,21 @@ package v1alpha1
 
 import (
 	"github.com/fluxcd/pkg/apis/meta"
-	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
 // GitOpsSetFinalizer is the finalizer added to GitOpsSets to allow us to clean
 // up resources.
-const GitOpsSetFinalizer = "finalizers.templates.weave.works"
+const GitOpsSetFinalizer = "finalizers.sets.gitops.pro"
+
+// LocalObjectReference contains enough information to locate the referenced Kubernetes resource object.
+type LocalObjectReference struct {
+	// Name of the referent.
+	// +required
+	Name string `json:"name"`
+}
 
 // GitOpsSetTemplate describes a resource to create
 type GitOpsSetTemplate struct {
@@ -73,7 +79,7 @@ type PullRequestGenerator struct {
 
 	// Reference to Secret in same namespace with a field "password" which is an
 	// auth token that can query the Git Provider API.
-	SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`
+	SecretRef *LocalObjectReference `json:"secretRef,omitempty"`
 
 	// Labels is used to filter the PRs that you want to target.
 	// This may be applied on the server.
@@ -137,7 +143,7 @@ type APIClientGenerator struct {
 
 	// Reference to Secret in same namespace with a field "caFile" which
 	// provides the Certificate Authority to trust when making API calls.
-	SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`
+	SecretRef *LocalObjectReference `json:"secretRef,omitempty"`
 }
 
 // HeadersReference references either a Secret or ConfigMap to be used for

api/v1alpha1/groupversion_info.go

@@ -1,6 +1,6 @@
 // Package v1alpha1 contains API Schema definitions for the templates v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=templates.weave.works
+// +groupName=sets.gitops.pro
 package v1alpha1
 
 import (
@@ -10,7 +10,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "templates.weave.works", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "sets.gitops.pro", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

cmd/gitopssets-cli/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
+	"github.com/gitops-tools/gitopssets-controller/pkg/cmd"
 	"github.com/spf13/cobra"
-	"github.com/weaveworks/gitopssets-controller/pkg/cmd"
 )
 
 func main() {