From b853e96f7621eeb4a532776f1fc40517238562d1 Mon Sep 17 00:00:00 2001 From: Sarfaraz Ahamad Date: Mon, 10 Feb 2025 16:15:08 +0530 Subject: [PATCH 1/3] Adding minikube version compatability code Signed-off-by: Sarfaraz Ahamad --- .../manifests/gitops-operator.clusterserviceversion.yaml | 3 ++- config/manifests/kustomization.yaml | 8 +++++++- config/manifests/patches/min-kube-version.yaml | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 config/manifests/patches/min-kube-version.yaml diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index a5d0052a7..bb4a7cfb8 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -164,7 +164,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2025-01-30T07:45:55Z" + createdAt: "2025-02-10T10:43:31Z" description: Enables teams to adopt GitOps principles for managing cluster configurations and application delivery across hybrid multi-cluster Kubernetes environments. features.operators.openshift.io/disconnected: "true" @@ -1115,6 +1115,7 @@ spec: - email: shbose@redhat.com name: shoubhik maturity: alpha + minKubeVersion: 1.25.0 provider: name: Red Hat Inc replaces: gitops-operator.v1.7.3 diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index b8044ef92..e18a9e665 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -60,4 +60,10 @@ patchesJson6902: version: v1alpha1 kind: ClusterServiceVersion name: gitops-operator.v1.8.0 - path: patches/description.yaml \ No newline at end of file + path: patches/description.yaml +- target: + group: operators.coreos.com + version: v1alpha1 + kind: ClusterServiceVersion + name: gitops-operator.v1.8.0 + path: patches/min-kube-version.yaml \ No newline at end of file diff --git a/config/manifests/patches/min-kube-version.yaml b/config/manifests/patches/min-kube-version.yaml new file mode 100644 index 000000000..65f3c9d09 --- /dev/null +++ b/config/manifests/patches/min-kube-version.yaml @@ -0,0 +1,3 @@ +- op: add + path: "/spec/minKubeVersion" + value: "1.25.0" \ No newline at end of file From 98a728fe559d033d652fb363b4834beca82d552f Mon Sep 17 00:00:00 2001 From: Sarfaraz Ahamad Date: Mon, 10 Feb 2025 16:37:16 +0530 Subject: [PATCH 2/3] Adding annotation example to avoid the warnings Signed-off-by: Sarfaraz Ahamad --- ...gitops-operator.clusterserviceversion.yaml | 107 +++++++++++++++++- .../samples/argoproj.io_v1alpha1_aargocd.yaml | 11 ++ .../argoproj.io_v1alpha1_analysisrun.yaml | 11 ++ ...argoproj.io_v1alpha1_analysistemplate.yaml | 11 ++ ...j.io_v1alpha1_clusteranalysistemplate.yaml | 11 ++ .../argoproj.io_v1alpha1_experiment.yaml | 11 ++ .../samples/argoproj.io_v1alpha1_rollout.yaml | 11 ++ .../argoproj.io_v1alpha1_rolloutmanager.yaml | 11 ++ config/samples/kustomization.yaml | 7 ++ 9 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 config/samples/argoproj.io_v1alpha1_aargocd.yaml create mode 100644 config/samples/argoproj.io_v1alpha1_analysisrun.yaml create mode 100644 config/samples/argoproj.io_v1alpha1_analysistemplate.yaml create mode 100644 config/samples/argoproj.io_v1alpha1_clusteranalysistemplate.yaml create mode 100644 config/samples/argoproj.io_v1alpha1_experiment.yaml create mode 100644 config/samples/argoproj.io_v1alpha1_rollout.yaml create mode 100644 config/samples/argoproj.io_v1alpha1_rolloutmanager.yaml diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index bb4a7cfb8..c83dc3e8d 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -4,6 +4,36 @@ metadata: annotations: alm-examples: |- [ + { + "apiVersion": "argoproj.io/v1alpha1", + "kind": "AnalysisRun", + "metadata": { + "labels": { + "app.kubernetes.io/created-by": "argo-analysisrun-manager", + "app.kubernetes.io/instance": "analysisrun-sample", + "app.kubernetes.io/managed-by": "kustomize", + "app.kubernetes.io/name": "analysisrun", + "app.kubernetes.io/part-of": "argo-analysisrun-manager" + }, + "name": "analysisrun-sample" + }, + "spec": {} + }, + { + "apiVersion": "argoproj.io/v1alpha1", + "kind": "AnalysisTemplate", + "metadata": { + "labels": { + "app.kubernetes.io/created-by": "argo-analysistemplate-manager", + "app.kubernetes.io/instance": "analysistemplate-sample", + "app.kubernetes.io/managed-by": "kustomize", + "app.kubernetes.io/name": "analysistemplate", + "app.kubernetes.io/part-of": "argo-analysistemplate-manager" + }, + "name": "analysistemplate-sample" + }, + "spec": {} + }, { "apiVersion": "argoproj.io/v1alpha1", "kind": "AppProject", @@ -28,6 +58,51 @@ metadata: }, "spec": null }, + { + "apiVersion": "argoproj.io/v1alpha1", + "kind": "ArgoCD", + "metadata": { + "labels": { + "app.kubernetes.io/created-by": "argo-argocd-manager", + "app.kubernetes.io/instance": "argocd-sample", + "app.kubernetes.io/managed-by": "kustomize", + "app.kubernetes.io/name": "argocd", + "app.kubernetes.io/part-of": "argo-argocd-manager" + }, + "name": "argocd-sample" + }, + "spec": {} + }, + { + "apiVersion": "argoproj.io/v1alpha1", + "kind": "ClusterAnalysisTemplate", + "metadata": { + "labels": { + "app.kubernetes.io/created-by": "argo-clusteranalysistemplate-manager", + "app.kubernetes.io/instance": "clusteranalysistemplate-sample", + "app.kubernetes.io/managed-by": "kustomize", + "app.kubernetes.io/name": "clusteranalysistemplate", + "app.kubernetes.io/part-of": "argo-clusteranalysistemplate-manager" + }, + "name": "clusteranalysistemplate-sample" + }, + "spec": {} + }, + { + "apiVersion": "argoproj.io/v1alpha1", + "kind": "Experiment", + "metadata": { + "labels": { + "app.kubernetes.io/created-by": "argo-experiment-manager", + "app.kubernetes.io/instance": "experiment-sample", + "app.kubernetes.io/managed-by": "kustomize", + "app.kubernetes.io/name": "experiment", + "app.kubernetes.io/part-of": "argo-experiment-manager" + }, + "name": "experiment-sample" + }, + "spec": {} + }, { "apiVersion": "argoproj.io/v1alpha1", "kind": "NotificationsConfiguration", @@ -57,6 +132,36 @@ metadata: } } }, + { + "apiVersion": "argoproj.io/v1alpha1", + "kind": "Rollout", + "metadata": { + "labels": { + "app.kubernetes.io/created-by": "argo-rollouts-manager", + "app.kubernetes.io/instance": "rollout-sample", + "app.kubernetes.io/managed-by": "kustomize", + "app.kubernetes.io/name": "rollout", + "app.kubernetes.io/part-of": "argo-rollouts-manager" + }, + "name": "rollout-sample" + }, + "spec": {} + }, + { + "apiVersion": "argoproj.io/v1alpha1", + "kind": "RolloutManager", + "metadata": { + "labels": { + "app.kubernetes.io/created-by": "argo-rolloutmanager-manager", + "app.kubernetes.io/instance": "rolloutmanager-sample", + "app.kubernetes.io/managed-by": "kustomize", + "app.kubernetes.io/name": "rolloutmanager", + "app.kubernetes.io/part-of": "argo-rolloutmanager-manager" + }, + "name": "rolloutmanager-sample" + }, + "spec": {} + }, { "apiVersion": "argoproj.io/v1beta1", "kind": "ArgoCD", @@ -164,7 +269,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2025-02-10T10:43:31Z" + createdAt: "2025-02-10T11:06:41Z" description: Enables teams to adopt GitOps principles for managing cluster configurations and application delivery across hybrid multi-cluster Kubernetes environments. features.operators.openshift.io/disconnected: "true" diff --git a/config/samples/argoproj.io_v1alpha1_aargocd.yaml b/config/samples/argoproj.io_v1alpha1_aargocd.yaml new file mode 100644 index 000000000..dfa010ee3 --- /dev/null +++ b/config/samples/argoproj.io_v1alpha1_aargocd.yaml @@ -0,0 +1,11 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ArgoCD +metadata: + labels: + app.kubernetes.io/name: argocd + app.kubernetes.io/instance: argocd-sample + app.kubernetes.io/part-of: argo-argocd-manager + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: argo-argocd-manager + name: argocd-sample +spec: {} \ No newline at end of file diff --git a/config/samples/argoproj.io_v1alpha1_analysisrun.yaml b/config/samples/argoproj.io_v1alpha1_analysisrun.yaml new file mode 100644 index 000000000..c5222cb30 --- /dev/null +++ b/config/samples/argoproj.io_v1alpha1_analysisrun.yaml @@ -0,0 +1,11 @@ +apiVersion: argoproj.io/v1alpha1 +kind: AnalysisRun +metadata: + labels: + app.kubernetes.io/name: analysisrun + app.kubernetes.io/instance: analysisrun-sample + app.kubernetes.io/part-of: argo-analysisrun-manager + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: argo-analysisrun-manager + name: analysisrun-sample +spec: {} \ No newline at end of file diff --git a/config/samples/argoproj.io_v1alpha1_analysistemplate.yaml b/config/samples/argoproj.io_v1alpha1_analysistemplate.yaml new file mode 100644 index 000000000..573626f17 --- /dev/null +++ b/config/samples/argoproj.io_v1alpha1_analysistemplate.yaml @@ -0,0 +1,11 @@ +apiVersion: argoproj.io/v1alpha1 +kind: AnalysisTemplate +metadata: + labels: + app.kubernetes.io/name: analysistemplate + app.kubernetes.io/instance: analysistemplate-sample + app.kubernetes.io/part-of: argo-analysistemplate-manager + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: argo-analysistemplate-manager + name: analysistemplate-sample +spec: {} \ No newline at end of file diff --git a/config/samples/argoproj.io_v1alpha1_clusteranalysistemplate.yaml b/config/samples/argoproj.io_v1alpha1_clusteranalysistemplate.yaml new file mode 100644 index 000000000..fe7fe5fee --- /dev/null +++ b/config/samples/argoproj.io_v1alpha1_clusteranalysistemplate.yaml @@ -0,0 +1,11 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ClusterAnalysisTemplate +metadata: + labels: + app.kubernetes.io/name: clusteranalysistemplate + app.kubernetes.io/instance: clusteranalysistemplate-sample + app.kubernetes.io/part-of: argo-clusteranalysistemplate-manager + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: argo-clusteranalysistemplate-manager + name: clusteranalysistemplate-sample +spec: {} \ No newline at end of file diff --git a/config/samples/argoproj.io_v1alpha1_experiment.yaml b/config/samples/argoproj.io_v1alpha1_experiment.yaml new file mode 100644 index 000000000..08d97d452 --- /dev/null +++ b/config/samples/argoproj.io_v1alpha1_experiment.yaml @@ -0,0 +1,11 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Experiment +metadata: + labels: + app.kubernetes.io/name: experiment + app.kubernetes.io/instance: experiment-sample + app.kubernetes.io/part-of: argo-experiment-manager + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: argo-experiment-manager + name: experiment-sample +spec: {} \ No newline at end of file diff --git a/config/samples/argoproj.io_v1alpha1_rollout.yaml b/config/samples/argoproj.io_v1alpha1_rollout.yaml new file mode 100644 index 000000000..ecb35aa57 --- /dev/null +++ b/config/samples/argoproj.io_v1alpha1_rollout.yaml @@ -0,0 +1,11 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Rollout +metadata: + labels: + app.kubernetes.io/name: rollout + app.kubernetes.io/instance: rollout-sample + app.kubernetes.io/part-of: argo-rollouts-manager + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: argo-rollouts-manager + name: rollout-sample +spec: {} \ No newline at end of file diff --git a/config/samples/argoproj.io_v1alpha1_rolloutmanager.yaml b/config/samples/argoproj.io_v1alpha1_rolloutmanager.yaml new file mode 100644 index 000000000..e45078553 --- /dev/null +++ b/config/samples/argoproj.io_v1alpha1_rolloutmanager.yaml @@ -0,0 +1,11 @@ +apiVersion: argoproj.io/v1alpha1 +kind: RolloutManager +metadata: + labels: + app.kubernetes.io/name: rolloutmanager + app.kubernetes.io/instance: rolloutmanager-sample + app.kubernetes.io/part-of: argo-rolloutmanager-manager + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/created-by: argo-rolloutmanager-manager + name: rolloutmanager-sample +spec: {} \ No newline at end of file diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index d95bfef97..4d1c10796 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -6,4 +6,11 @@ resources: - argoproj.io_v1alpha1_applicationset.yaml - argoproj.io_v1alpha1_appproject.yaml - argoproj.io_v1alpha1_notificationsconfiguration.yaml +- argoproj.io_v1alpha1_rolloutmanager.yaml +- argoproj.io_v1alpha1_rollout.yaml +- argoproj.io_v1alpha1_aargocd.yaml +- argoproj.io_v1alpha1_clusteranalysistemplate.yaml +- argoproj.io_v1alpha1_analysistemplate.yaml +- argoproj.io_v1alpha1_analysisrun.yaml +- argoproj.io_v1alpha1_experiment.yaml #+kubebuilder:scaffold:manifestskustomizesamples From 33df0f6fb6ca82f19c2e196c67b6eebbdb154bc1 Mon Sep 17 00:00:00 2001 From: Sarfaraz Ahamad Date: Mon, 10 Feb 2025 17:02:43 +0530 Subject: [PATCH 3/3] removing the minkube code Signed-off-by: Sarfaraz Ahamad --- .../manifests/gitops-operator.clusterserviceversion.yaml | 3 +-- config/manifests/kustomization.yaml | 8 +------- config/manifests/patches/min-kube-version.yaml | 3 --- 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 config/manifests/patches/min-kube-version.yaml diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index c83dc3e8d..138992b24 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -269,7 +269,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2025-02-10T11:06:41Z" + createdAt: "2025-02-10T11:31:58Z" description: Enables teams to adopt GitOps principles for managing cluster configurations and application delivery across hybrid multi-cluster Kubernetes environments. features.operators.openshift.io/disconnected: "true" @@ -1220,7 +1220,6 @@ spec: - email: shbose@redhat.com name: shoubhik maturity: alpha - minKubeVersion: 1.25.0 provider: name: Red Hat Inc replaces: gitops-operator.v1.7.3 diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index e18a9e665..b8044ef92 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -60,10 +60,4 @@ patchesJson6902: version: v1alpha1 kind: ClusterServiceVersion name: gitops-operator.v1.8.0 - path: patches/description.yaml -- target: - group: operators.coreos.com - version: v1alpha1 - kind: ClusterServiceVersion - name: gitops-operator.v1.8.0 - path: patches/min-kube-version.yaml \ No newline at end of file + path: patches/description.yaml \ No newline at end of file diff --git a/config/manifests/patches/min-kube-version.yaml b/config/manifests/patches/min-kube-version.yaml deleted file mode 100644 index 65f3c9d09..000000000 --- a/config/manifests/patches/min-kube-version.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: add - path: "/spec/minKubeVersion" - value: "1.25.0" \ No newline at end of file