bundle

Signed-off-by: enriqueav99 <enriqueav1999@gmail.com>
argoproj-labs · Sep 4, 2024 · 23bc885 · 23bc885
1 parent 991e546
commit 23bc885
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 46,175 deletions.
diff --git a/api/v1alpha1/argocd_types.go b/api/v1alpha1/argocd_types.go
@@ -109,11 +109,6 @@ type ArgoCDApplicationControllerSpec struct {
 	// Env lets you specify environment for application controller pods
 	Env []corev1.EnvVar `json:"env,omitempty"`
 
-	// Custom annotations to pods deployed by the operator
-	CustomPodAnnotations map[string]string `json:"customPodAnnotations,omitempty"`
-
-	// Custom labels to pods deployed by the operator
-	CustomPodLabels map[string]string `json:"customPodLabels,omitempty"`
 }
 
 // ArgoCDApplicationControllerShardSpec defines the options available for enabling sharding for the Application Controller component.
@@ -164,12 +159,6 @@ type ArgoCDApplicationSet struct {
 	// LogLevel describes the log level that should be used by the ApplicationSet controller. Defaults to ArgoCDDefaultLogLevel if not set.  Valid options are debug,info, error, and warn.
 	LogLevel string `json:"logLevel,omitempty"`
 
-	// Custom annotations to pods deployed by the operator
-	CustomPodAnnotations map[string]string `json:"customPodAnnotations,omitempty"`
-
-	// Custom labels to pods deployed by the operator
-	CustomPodLabels map[string]string `json:"customPodLabels,omitempty"`
-
 	WebhookServer WebhookServerSpec `json:"webhookServer,omitempty"`
 }
 
@@ -483,11 +472,6 @@ type ArgoCDRepoSpec struct {
 	// SidecarContainers defines the list of sidecar containers for the repo server deployment
 	SidecarContainers []corev1.Container `json:"sidecarContainers,omitempty"`
 
-	// Custom annotations to pods deployed by the operator
-	CustomPodAnnotations map[string]string `json:"customPodAnnotations,omitempty"`
-
-	// Custom labels to pods deployed by the operator
-	CustomPodLabels map[string]string `json:"customPodLabels,omitempty"`
 }
 
 // ArgoCDRouteSpec defines the desired state for an OpenShift Route.
@@ -579,11 +563,6 @@ type ArgoCDServerSpec struct {
 	// with same or different value.
 	ExtraCommandArgs []string `json:"extraCommandArgs,omitempty"`
 
-	// Custom annotations to pods deployed by the operator
-	CustomPodAnnotations map[string]string `json:"customPodAnnotations,omitempty"`
-
-	// Custom labels to pods deployed by the operator
-	CustomPodLabels map[string]string `json:"customPodLabels,omitempty"`
 }
 
 // ArgoCDServerServiceSpec defines the Service options for Argo CD Server component.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml
@@ -247,13 +247,13 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2024-09-04T18:10:05Z"
+    createdAt: "2024-09-04T18:18:06Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
     repository: https://github.com/argoproj-labs/argocd-operator
     support: Argo CD
-  name: argocd-operator.v0.12.1
+  name: argocd-operator.v0.12.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1901,7 +1901,7 @@ spec:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: ENABLE_CONVERSION_WEBHOOK
                   value: "true"
-                image: quay.io/argoprojlabs/argocd-operator:v0.12.1
+                image: quay.io/argoprojlabs/argocd-operator:v0.12.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1994,7 +1994,7 @@ spec:
   provider:
     name: Argo CD Community
   replaces: argocd-operator.v0.11.0
-  version: 0.12.1
+  version: 0.12.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1alpha1

diff --git a/bundle/manifests/argoproj.io_argocds.yaml b/bundle/manifests/argoproj.io_argocds.yaml
@@ -66,16 +66,6 @@ spec:
                 description: ArgoCDApplicationSet defines whether the Argo CD ApplicationSet
                   controller should be installed.
                 properties:
-                  customPodAnnotations:
-                    additionalProperties:
-                      type: string
-                    description: Custom annotations to pods deployed by the operator
-                    type: object
-                  customPodLabels:
-                    additionalProperties:
-                      type: string
-                    description: Custom labels to pods deployed by the operator
-                    type: object
                   env:
                     description: Env lets you specify environment for applicationSet
                       controller pods
@@ -431,16 +421,6 @@ spec:
                       Set this to a duration, e.g. 10m or 600s to control the synchronisation
                       frequency.
                     type: string
