Internalize argocd operator (DO NOT SQUASH-MERGE)

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: openshift-gitops-go-toolset
   namespace: ci
-  tag: 1.26.2
+  tag: 1.26.3

Dockerfile

@@ -1,10 +1,12 @@
 # Build the manager binary
-FROM golang:1.26.2 as builder
+FROM golang:1.26.3 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
+# ... and the now-replaced module
+COPY argocd-operator/ argocd-operator/
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download

Makefile

@@ -157,6 +157,7 @@ test-gitopsservice-nondefault:
 
 .PHONY: test
 test: manifests generate fmt vet ## Run unit tests.
+	cd argocd-operator && REDIS_CONFIG_PATH="build/redis" go test $(shell cd argocd-operator && go list ./... | grep -E -v '/tests/ginkgo') -coverprofile cover.out
 	REDIS_CONFIG_PATH="build/redis" go test `go list ./... | grep -v test` -coverprofile cover.out
 
 
@@ -300,16 +301,6 @@ bundle-build: ## Build the bundle image.
 bundle-push: ## Push the bundle image.
 	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
 
-ARGOCD_OPERATOR_BRANCH ?= master
-
-# To run propagate-manifests target with the default argocd-operator master branch:
-#  make propagate-manifests
-# To run propagate-manifests target with a custom argocd-operator branch or tag:
-#  ARGOCD_OPERATOR_BRANCH=release-0.19 make propagate-manifests
-.PHONY: propagate-manifests
-propagate-manifests: ## compare and propagate manifests from argocd-operator repo
-	./hack/propagate.sh --from-branch $(ARGOCD_OPERATOR_BRANCH)
-
 .PHONY: opm
 OPM = ./bin/opm
 opm: ## Download opm locally if necessary.
@@ -355,12 +346,13 @@ catalog-push: ## Push a catalog image.
 
 .PHONY: gosec
 gosec: go_sec
-	$(GO_SEC) --exclude-dir "hack/upgrade-rollouts-manager"  ./...
+	$(GO_SEC) --exclude-dir "hack/upgrade-rollouts-manager" --exclude-dir "argocd-operator/hack/"  ./...
 
 .PHONY: lint
 lint: golangci_lint
 	$(GOLANGCI_LINT) --version
 	$(GOLANGCI_LINT) run --fix --verbose --timeout 300s
+	cd argocd-operator && $(GOLANGCI_LINT) run --fix --verbose --timeout 300s
 
 
 GO_SEC = $(shell pwd)/bin/gosec

api/v1alpha1/gitopsservice_types.go

@@ -86,7 +86,3 @@ type GitopsServiceList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []GitopsService `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&GitopsService{}, &GitopsServiceList{})
-}

api/v1alpha1/groupversion_info.go

@@ -20,17 +20,24 @@ limitations under the License.
 package v1alpha1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects
 	GroupVersion = schema.GroupVersion{Group: "pipelines.openshift.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+func addKnownTypes(s *runtime.Scheme) error {
+	s.AddKnownTypes(GroupVersion, &GitopsService{}, &GitopsServiceList{})
+	metav1.AddToGroupVersion(s, GroupVersion)
+	return nil
+}

argocd-operator/.codecov.yml

@@ -0,0 +1,16 @@
+flags:
+  unit-tests:
+    carryforward: true
+coverage:
+  status:
+    patch:
+      default:
+        threshold: 2
+    project:
+      default:
+        threshold: 2
+ignore:
+  - "**/*_test.go"
+  - "**/mocks/*"
+  - "test/**/*"
+  - "vendor/**/*"

argocd-operator/.dockerignore

@@ -0,0 +1,4 @@
+# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
+# Ignore build and test binaries.
+bin/
+testbin/

argocd-operator/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

argocd-operator/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+> if your feature request is a large change and requires a formal proposal or design doc, please read the docs for [contributing](https://github.com/argoproj-labs/argocd-operator/blob/master/docs/developer-guide/contributing.md) first. You may need to submit an additional Pull Request using the [enhancement proposal template](https://github.com/argoproj-labs/argocd-operator/blob/master/docs/proposals/001-proposal-template.md).
+
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

argocd-operator/.github/ISSUE_TEMPLATE/task.md

@@ -0,0 +1,19 @@
+---
+name: Task 🔧
+about: Internal things, technical debt, and to-do tasks to be performed.
+title: ''
+labels: 'kind/task'
+assignees: ''
+
+---
+### Is your task related to a problem? Please describe.
+<!-- A clear and concise description of what the problem is.-->
+
+### Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+### Describe alternatives you've considered
+<!--A clear and concise description of any alternative solutions or features you've considered. -->
+
+### Additional context
+<!-- Add any other context or screenshots about the task here. -->

argocd-operator/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,26 @@
+**What type of PR is this?**
+
+[//]: # (Uncomment only one <!-- /kind ... --> line, and delete the rest.)
+[//]: # (For example, <!-- /kind bug --> would simply become: /kind bug  )
+
+<!-- /kind bug -->
+<!-- /kind chore -->
+<!-- /kind cleanup -->
+<!-- /kind failing-test -->
+<!-- /kind enhancement -->
+<!-- /kind documentation -->
+<!-- /kind code-refactoring -->
+
+
+**What does this PR do / why we need it**:
+
+**Have you updated the necessary documentation?**
+
+* [ ] Documentation update is required by this PR.
+* [ ] Documentation has been updated.
+
+**Which issue(s) this PR fixes**:
+
+Fixes #?
+
+**How to test changes / Special notes to the reviewer**:

argocd-operator/.github/cherry-pick-bot.yml

@@ -0,0 +1,2 @@
+enabled: true
+preservePullRequestTitle: true

argocd-operator/.github/dependabot.yml

@@ -0,0 +1,47 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    ignore:
+      # Only suggest patch updates. Rest is manually controlled.
+      - dependency-name: "github.com/argoproj-labs/argocd-image-updater"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
+      # Ignore argo-cd altogether. Needs `make update-dependencies` to be done correctly.
+      - dependency-name: "github.com/argoproj/argo-cd/v3"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "docker"
+    directory: "/build/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "docker"
+    directory: "/build/util/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "docker"
+    directory: "/deploy/registry/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "docker"
+    directory: "/tests/auxiliary/smtplistener/"
+    schedule:
+      interval: "daily"