Merge pull request #682 from openshift-cherrypick-robot/cherry-pick-6…

…78-to-v1.12 [v1.12] Removed duplicate CRD entry for ArgoCD, updated missing details for operator owned crds
redhat-developer · Apr 28, 2024 · 11f443f · 11f443f
2 parents d895f24 + 3325e72
commit 11f443f
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 18 deletions.
diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml
@@ -186,10 +186,17 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - kind: AnalysisRun
+    - description: An AnalysisRun is an instantiation of an AnalysisTemplate.
+        AnalysisRuns are like Jobs in that they eventually complete.
+      displayName: AnalysisRun
+      kind: AnalysisRun
       name: analysisruns.argoproj.io
       version: v1alpha1
-    - kind: AnalysisTemplate
+    - description: An AnalysisTemplate is a template spec which defines how to
+        perform a canary analysis, such as the metrics, its frequency,
+        and the values which are considered successful or failed.
+      displayName: AnalysisTemplate
+      kind: AnalysisTemplate
       name: analysistemplates.argoproj.io
       version: v1alpha1
     - description: An Application is a group of Kubernetes resources as defined by
@@ -200,6 +207,7 @@ spec:
       version: v1alpha1
     - description: ApplicationSet is the representation of an ApplicationSet controller
         deployment.
+      displayName: ApplicationSet
       kind: ApplicationSet
       name: applicationsets.argoproj.io
       version: v1alpha1
@@ -215,7 +223,7 @@ spec:
       resources:
       - kind: ArgoCD
         name: ""
-        version: v1alpha1
+        version: v1beta1
       - kind: ConfigMap
         name: ""
         version: v1
@@ -258,30 +266,35 @@ spec:
       - kind: StatefulSet
         name: ""
         version: v1
-      version: v1alpha1
-    - kind: ArgoCD
-      name: argocds.argoproj.io
       version: v1beta1
-    - kind: ClusterAnalysisTemplate
+    - description: A ClusterAnalysisTemplate is like an AnalysisTemplate,but it is not limited to its namespace.
+        It can be used by any Rollout throughout the cluster.
+      displayName: ClusterAnalysisTemplate
+      kind: ClusterAnalysisTemplate
       name: clusteranalysistemplates.argoproj.io
       version: v1alpha1
-    - kind: Experiment
+    - description: An Experiment is limited run of one or more ReplicaSets for the purposes of analysis.
+        Experiments typically run for a pre-determined duration, but can also run indefinitely until stopped.
+      displayName: Experiment
+      kind: Experiment
       name: experiments.argoproj.io
       version: v1alpha1
     - description: GitopsService is the Schema for the gitopsservices API
       displayName: Gitops Service
       kind: GitopsService
       name: gitopsservices.pipelines.openshift.io
       version: v1alpha1
-    - kind: NotificationsConfiguration
+    - description: NotificationsConfigurations contains the notification template used to generate notifications
+        that notify users about important changes in the application state.
+      displayName: NotificationsConfiguration
+      kind: NotificationsConfiguration
       name: notificationsconfigurations.argoproj.io
       version: v1alpha1
-    - kind: RolloutManager
+    - description: A controller for managing Argo Rollouts
+      displayName: RolloutManager
+      kind: RolloutManager
       name: rolloutmanagers.argoproj.io
       version: v1alpha1
-    - kind: Rollout
-      name: rollouts.argoproj.io
-      version: v1alpha1
   description: "Red Hat OpenShift GitOps is a declarative continuous delivery platform
     based on [Argo CD](https://argoproj.github.io/argo-cd/). It enables teams to adopt
     GitOps principles for managing cluster configurations and automating secure and

diff --git a/config/manifests/bases/gitops-operator.clusterserviceversion.yaml b/config/manifests/bases/gitops-operator.clusterserviceversion.yaml
@@ -25,12 +25,31 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
+    - description: An AnalysisRun is an instantiation of an AnalysisTemplate.
+        AnalysisRuns are like Jobs in that they eventually complete.
+      displayName: AnalysisRun
+      kind: AnalysisRun
+      name: analysisruns.argoproj.io
+      version: v1alpha1
+    - description: An AnalysisTemplate is a template spec which defines how to
+        perform a canary analysis, such as the metrics, its frequency,
+        and the values which are considered successful or failed.
+      displayName: AnalysisTemplate
+      kind: AnalysisTemplate
+      name: analysistemplates.argoproj.io
+      version: v1alpha1
     - description: An Application is a group of Kubernetes resources as defined by
         a manifest.
       displayName: Application
       kind: Application
       name: applications.argoproj.io
       version: v1alpha1
+    - description: ApplicationSet is the representation of an ApplicationSet controller
+        deployment.
+      displayName: ApplicationSet
+      kind: ApplicationSet
+      name: applicationsets.argoproj.io
+      version: v1alpha1
     - description: An AppProject is a logical grouping of Argo CD Applications.
       displayName: AppProject
       kind: AppProject
@@ -43,7 +62,7 @@ spec:
       resources:
       - kind: ArgoCD
         name: ""
-        version: v1alpha1
+        version: v1beta1
       - kind: ConfigMap
         name: ""
         version: v1
@@ -86,17 +105,35 @@ spec:
       - kind: StatefulSet
         name: ""
         version: v1
+      version: v1beta1
+    - description: A ClusterAnalysisTemplate is like an AnalysisTemplate,but it is not limited to its namespace.
+        It can be used by any Rollout throughout the cluster.
+      displayName: ClusterAnalysisTemplate
+      kind: ClusterAnalysisTemplate
+      name: clusteranalysistemplates.argoproj.io
       version: v1alpha1
-    - description: ApplicationSet is the representation of an ApplicationSet controller
-        deployment.
-      kind: ApplicationSet
-      name: applicationsets.argoproj.io
+    - description: An Experiment is limited run of one or more ReplicaSets for the purposes of analysis.
+        Experiments typically run for a pre-determined duration, but can also run indefinitely until stopped.
+      displayName: Experiment
+      kind: Experiment
+      name: experiments.argoproj.io
       version: v1alpha1
     - description: GitopsService is the Schema for the gitopsservices API
       displayName: Gitops Service
       kind: GitopsService
       name: gitopsservices.pipelines.openshift.io
       version: v1alpha1
+    - description: NotificationsConfigurations contains the notification template used to generate notifications
+        that notify users about important changes in the application state.
+      displayName: NotificationsConfiguration
+      kind: NotificationsConfiguration
+      name: notificationsconfigurations.argoproj.io
+      version: v1alpha1
+    - description: A controller for managing Argo Rollouts
+      displayName: RolloutManager
+      kind: RolloutManager
+      name: rolloutmanagers.argoproj.io
+      version: v1alpha1
   displayName: Red Hat OpenShift GitOps
   install:
     spec: