Move controllers back to controllers/ due to gitops-operator

Signed-off-by: Jonathan West <jonwest@redhat.com>
argoproj-labs · Aug 7, 2024 · 912c6c0 · 912c6c0
1 parent 9098cb2
commit 912c6c0
Show file tree

Hide file tree

Showing 23 changed files with 67 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.21 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
@@ -14,7 +14,7 @@ RUN go mod download
 # Copy the go source
 COPY cmd/main.go cmd/main.go
 COPY api/ api/
-COPY internal/controller/ internal/controller/
+COPY controllers/ controllers/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command

diff --git a/bundle/manifests/argoproj.io_rolloutmanagers.yaml b/bundle/manifests/argoproj.io_rolloutmanagers.yaml
@@ -53,6 +53,61 @@ spec:
                     description: Labels to add to the resources during its creation.
                     type: object
                 type: object
+              controllerResources:
+                description: Resources requests/limits for Argo Rollout controller
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+
+
+                      This is an alpha field and requires enabling the
+                      DynamicResourceAllocation feature gate.
+
+
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
               env:
                 description: Env lets you specify environment for Rollouts pods
                 items:
@@ -231,6 +286,10 @@ spec:
                       type: object
                     type: array
                 type: object
+              skipNotificationSecretDeployment:
+                description: SkipNotificationSecretDeployment lets you specify if
+                  the argo notification secret should be deployed
+                type: boolean
               version:
                 description: Version defines Argo Rollouts controller tag (optional)
                 type: string

diff --git a/cmd/main.go b/cmd/main.go
@@ -36,7 +36,7 @@ import (
 
 	rolloutsmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
 
-	controllers "github.com/argoproj-labs/argo-rollouts-manager/internal/controller"
+	controllers "github.com/argoproj-labs/argo-rollouts-manager/controllers"
 	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	//+kubebuilder:scaffold:imports

diff --git a/...nal/controller/argorollouts_controller.go → controllers/argorollouts_controller.go b/...nal/controller/argorollouts_controller.go → controllers/argorollouts_controller.go
diff --git a/...ontroller/argorollouts_controller_test.go → controllers/argorollouts_controller_test.go b/...ontroller/argorollouts_controller_test.go → controllers/argorollouts_controller_test.go
diff --git a/internal/controller/configmap.go → controllers/configmap.go b/internal/controller/configmap.go → controllers/configmap.go
diff --git a/internal/controller/configmap_test.go → controllers/configmap_test.go b/internal/controller/configmap_test.go → controllers/configmap_test.go
diff --git a/internal/controller/default.go → controllers/default.go b/internal/controller/default.go → controllers/default.go
diff --git a/internal/controller/deployment.go → controllers/deployment.go b/internal/controller/deployment.go → controllers/deployment.go
diff --git a/internal/controller/deployment_test.go → controllers/deployment_test.go b/internal/controller/deployment_test.go → controllers/deployment_test.go
diff --git a/internal/controller/reconcile.go → controllers/reconcile.go b/internal/controller/reconcile.go → controllers/reconcile.go
diff --git a/internal/controller/resources.go → controllers/resources.go b/internal/controller/resources.go → controllers/resources.go
diff --git a/internal/controller/resources_test.go → controllers/resources_test.go b/internal/controller/resources_test.go → controllers/resources_test.go
diff --git a/internal/controller/status.go → controllers/status.go b/internal/controller/status.go → controllers/status.go
diff --git a/internal/controller/status_test.go → controllers/status_test.go b/internal/controller/status_test.go → controllers/status_test.go
diff --git a/internal/controller/suite_test.go → controllers/suite_test.go b/internal/controller/suite_test.go → controllers/suite_test.go
diff --git a/internal/controller/utils.go → controllers/utils.go b/internal/controller/utils.go → controllers/utils.go
diff --git a/internal/controller/utils_test.go → controllers/utils_test.go b/internal/controller/utils_test.go → controllers/utils_test.go
diff --git a/hack/upgrade-rollouts-script/main.go b/hack/upgrade-rollouts-script/main.go
@@ -36,7 +36,7 @@ const (
 	argoprojlabsRepoOrg         = "argoproj-labs"
 	argoRolloutsManagerRepoName = "argo-rollouts-manager"
 
-	controllersDefaultGo = "internal/controller/default.go"
+	controllersDefaultGo = "controllers/default.go"
 )
 
 func main() {

diff --git a/tests/e2e/cluster-scoped/cluster_scoped_rollouts_test.go b/tests/e2e/cluster-scoped/cluster_scoped_rollouts_test.go
@@ -15,7 +15,7 @@ import (
 
 	rmv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
 
-	controllers "github.com/argoproj-labs/argo-rollouts-manager/internal/controller"
+	controllers "github.com/argoproj-labs/argo-rollouts-manager/controllers"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/tests/e2e/namespace-scoped/namespace_scoped_rollouts_test.go b/tests/e2e/namespace-scoped/namespace_scoped_rollouts_test.go
@@ -17,7 +17,7 @@ import (
 
 	rmv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
 
-	controllers "github.com/argoproj-labs/argo-rollouts-manager/internal/controller"
+	controllers "github.com/argoproj-labs/argo-rollouts-manager/controllers"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/tests/e2e/rollout_tests_all.go b/tests/e2e/rollout_tests_all.go
@@ -17,7 +17,7 @@ import (
 
 	rolloutsmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
 
-	controllers "github.com/argoproj-labs/argo-rollouts-manager/internal/controller"
+	controllers "github.com/argoproj-labs/argo-rollouts-manager/controllers"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

diff --git a/tests/e2e/test_utils.go b/tests/e2e/test_utils.go
@@ -16,7 +16,7 @@ import (
 
 	rmv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
 
-	controllers "github.com/argoproj-labs/argo-rollouts-manager/internal/controller"
+	controllers "github.com/argoproj-labs/argo-rollouts-manager/controllers"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"