-                  customPodAnnotations:
-                    additionalProperties:
-                      type: string
-                    description: Custom annotations to pods deployed by the operator
-                    type: object
-                  customPodLabels:
-                    additionalProperties:
-                      type: string
-                    description: Custom labels to pods deployed by the operator
-                    type: object
                   env:
                     description: Env lets you specify environment for application
                       controller pods
@@ -1647,16 +1627,6 @@ spec:
                       The value specified here can currently be:
                       - openshift - Use the OpenShift service CA to request TLS config
                     type: string
-                  customPodAnnotations:
-                    additionalProperties:
-                      type: string
-                    description: Custom annotations to pods deployed by the operator
-                    type: object
-                  customPodLabels:
-                    additionalProperties:
-                      type: string
-                    description: Custom labels to pods deployed by the operator
-                    type: object
                   env:
                     description: Env lets you specify environment for repo server
                       pods
@@ -6328,16 +6298,6 @@ spec:
                     required:
                     - enabled
                     type: object
-                  customPodAnnotations:
-                    additionalProperties:
-                      type: string
-                    description: Custom annotations to pods deployed by the operator
-                    type: object
-                  customPodLabels:
-                    additionalProperties:
-                      type: string
-                    description: Custom labels to pods deployed by the operator
-                    type: object
                   env:
                     description: Env lets you specify environment for API server pods
                     items:

diff --git a/config/crd/bases/argoproj.io_argocds.yaml b/config/crd/bases/argoproj.io_argocds.yaml
@@ -55,16 +55,6 @@ spec:
                 description: ArgoCDApplicationSet defines whether the Argo CD ApplicationSet
                   controller should be installed.
                 properties:
-                  customPodAnnotations:
-                    additionalProperties:
-                      type: string
-                    description: Custom annotations to pods deployed by the operator
-                    type: object
-                  customPodLabels:
-                    additionalProperties:
-                      type: string
-                    description: Custom labels to pods deployed by the operator
-                    type: object
                   env:
                     description: Env lets you specify environment for applicationSet
                       controller pods
@@ -420,16 +410,6 @@ spec:
                       Set this to a duration, e.g. 10m or 600s to control the synchronisation
                       frequency.
                     type: string
-                  customPodAnnotations:
-                    additionalProperties:
-                      type: string
-                    description: Custom annotations to pods deployed by the operator
-                    type: object
-                  customPodLabels:
-                    additionalProperties:
-                      type: string
-                    description: Custom labels to pods deployed by the operator
-                    type: object
                   env:
                     description: Env lets you specify environment for application
                       controller pods
@@ -1636,16 +1616,6 @@ spec:
                       The value specified here can currently be:
                       - openshift - Use the OpenShift service CA to request TLS config
                     type: string
-                  customPodAnnotations:
-                    additionalProperties:
-                      type: string
-                    description: Custom annotations to pods deployed by the operator
-                    type: object
-                  customPodLabels:
-                    additionalProperties:
-                      type: string
-                    description: Custom labels to pods deployed by the operator
-                    type: object
                   env:
                     description: Env lets you specify environment for repo server
                       pods
@@ -6317,16 +6287,6 @@ spec:
                     required:
                     - enabled
                     type: object
-                  customPodAnnotations:
-                    additionalProperties:
-                      type: string
-                    description: Custom annotations to pods deployed by the operator
-                    type: object
-                  customPodLabels:
-                    additionalProperties:
-                      type: string
-                    description: Custom labels to pods deployed by the operator
-                    type: object
                   env:
                     description: Env lets you specify environment for API server pods
                     items:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/argoprojlabs/argocd-operator
-  newTag: v0.12.1
+  newTag: v0.12.0
diff --git a/deploy/olm-catalog/argocd-operator/0.12.0/argocd-operator.v0.12.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.12.0/argocd-operator.v0.12.0.clusterserviceversion.yaml
@@ -247,7 +247,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2024-09-02T07:25:55Z"
+    createdAt: "2024-09-04T18:18:06Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4

diff --git a/...argocd-operator/0.12.1/argocd-operator-controller-manager-metrics-service_v1_service.yaml b/...argocd-operator/0.12.1/argocd-operator-controller-manager-metrics-service_v1_service.yaml
diff --git a/deploy/olm-catalog/argocd-operator/0.12.1/argocd-operator-manager-config_v1_configmap.yaml b/deploy/olm-catalog/argocd-operator/0.12.1/argocd-operator-manager-config_v1_configmap.yaml
diff --git a/...rator/0.12.1/argocd-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...rator/0.12.1/argocd-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
diff --git a/deploy/olm-catalog/argocd-operator/0.12.1/argocd-operator-webhook-service_v1_service.yaml b/deploy/olm-catalog/argocd-operator/0.12.1/argocd-operator-webhook-service_v1_service.yaml