From 40b9fa03045a1e23286e9a88126663d5826da11b Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Wed, 12 Jun 2024 10:04:33 -0500 Subject: [PATCH] cleanup --- bootstrap/base/kustomization.yaml | 2 +- bootstrap/overlays/testing/kustomization.yaml | 6 - clusters/overlays/testing/kustomization.yaml | 31 ----- .../patch-application-manual-sync.yaml | 2 - .../patch-application-repo-revision.yaml | 6 - .../patch-applicationset-manual-sync.yaml | 2 - .../patch-applicationset-repo-revision.yaml | 6 - .../patch-operators-applicationset.yaml | 5 - .../operators/gpu-operator-certified/INFO.md | 5 - .../gpu-operator-certified/README.md | 36 ------ .../overlays/default/kustomization.yaml | 11 -- .../gpu-operator-certified/instance/README.md | 0 .../instance/base/cluster-policy.yaml | 4 - .../instance/base/kustomization.yaml | 7 - .../overlays/default/kustomization.yaml | 5 - .../operator/base/kustomization.yaml | 7 - .../operator/base/operator-group.yaml | 8 -- .../operator/base/subscription.yaml | 11 -- .../overlays/v23.3/kustomization.yaml | 11 -- .../overlays/v23.3/patch-channel.yaml | 3 - .../openshift-data-foundation/README.md | 33 ----- .../aws-node-labeler/kustomization.yaml | 10 -- .../aggregate/overlays/aws/kustomization.yaml | 9 -- .../vsphere-node-labeler/kustomization.yaml | 7 - .../overlays/vsphere/kustomization.yaml | 6 - .../config-helpers/README.md | 38 ------ .../node-labeler/base/kustomization.yaml | 9 -- .../node-labeler/base/node-label-job.yaml | 31 ----- .../node-labeler/base/rbac.yaml | 33 ----- .../node-labeler/base/service-account.yaml | 6 - .../overlays/default/kustomization.yaml | 7 - .../instance/README.md | 63 --------- .../instance/base/kustomization.yaml | 7 - .../instance/base/storagesystem.yaml | 8 -- .../instance/overlays/aws/kustomization.yaml | 9 -- .../overlays/aws/ocsinitialization.yaml | 7 - .../instance/overlays/aws/storagecluster.yaml | 41 ------ .../overlays/vsphere/kustomization.yaml | 9 -- .../overlays/vsphere/ocsinitialization.yaml | 7 - .../overlays/vsphere/storagecluster.yaml | 42 ------ .../base/enable-console-plugin-job.yaml | 43 ------ .../base/enable-console-plugin-rbac.yaml | 26 ---- .../base/enable-console-plugin-sa.yaml | 4 - .../operator/base/kustomization.yaml | 13 -- ...nshift-data-foundation-console-plugin.yaml | 11 -- ...ata-foundation-operator-operatorgroup.yaml | 7 - ...data-foundation-operator-subscription.yaml | 11 -- .../base/openshift-storage-namespace.yaml | 6 - .../operator/overlays/stable-4.10/README.md | 1 - .../overlays/stable-4.10/kustomization.yaml | 16 --- .../overlays/stable-4.10/patch-channel.yaml | 3 - .../operator/overlays/stable-4.9/README.md | 1 - .../overlays/stable-4.9/kustomization.yaml | 16 --- .../overlays/stable-4.9/patch-channel.yaml | 3 - .../openshift-gitops-operator/INFO.md | 10 +- .../openshift-gitops-operator/README.md | 4 + .../overlays/default/kustomization.yaml | 4 +- .../base/argocd-ssh-known-hosts-cm.yaml | 18 +++ .../instance/base/cluster-role-binding.yaml | 3 + .../instance/base/console-plugin-job.sh | 30 +++++ .../instance/base/console-plugin-job.yaml | 64 +++++++++ .../default => base}/gitops-admin-group.yaml | 4 +- .../instance/base/kustomization.yaml | 13 +- .../instance/base/namespace.yaml | 1 + .../overlays/default/kustomization.yaml | 21 ++- .../patch-resource-customizations.yaml | 2 +- .../operator/README.md | 29 ----- .../operator/base/kustomization.yaml | 2 + .../operator/base/namespace.yaml | 4 +- ...penshift-gitops-operator-subscription.yaml | 11 -- .../operator/base/operator-group.yaml | 5 + .../operator/base/subscription.yaml | 2 +- .../overlays/gitops-1.10}/kustomization.yaml | 2 +- .../overlays/gitops-1.10}/patch-channel.yaml | 2 +- .../overlays/gitops-1.11}/kustomization.yaml | 2 +- .../overlays/gitops-1.11}/patch-channel.yaml | 2 +- .../operator/overlays/gitops-1.5/README.md | 1 - .../operator/overlays/gitops-1.6/README.md | 1 - .../operator/overlays/gitops-1.7/README.md | 1 - .../overlays/gitops-1.8}/kustomization.yaml | 2 +- .../overlays/gitops-1.8}/patch-channel.yaml | 2 +- .../overlays/gitops-1.9}/kustomization.yaml | 2 +- .../overlays/gitops-1.9}/patch-channel.yaml | 2 +- .../operator/overlays/preview/README.md | 1 - .../operator/overlays/stable/README.md | 1 - components/operators/openshift-keda/README.md | 0 .../operator/base/kustomization.yaml | 7 - .../operator/base/namespace.yaml | 8 -- .../operator/base/operator-group.yaml | 5 - .../operator/base/subscription.yaml | 11 -- .../operator/overlays/stable/README.md | 1 - .../overlays/stable/kustomization.yaml | 16 --- .../overlays/stable/patch-channel.yaml | 3 - .../aggregate/base/kustomization.yaml | 9 -- .../overlays/default/kustomization.yaml | 7 - components/operators/openshift-nfd/README.md | 32 ----- .../openshift-nfd/instance/README.md | 42 ------ .../instance/base/kustomization.yaml | 7 - .../instance/base/node-feature-discovery.yaml | 122 ------------------ .../overlays/default/kustomization.yaml | 5 - .../operator/base/kustomization.yaml | 7 - .../operator/base/namespace.yaml | 8 -- .../operator/base/operator-group.yaml | 8 -- .../operator/base/subscription.yaml | 11 -- .../operator/overlays/4.9/kustomization.yaml | 11 -- .../operator/overlays/4.9/patch-channel.yaml | 3 - .../overlays/stable/kustomization.yaml | 11 -- .../overlays/stable/patch-channel.yaml | 3 - components/operators/quay-operator/INFO.md | 41 ------ components/operators/quay-operator/README.md | 36 ------ .../operator/base/kustomization.yaml | 7 - .../operator/base/namespace.yaml | 8 -- .../operator/base/operator-group.yaml | 8 -- .../operator/base/subscription.yaml | 11 -- .../overlays/quay-v3.4/kustomization.yaml | 11 -- .../overlays/quay-v3.4/patch-channel.yaml | 3 - .../overlays/quay-v3.5/kustomization.yaml | 11 -- .../overlays/quay-v3.5/patch-channel.yaml | 3 - .../overlays/stable-3.6/kustomization.yaml | 11 -- .../overlays/stable-3.6/patch-channel.yaml | 3 - .../overlays/stable-3.7/kustomization.yaml | 11 -- .../overlays/stable-3.7/patch-channel.yaml | 3 - .../overlays/stable-3.8/kustomization.yaml | 11 -- .../overlays/stable-3.8/patch-channel.yaml | 3 - scripts/bootstrap.sh | 4 +- 125 files changed, 173 insertions(+), 1308 deletions(-) delete mode 100644 bootstrap/overlays/testing/kustomization.yaml delete mode 100644 clusters/overlays/testing/kustomization.yaml delete mode 100644 clusters/overlays/testing/patch-application-manual-sync.yaml delete mode 100644 clusters/overlays/testing/patch-application-repo-revision.yaml delete mode 100644 clusters/overlays/testing/patch-applicationset-manual-sync.yaml delete mode 100644 clusters/overlays/testing/patch-applicationset-repo-revision.yaml delete mode 100644 components/operators/gpu-operator-certified/INFO.md delete mode 100644 components/operators/gpu-operator-certified/README.md delete mode 100644 components/operators/gpu-operator-certified/aggregate/overlays/default/kustomization.yaml delete mode 100644 components/operators/gpu-operator-certified/instance/README.md delete mode 100644 components/operators/gpu-operator-certified/instance/base/cluster-policy.yaml delete mode 100644 components/operators/gpu-operator-certified/instance/base/kustomization.yaml delete mode 100644 components/operators/gpu-operator-certified/instance/overlays/default/kustomization.yaml delete mode 100644 components/operators/gpu-operator-certified/operator/base/kustomization.yaml delete mode 100644 components/operators/gpu-operator-certified/operator/base/operator-group.yaml delete mode 100644 components/operators/gpu-operator-certified/operator/base/subscription.yaml delete mode 100644 components/operators/gpu-operator-certified/operator/overlays/v23.3/kustomization.yaml delete mode 100644 components/operators/gpu-operator-certified/operator/overlays/v23.3/patch-channel.yaml delete mode 100644 components/operators/openshift-data-foundation/README.md delete mode 100644 components/operators/openshift-data-foundation/aggregate/overlays/aws-node-labeler/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/aggregate/overlays/aws/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/aggregate/overlays/vsphere-node-labeler/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/aggregate/overlays/vsphere/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/config-helpers/README.md delete mode 100644 components/operators/openshift-data-foundation/config-helpers/node-labeler/base/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/config-helpers/node-labeler/base/node-label-job.yaml delete mode 100644 components/operators/openshift-data-foundation/config-helpers/node-labeler/base/rbac.yaml delete mode 100644 components/operators/openshift-data-foundation/config-helpers/node-labeler/base/service-account.yaml delete mode 100644 components/operators/openshift-data-foundation/config-helpers/node-labeler/overlays/default/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/instance/README.md delete mode 100644 components/operators/openshift-data-foundation/instance/base/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/instance/base/storagesystem.yaml delete mode 100644 components/operators/openshift-data-foundation/instance/overlays/aws/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/instance/overlays/aws/ocsinitialization.yaml delete mode 100644 components/operators/openshift-data-foundation/instance/overlays/aws/storagecluster.yaml delete mode 100644 components/operators/openshift-data-foundation/instance/overlays/vsphere/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/instance/overlays/vsphere/ocsinitialization.yaml delete mode 100644 components/operators/openshift-data-foundation/instance/overlays/vsphere/storagecluster.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/base/enable-console-plugin-job.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/base/enable-console-plugin-rbac.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/base/enable-console-plugin-sa.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/base/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-console-plugin.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-operator-operatorgroup.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-operator-subscription.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/base/openshift-storage-namespace.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/overlays/stable-4.10/README.md delete mode 100644 components/operators/openshift-data-foundation/operator/overlays/stable-4.10/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/overlays/stable-4.10/patch-channel.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/overlays/stable-4.9/README.md delete mode 100644 components/operators/openshift-data-foundation/operator/overlays/stable-4.9/kustomization.yaml delete mode 100644 components/operators/openshift-data-foundation/operator/overlays/stable-4.9/patch-channel.yaml rename components/operators/{openshift-nfd => openshift-gitops-operator}/aggregate/overlays/default/kustomization.yaml (76%) create mode 100644 components/operators/openshift-gitops-operator/instance/base/argocd-ssh-known-hosts-cm.yaml create mode 100755 components/operators/openshift-gitops-operator/instance/base/console-plugin-job.sh create mode 100644 components/operators/openshift-gitops-operator/instance/base/console-plugin-job.yaml rename components/operators/openshift-gitops-operator/instance/{overlays/default => base}/gitops-admin-group.yaml (70%) delete mode 100644 components/operators/openshift-gitops-operator/operator/README.md rename components/operators/{gpu-operator-certified => openshift-gitops-operator}/operator/base/namespace.yaml (55%) delete mode 100644 components/operators/openshift-gitops-operator/operator/base/openshift-gitops-operator-subscription.yaml create mode 100644 components/operators/openshift-gitops-operator/operator/base/operator-group.yaml rename components/operators/{gpu-operator-certified/operator/overlays/v22.9 => openshift-gitops-operator/operator/overlays/gitops-1.10}/kustomization.yaml (81%) rename components/operators/{gpu-operator-certified/operator/overlays/v1.11 => openshift-gitops-operator/operator/overlays/gitops-1.10}/patch-channel.yaml (63%) rename components/operators/{gpu-operator-certified/operator/overlays/v1.10 => openshift-gitops-operator/operator/overlays/gitops-1.11}/kustomization.yaml (81%) rename components/operators/{gpu-operator-certified/operator/overlays/v22.9 => openshift-gitops-operator/operator/overlays/gitops-1.11}/patch-channel.yaml (63%) delete mode 100644 components/operators/openshift-gitops-operator/operator/overlays/gitops-1.5/README.md delete mode 100644 components/operators/openshift-gitops-operator/operator/overlays/gitops-1.6/README.md delete mode 100644 components/operators/openshift-gitops-operator/operator/overlays/gitops-1.7/README.md rename components/operators/{gpu-operator-certified/operator/overlays/stable => openshift-gitops-operator/operator/overlays/gitops-1.8}/kustomization.yaml (81%) rename components/operators/{gpu-operator-certified/operator/overlays/stable => openshift-gitops-operator/operator/overlays/gitops-1.8}/patch-channel.yaml (64%) rename components/operators/{gpu-operator-certified/operator/overlays/v1.11 => openshift-gitops-operator/operator/overlays/gitops-1.9}/kustomization.yaml (81%) rename components/operators/{gpu-operator-certified/operator/overlays/v1.10 => openshift-gitops-operator/operator/overlays/gitops-1.9}/patch-channel.yaml (64%) delete mode 100644 components/operators/openshift-gitops-operator/operator/overlays/preview/README.md delete mode 100644 components/operators/openshift-gitops-operator/operator/overlays/stable/README.md delete mode 100644 components/operators/openshift-keda/README.md delete mode 100644 components/operators/openshift-keda/operator/base/kustomization.yaml delete mode 100644 components/operators/openshift-keda/operator/base/namespace.yaml delete mode 100644 components/operators/openshift-keda/operator/base/operator-group.yaml delete mode 100644 components/operators/openshift-keda/operator/base/subscription.yaml delete mode 100644 components/operators/openshift-keda/operator/overlays/stable/README.md delete mode 100644 components/operators/openshift-keda/operator/overlays/stable/kustomization.yaml delete mode 100644 components/operators/openshift-keda/operator/overlays/stable/patch-channel.yaml delete mode 100644 components/operators/openshift-logging/aggregate/base/kustomization.yaml delete mode 100644 components/operators/openshift-logging/aggregate/overlays/default/kustomization.yaml delete mode 100644 components/operators/openshift-nfd/README.md delete mode 100644 components/operators/openshift-nfd/instance/README.md delete mode 100644 components/operators/openshift-nfd/instance/base/kustomization.yaml delete mode 100644 components/operators/openshift-nfd/instance/base/node-feature-discovery.yaml delete mode 100644 components/operators/openshift-nfd/instance/overlays/default/kustomization.yaml delete mode 100644 components/operators/openshift-nfd/operator/base/kustomization.yaml delete mode 100644 components/operators/openshift-nfd/operator/base/namespace.yaml delete mode 100644 components/operators/openshift-nfd/operator/base/operator-group.yaml delete mode 100644 components/operators/openshift-nfd/operator/base/subscription.yaml delete mode 100644 components/operators/openshift-nfd/operator/overlays/4.9/kustomization.yaml delete mode 100644 components/operators/openshift-nfd/operator/overlays/4.9/patch-channel.yaml delete mode 100644 components/operators/openshift-nfd/operator/overlays/stable/kustomization.yaml delete mode 100644 components/operators/openshift-nfd/operator/overlays/stable/patch-channel.yaml delete mode 100644 components/operators/quay-operator/INFO.md delete mode 100644 components/operators/quay-operator/README.md delete mode 100644 components/operators/quay-operator/operator/base/kustomization.yaml delete mode 100644 components/operators/quay-operator/operator/base/namespace.yaml delete mode 100644 components/operators/quay-operator/operator/base/operator-group.yaml delete mode 100644 components/operators/quay-operator/operator/base/subscription.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/quay-v3.4/kustomization.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/quay-v3.4/patch-channel.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/quay-v3.5/kustomization.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/quay-v3.5/patch-channel.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/stable-3.6/kustomization.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/stable-3.6/patch-channel.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/stable-3.7/kustomization.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/stable-3.7/patch-channel.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/stable-3.8/kustomization.yaml delete mode 100644 components/operators/quay-operator/operator/overlays/stable-3.8/patch-channel.yaml diff --git a/bootstrap/base/kustomization.yaml b/bootstrap/base/kustomization.yaml index 2ce36fb..83bdefb 100644 --- a/bootstrap/base/kustomization.yaml +++ b/bootstrap/base/kustomization.yaml @@ -5,5 +5,5 @@ resources: # - ../../components/operators/sealed-secrets/operator/overlays/default - ../../components/operators/openshift-gitops-operator/instance/overlays/default - ../../components/configs/namespaces/base - - argocd-ssh-known-hosts-cm.yaml + # - argocd-ssh-known-hosts-cm.yaml # - sealed-secrets-secret.yaml diff --git a/bootstrap/overlays/testing/kustomization.yaml b/bootstrap/overlays/testing/kustomization.yaml deleted file mode 100644 index 090b942..0000000 --- a/bootstrap/overlays/testing/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - ../../../clusters/overlays/testing diff --git a/clusters/overlays/testing/kustomization.yaml b/clusters/overlays/testing/kustomization.yaml deleted file mode 100644 index f1d3b39..0000000 --- a/clusters/overlays/testing/kustomization.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - ../../../components/argocd/apps/overlays/default - - ../../../tenants/edge-workshop/argocd/apps/overlays/default - - ../../../tenants/edge-workshop/argocd/projects/overlays/default - -patches: - - path: patch-applicationset-repo-revision.yaml - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - - path: patch-application-repo-revision.yaml - target: - group: argoproj.io - version: v1alpha1 - kind: Application - # Uncomment patches to disable automatic sync - # - path: patch-applicationset-manual-sync.yaml - # target: - # group: argoproj.io - # version: v1alpha1 - # kind: ApplicationSet - # - path: patch-application-manual-sync.yaml - # target: - # group: argoproj.io - # version: v1alpha1 - # kind: Application diff --git a/clusters/overlays/testing/patch-application-manual-sync.yaml b/clusters/overlays/testing/patch-application-manual-sync.yaml deleted file mode 100644 index d289dd4..0000000 --- a/clusters/overlays/testing/patch-application-manual-sync.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- op: remove - path: /spec/syncPolicy diff --git a/clusters/overlays/testing/patch-application-repo-revision.yaml b/clusters/overlays/testing/patch-application-repo-revision.yaml deleted file mode 100644 index d070af6..0000000 --- a/clusters/overlays/testing/patch-application-repo-revision.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- op: replace - path: /spec/source/repoURL - value: 'https://github.com/Enterprise-Neurosystem/cluster-bootstrap.git' -- op: replace - path: /spec/source/targetRevision - value: testing diff --git a/clusters/overlays/testing/patch-applicationset-manual-sync.yaml b/clusters/overlays/testing/patch-applicationset-manual-sync.yaml deleted file mode 100644 index a60ffc0..0000000 --- a/clusters/overlays/testing/patch-applicationset-manual-sync.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- op: remove - path: /spec/template/spec/syncPolicy diff --git a/clusters/overlays/testing/patch-applicationset-repo-revision.yaml b/clusters/overlays/testing/patch-applicationset-repo-revision.yaml deleted file mode 100644 index 4fa87ad..0000000 --- a/clusters/overlays/testing/patch-applicationset-repo-revision.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- op: replace - path: /spec/template/spec/source/repoURL - value: 'https://github.com/Enterprise-Neurosystem/cluster-bootstrap.git' -- op: replace - path: /spec/template/spec/source/targetRevision - value: testing diff --git a/components/argocd/apps/overlays/workshop-rhdp/patch-operators-applicationset.yaml b/components/argocd/apps/overlays/workshop-rhdp/patch-operators-applicationset.yaml index d2782ae..72f6d76 100644 --- a/components/argocd/apps/overlays/workshop-rhdp/patch-operators-applicationset.yaml +++ b/components/argocd/apps/overlays/workshop-rhdp/patch-operators-applicationset.yaml @@ -21,11 +21,6 @@ values: name: operator-rhods path: components/operators/rhods-operator/operator/overlays/stable - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-sealed-secrets - path: components/operators/sealed-secrets/operator/overlays/default - cluster: local url: https://kubernetes.default.svc values: diff --git a/components/operators/gpu-operator-certified/INFO.md b/components/operators/gpu-operator-certified/INFO.md deleted file mode 100644 index d946c6c..0000000 --- a/components/operators/gpu-operator-certified/INFO.md +++ /dev/null @@ -1,5 +0,0 @@ -# gpu-operator-certified - -Kubernetes provides access to special hardware resources such as NVIDIA GPUs, NICs, Infiniband adapters and other devices through the [device plugin framework](https://kubernetes.io/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/). However, configuring and managing nodes with these hardware resources requires configuration of multiple software components such as drivers, container runtimes or other libraries which are difficult and prone to errors. -The NVIDIA GPU Operator uses the [operator framework](https://cloud.redhat.com/blog/introducing-the-operator-framework) within Kubernetes to automate the management of all NVIDIA software components needed to provision and monitor GPUs. These components include the NVIDIA drivers (to enable CUDA), Kubernetes device plugin for GPUs, the NVIDIA Container Runtime, automatic node labelling and NVIDIA DCGM exporter. -Visit the official site of the [GPU Operator](https://github.com/NVIDIA/gpu-operator) for more information. For getting started with using the GPU Operator with OpenShift, see the instructions [here](https://docs.nvidia.com/datacenter/cloud-native/gpu-operator/openshift/contents.html). diff --git a/components/operators/gpu-operator-certified/README.md b/components/operators/gpu-operator-certified/README.md deleted file mode 100644 index 601eac0..0000000 --- a/components/operators/gpu-operator-certified/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# NVIDIA GPU Operator - -Install NVIDIA GPU Operator. - -Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. - -The current *overlays* available are for the following channels: - -* [stable](operator/overlays/stable) -* [v1.10](operator/overlays/v1.10) -* [v1.11](operator/overlays/v1.11) -* [v22.9](operator/overlays/v22.9) -* [v23.3](operator/overlays/v23.3) - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install NVIDIA GPU Operator based on the overlay of your choice by running from the root (`gitops-catalog`) directory. - -``` -oc apply -k gpu-operator-certified/operator/overlays/ -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/gpu-operator-certified/operator/overlays/ -``` - -As part of a different overlay in your own GitOps repo: - -``` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - https://github.com/redhat-cop/gitops-catalog/gpu-operator-certified/operator/overlays/?ref=main -``` diff --git a/components/operators/gpu-operator-certified/aggregate/overlays/default/kustomization.yaml b/components/operators/gpu-operator-certified/aggregate/overlays/default/kustomization.yaml deleted file mode 100644 index 65fd18e..0000000 --- a/components/operators/gpu-operator-certified/aggregate/overlays/default/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -commonAnnotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - -namespace: nvidia-gpu-operator - -resources: - - ../../../operator/overlays/stable - - ../../../instance/overlays/default diff --git a/components/operators/gpu-operator-certified/instance/README.md b/components/operators/gpu-operator-certified/instance/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/components/operators/gpu-operator-certified/instance/base/cluster-policy.yaml b/components/operators/gpu-operator-certified/instance/base/cluster-policy.yaml deleted file mode 100644 index 33712f0..0000000 --- a/components/operators/gpu-operator-certified/instance/base/cluster-policy.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: nvidia.com/v1 -kind: ClusterPolicy -metadata: - name: gpu-cluster-policy diff --git a/components/operators/gpu-operator-certified/instance/base/kustomization.yaml b/components/operators/gpu-operator-certified/instance/base/kustomization.yaml deleted file mode 100644 index 0dfb613..0000000 --- a/components/operators/gpu-operator-certified/instance/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: nvidia-gpu-operator - -resources: - - cluster-policy.yaml diff --git a/components/operators/gpu-operator-certified/instance/overlays/default/kustomization.yaml b/components/operators/gpu-operator-certified/instance/overlays/default/kustomization.yaml deleted file mode 100644 index 774a422..0000000 --- a/components/operators/gpu-operator-certified/instance/overlays/default/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base diff --git a/components/operators/gpu-operator-certified/operator/base/kustomization.yaml b/components/operators/gpu-operator-certified/operator/base/kustomization.yaml deleted file mode 100644 index 1e66bd5..0000000 --- a/components/operators/gpu-operator-certified/operator/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - namespace.yaml - - operator-group.yaml - - subscription.yaml diff --git a/components/operators/gpu-operator-certified/operator/base/operator-group.yaml b/components/operators/gpu-operator-certified/operator/base/operator-group.yaml deleted file mode 100644 index f0ba7fd..0000000 --- a/components/operators/gpu-operator-certified/operator/base/operator-group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: gpu-operator-certified-group - namespace: nvidia-gpu-operator -spec: - targetNamespaces: - - nvidia-gpu-operator diff --git a/components/operators/gpu-operator-certified/operator/base/subscription.yaml b/components/operators/gpu-operator-certified/operator/base/subscription.yaml deleted file mode 100644 index 322840e..0000000 --- a/components/operators/gpu-operator-certified/operator/base/subscription.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: gpu-operator-certified - namespace: nvidia-gpu-operator -spec: - channel: patch-me-see-overlays-dir - installPlanApproval: Automatic - name: gpu-operator-certified - source: certified-operators - sourceNamespace: openshift-marketplace diff --git a/components/operators/gpu-operator-certified/operator/overlays/v23.3/kustomization.yaml b/components/operators/gpu-operator-certified/operator/overlays/v23.3/kustomization.yaml deleted file mode 100644 index c771cd2..0000000 --- a/components/operators/gpu-operator-certified/operator/overlays/v23.3/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - kind: Subscription - name: gpu-operator-certified - path: patch-channel.yaml diff --git a/components/operators/gpu-operator-certified/operator/overlays/v23.3/patch-channel.yaml b/components/operators/gpu-operator-certified/operator/overlays/v23.3/patch-channel.yaml deleted file mode 100644 index 92b4a2a..0000000 --- a/components/operators/gpu-operator-certified/operator/overlays/v23.3/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: v23.3 diff --git a/components/operators/openshift-data-foundation/README.md b/components/operators/openshift-data-foundation/README.md deleted file mode 100644 index ccff8c7..0000000 --- a/components/operators/openshift-data-foundation/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# OpenShift Data Foundation Operator - -Installs the OpenShift Data Foundation operator. - -Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. - -The current *overlays* available are for the following channels: -* [stable-4.9](operator/overlays/stable-4.9) -* [stable-4.10](operator/overlays/stable-4.10) - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install the OpenShift Data Foundation operator based on the overlay of your choice by running from the root `gitops-catalog` directory - -``` -oc apply -k openshift-data-foundation-operator/operator/overlays/ -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-data-foundation-operator/operator/overlays/ -``` - -As part of a different overlay in your own GitOps repo: - -``` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - github.com/redhat-cop/gitops-catalog/openshift-data-foundation-operator/operator/overlays/?ref=main -``` diff --git a/components/operators/openshift-data-foundation/aggregate/overlays/aws-node-labeler/kustomization.yaml b/components/operators/openshift-data-foundation/aggregate/overlays/aws-node-labeler/kustomization.yaml deleted file mode 100644 index 53a612f..0000000 --- a/components/operators/openshift-data-foundation/aggregate/overlays/aws-node-labeler/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -commonAnnotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - -resources: - - ../../../operator/overlays/stable-4.9 - - ../../../instance/overlays/aws - - ../../../config-helpers/node-labeler/overlays/default diff --git a/components/operators/openshift-data-foundation/aggregate/overlays/aws/kustomization.yaml b/components/operators/openshift-data-foundation/aggregate/overlays/aws/kustomization.yaml deleted file mode 100644 index 556bfa7..0000000 --- a/components/operators/openshift-data-foundation/aggregate/overlays/aws/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -commonAnnotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - -resources: - - ../../../operator/overlays/stable-4.9 - - ../../../instance/overlays/aws diff --git a/components/operators/openshift-data-foundation/aggregate/overlays/vsphere-node-labeler/kustomization.yaml b/components/operators/openshift-data-foundation/aggregate/overlays/vsphere-node-labeler/kustomization.yaml deleted file mode 100644 index 1637324..0000000 --- a/components/operators/openshift-data-foundation/aggregate/overlays/vsphere-node-labeler/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../../operator/overlays/stable-4.9 - - ../../../instance/overlays/vsphere - - ../../../config-helpers/node-labeler/overlays/default diff --git a/components/operators/openshift-data-foundation/aggregate/overlays/vsphere/kustomization.yaml b/components/operators/openshift-data-foundation/aggregate/overlays/vsphere/kustomization.yaml deleted file mode 100644 index 164e93c..0000000 --- a/components/operators/openshift-data-foundation/aggregate/overlays/vsphere/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../../operator/overlays/stable-4.9 - - ../../../instance/overlays/vsphere diff --git a/components/operators/openshift-data-foundation/config-helpers/README.md b/components/operators/openshift-data-foundation/config-helpers/README.md deleted file mode 100644 index faa0477..0000000 --- a/components/operators/openshift-data-foundation/config-helpers/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# OpenShift Data Foundation - Config Helpers - -Configuration helpers useful for automating some configurations needed to setup the operator. - -## Node Labeler - -The [node-labeler](/node-labeler/) is a helpful addition to any ODF instance overlays and can be used in combination with them. - -node-labeler creates a job that is responsible for applying the `cluster.ocs.openshift.io/openshift-storage=""` label to nodes needed for the ODF/OCS to install. If your cluster does not have the minimum three worker nodes the job will fail. - -### Overlays - -The node-labeler config helper for this operator currently offers the following *overlays*: -* [default](overlays/default) - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install the Storage System by running from the root `gitops-catalog` directory - -``` -oc apply -k openshift-data-foundation-operator/config-helpers/node-labeler/overlays/default -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-data-foundation-operator/config-helpers/node-labeler/overlays/default -``` - -As part of a different overlay in your own GitOps repo: - -``` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - github.com/redhat-cop/gitops-catalog/openshift-data-foundation-operator/config-helpers/node-labeler/overlays/default?ref=main -``` diff --git a/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/kustomization.yaml b/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/kustomization.yaml deleted file mode 100644 index 1b20323..0000000 --- a/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - node-label-job.yaml - - rbac.yaml - - service-account.yaml diff --git a/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/node-label-job.yaml b/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/node-label-job.yaml deleted file mode 100644 index 6dc457b..0000000 --- a/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/node-label-job.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: storage-cluster-label-worker-nodes - generateName: storage-cluster-label-worker-nodes- -spec: - template: - spec: - containers: - - name: labeler - image: image-registry.openshift-image-registry.svc:5000/openshift/cli - env: - - name: selector - value: 'node-role.kubernetes.io/worker' - command: - - /bin/bash - - -c - - | - node_count=$(oc get nodes --selector=${selector} --output name | wc -l) - if [ ${node_count} -lt 3 ]; then - echo "Not enough selected nodes present in cluster" - oc get nodes --selector=${selector} - exit 1 - fi - echo "Labling the following nodes" - oc get nodes --selector=${selector} - oc label nodes --selector=${selector} cluster.ocs.openshift.io/openshift-storage="" --overwrite=true - restartPolicy: Never - serviceAccount: ocs-node-labeler - serviceAccountName: ocs-node-labeler - backoffLimit: 4 diff --git a/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/rbac.yaml b/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/rbac.yaml deleted file mode 100644 index ddb11c2..0000000 --- a/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/rbac.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: node-labeler - annotations: - argocd.argoproj.io/sync-wave: "-5" -rules: - - apiGroups: [""] - resources: - - nodes - - pods - verbs: - - get - - list - - patch - - label ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: node-labeler - namespace: openshift-storage - annotations: - argocd.argoproj.io/hook: PreSync - argocd.argoproj.io/sync-wave: "-5" -subjects: - - kind: ServiceAccount - name: ocs-node-labeler - namespace: openshift-storage -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: node-labeler diff --git a/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/service-account.yaml b/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/service-account.yaml deleted file mode 100644 index ee6dcfb..0000000 --- a/components/operators/openshift-data-foundation/config-helpers/node-labeler/base/service-account.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: ocs-node-labeler - annotations: - argocd.argoproj.io/sync-wave: "-10" diff --git a/components/operators/openshift-data-foundation/config-helpers/node-labeler/overlays/default/kustomization.yaml b/components/operators/openshift-data-foundation/config-helpers/node-labeler/overlays/default/kustomization.yaml deleted file mode 100644 index 016a046..0000000 --- a/components/operators/openshift-data-foundation/config-helpers/node-labeler/overlays/default/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - ../../base diff --git a/components/operators/openshift-data-foundation/instance/README.md b/components/operators/openshift-data-foundation/instance/README.md deleted file mode 100644 index 49b6ce8..0000000 --- a/components/operators/openshift-data-foundation/instance/README.md +++ /dev/null @@ -1,63 +0,0 @@ -# OpenShift Data Foundation - -Installs a basic Storage System using the OpenShift Data Foundation Operator. - -## Prerequisites - -OpenShift Data Foundation requires a minimum three worker nodes to install and configure a ceph cluster using OpenShift Data Foundation. - -First, install the [OpenShift Data Foundation Operator](../operator) in your cluster. - -Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. - -## Overlays - -The options for this operator are the following *overlays*: -* [aws](overlays/aws) -* [vsphere](overlays/vsphere) - -In order for ODF/OCS to configure storage using the overlays, they expect nodes with the following label to be present on the nodes ODF/OCS will install the cluster: - -``` -cluster.ocs.openshift.io/openshift-storage="" -``` - -You will need to manually add this label to nodes if they are not already present: - -``` -oc label nodes cluster.ocs.openshift.io/openshift-storage="" --overwrite=true -``` - -For additional automation for labeling nodes see [node-labeler](../config-helpers/node-labeler/) - -### AWS - -[aws](overlays/aws) installs a basic StorageSystem. The StorageSystem will configure the OpenShift Container Storage Operator and also install a StorageCluster and OCSInitilization object to configure the storage cluster. The StorageCluster is configured to work with gp2 storage on an AWS cluster. - -### vSphere - -[vsphere](overlays/vsphere) installs a basic StorageSystem. The StorageSystem will configure the OpenShift Container Storage Operator and also install a StorageCluster and OCSInitilization object to configure the storage cluster. The StorageCluster is configured to work with thin storage on a vSphere cluster and enables flexible scaling to distribute devices evenly across all nodes, regardless of distribution in zones or racks. - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install the Storage System by running from the root `gitops-catalog` directory - -``` -oc apply -k openshift-data-foundation-operator/instance/overlays/default -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-data-foundation-operator/instance/overlays/default -``` - -As part of a different overlay in your own GitOps repo: - -``` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - github.com/redhat-cop/gitops-catalog/openshift-data-foundation-operator/instance/overlays/default?ref=main -``` diff --git a/components/operators/openshift-data-foundation/instance/base/kustomization.yaml b/components/operators/openshift-data-foundation/instance/base/kustomization.yaml deleted file mode 100644 index af044d4..0000000 --- a/components/operators/openshift-data-foundation/instance/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - storagesystem.yaml diff --git a/components/operators/openshift-data-foundation/instance/base/storagesystem.yaml b/components/operators/openshift-data-foundation/instance/base/storagesystem.yaml deleted file mode 100644 index 930e05a..0000000 --- a/components/operators/openshift-data-foundation/instance/base/storagesystem.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: odf.openshift.io/v1alpha1 -kind: StorageSystem -metadata: - name: ocs-storagecluster-storagesystem -spec: - kind: storagecluster.ocs.openshift.io/v1 - name: ocs-storagecluster - namespace: openshift-storage diff --git a/components/operators/openshift-data-foundation/instance/overlays/aws/kustomization.yaml b/components/operators/openshift-data-foundation/instance/overlays/aws/kustomization.yaml deleted file mode 100644 index 2663e7c..0000000 --- a/components/operators/openshift-data-foundation/instance/overlays/aws/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - ../../base - - ocsinitialization.yaml - - storagecluster.yaml diff --git a/components/operators/openshift-data-foundation/instance/overlays/aws/ocsinitialization.yaml b/components/operators/openshift-data-foundation/instance/overlays/aws/ocsinitialization.yaml deleted file mode 100644 index 50507db..0000000 --- a/components/operators/openshift-data-foundation/instance/overlays/aws/ocsinitialization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: ocs.openshift.io/v1 -kind: OCSInitialization -metadata: - name: ocsinit - namespace: openshift-storage -spec: - enableCephTools: true diff --git a/components/operators/openshift-data-foundation/instance/overlays/aws/storagecluster.yaml b/components/operators/openshift-data-foundation/instance/overlays/aws/storagecluster.yaml deleted file mode 100644 index 1228b5b..0000000 --- a/components/operators/openshift-data-foundation/instance/overlays/aws/storagecluster.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: ocs.openshift.io/v1 -kind: StorageCluster -metadata: - name: ocs-storagecluster - namespace: openshift-storage -spec: - arbiter: {} - encryption: - kms: {} - externalStorage: {} - managedResources: - cephBlockPools: {} - cephConfig: {} - cephDashboard: {} - cephFilesystems: {} - cephObjectStoreUsers: {} - cephObjectStores: {} - mirroring: {} - nodeTopologies: {} - storageDeviceSets: - - config: {} - count: 1 - dataPVCTemplate: - metadata: {} - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Ti - storageClassName: gp2 - volumeMode: Block - status: {} - name: ocs-deviceset-gp2 - placement: {} - portable: true - preparePlacement: {} - replica: 3 - resources: {} - # Allow ODF to set version dynamically when applied - # version: 4.9.0 diff --git a/components/operators/openshift-data-foundation/instance/overlays/vsphere/kustomization.yaml b/components/operators/openshift-data-foundation/instance/overlays/vsphere/kustomization.yaml deleted file mode 100644 index 2663e7c..0000000 --- a/components/operators/openshift-data-foundation/instance/overlays/vsphere/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - ../../base - - ocsinitialization.yaml - - storagecluster.yaml diff --git a/components/operators/openshift-data-foundation/instance/overlays/vsphere/ocsinitialization.yaml b/components/operators/openshift-data-foundation/instance/overlays/vsphere/ocsinitialization.yaml deleted file mode 100644 index 50507db..0000000 --- a/components/operators/openshift-data-foundation/instance/overlays/vsphere/ocsinitialization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: ocs.openshift.io/v1 -kind: OCSInitialization -metadata: - name: ocsinit - namespace: openshift-storage -spec: - enableCephTools: true diff --git a/components/operators/openshift-data-foundation/instance/overlays/vsphere/storagecluster.yaml b/components/operators/openshift-data-foundation/instance/overlays/vsphere/storagecluster.yaml deleted file mode 100644 index b00a56c..0000000 --- a/components/operators/openshift-data-foundation/instance/overlays/vsphere/storagecluster.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: ocs.openshift.io/v1 -kind: StorageCluster -metadata: - name: ocs-storagecluster - namespace: openshift-storage -spec: - arbiter: {} - encryption: - kms: {} - externalStorage: {} - flexibleScaling: true - managedResources: - cephBlockPools: {} - cephConfig: {} - cephDashboard: {} - cephFilesystems: {} - cephObjectStoreUsers: {} - cephObjectStores: {} - mirroring: {} - nodeTopologies: {} - storageDeviceSets: - - config: {} - count: 1 - dataPVCTemplate: - metadata: {} - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Ti - storageClassName: thin - volumeMode: Block - status: {} - name: ocs-deviceset-thin - placement: {} - portable: true - preparePlacement: {} - replica: 3 - resources: {} - # Allow ODF to set version dynamically when applied - # version: 4.9.0 diff --git a/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-job.yaml b/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-job.yaml deleted file mode 100644 index 25399b0..0000000 --- a/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-job.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: enable-odf-console-plugin - generateName: enable-odf-console-plugin- - annotations: - argocd.argoproj.io/sync-wave: "10" -spec: - template: - spec: - containers: - - name: labeler - image: image-registry.openshift-image-registry.svc:5000/openshift/cli - env: - - name: PLUGIN_NAME - value: 'odf-console' - command: - - /bin/bash - - -c - - | - echo "Attempting to enable ${PLUGIN_NAME} plugin" - echo "" - - # Create the plugins section on the object if it doesn't exist - if [ -z $(oc get consoles.operator.openshift.io cluster -o=jsonpath='{.spec.plugins}') ]; then - echo "Creating plugins object" - oc patch consoles.operator.openshift.io cluster --patch '{ "spec": { "plugins": [] } }' --type=merge - fi - - INSTALLED_PLUGINS=$(oc get consoles.operator.openshift.io cluster -o=jsonpath='{.spec.plugins}') - echo "Current plugins:" - echo ${INSTALLED_PLUGINS} - - if [[ "${INSTALLED_PLUGINS}" == *"${PLUGIN_NAME}"* ]]; then - echo "${PLUGIN_NAME} is already enabled" - else - echo "Enabling plugin: ${PLUGIN_NAME}" - oc patch consoles.operator.openshift.io cluster --type=json --patch '[{"op": "add", "path": "/spec/plugins/-", "value": "'${PLUGIN_NAME}'"}]' - fi - restartPolicy: Never - serviceAccount: enable-odf-console-plugin - serviceAccountName: enable-odf-console-plugin - backoffLimit: 4 diff --git a/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-rbac.yaml b/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-rbac.yaml deleted file mode 100644 index edb6e42..0000000 --- a/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-rbac.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: enable-odf-console-plugin -rules: - - apiGroups: ["operator.openshift.io"] - resources: - - consoles - verbs: - - get - - list - - patch - - label ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: enable-odf-console-plugin -subjects: - - kind: ServiceAccount - name: enable-odf-console-plugin - namespace: openshift-storage -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: enable-odf-console-plugin diff --git a/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-sa.yaml b/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-sa.yaml deleted file mode 100644 index fdfa2a7..0000000 --- a/components/operators/openshift-data-foundation/operator/base/enable-console-plugin-sa.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: enable-odf-console-plugin diff --git a/components/operators/openshift-data-foundation/operator/base/kustomization.yaml b/components/operators/openshift-data-foundation/operator/base/kustomization.yaml deleted file mode 100644 index 8106e84..0000000 --- a/components/operators/openshift-data-foundation/operator/base/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - enable-console-plugin-job.yaml - - enable-console-plugin-rbac.yaml - - enable-console-plugin-sa.yaml - - openshift-data-foundation-console-plugin.yaml - - openshift-data-foundation-operator-subscription.yaml - - openshift-data-foundation-operator-operatorgroup.yaml - - openshift-storage-namespace.yaml diff --git a/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-console-plugin.yaml b/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-console-plugin.yaml deleted file mode 100644 index 5e724d1..0000000 --- a/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-console-plugin.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: console.openshift.io/v1alpha1 -kind: ConsolePlugin -metadata: - name: odf-console -spec: - displayName: ODF Plugin - service: - basePath: / - name: odf-console-service - namespace: openshift-storage - port: 9001 diff --git a/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-operator-operatorgroup.yaml b/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-operator-operatorgroup.yaml deleted file mode 100644 index 244c20b..0000000 --- a/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-operator-operatorgroup.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: openshift-storage -spec: - targetNamespaces: - - openshift-storage diff --git a/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-operator-subscription.yaml b/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-operator-subscription.yaml deleted file mode 100644 index e09ae67..0000000 --- a/components/operators/openshift-data-foundation/operator/base/openshift-data-foundation-operator-subscription.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: odf-operator - namespace: openshift-storage -spec: - channel: patch-me-see-overlays-dir - installPlanApproval: Automatic - name: odf-operator - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/components/operators/openshift-data-foundation/operator/base/openshift-storage-namespace.yaml b/components/operators/openshift-data-foundation/operator/base/openshift-storage-namespace.yaml deleted file mode 100644 index 9594083..0000000 --- a/components/operators/openshift-data-foundation/operator/base/openshift-storage-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-storage - labels: - openshift.io/cluster-monitoring: "true" diff --git a/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/README.md b/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/README.md deleted file mode 100644 index 0a283a6..0000000 --- a/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *stable-4.10* channel version of the OpenShift Data Foundation Operator diff --git a/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/kustomization.yaml b/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/kustomization.yaml deleted file mode 100644 index b72b525..0000000 --- a/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/kustomization.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - ../../base - -patches: - - target: - group: operators.coreos.com - version: v1alpha1 - kind: Subscription - name: odf-operator - namespace: openshift-storage - path: patch-channel.yaml diff --git a/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/patch-channel.yaml b/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/patch-channel.yaml deleted file mode 100644 index 96ea1bc..0000000 --- a/components/operators/openshift-data-foundation/operator/overlays/stable-4.10/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: stable-4.10 diff --git a/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/README.md b/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/README.md deleted file mode 100644 index 6a7c897..0000000 --- a/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *stable-4.9* channel version of the OpenShift Data Foundation Operator diff --git a/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/kustomization.yaml b/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/kustomization.yaml deleted file mode 100644 index b72b525..0000000 --- a/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/kustomization.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - ../../base - -patches: - - target: - group: operators.coreos.com - version: v1alpha1 - kind: Subscription - name: odf-operator - namespace: openshift-storage - path: patch-channel.yaml diff --git a/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/patch-channel.yaml b/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/patch-channel.yaml deleted file mode 100644 index dffada6..0000000 --- a/components/operators/openshift-data-foundation/operator/overlays/stable-4.9/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: stable-4.9 diff --git a/components/operators/openshift-gitops-operator/INFO.md b/components/operators/openshift-gitops-operator/INFO.md index de821d5..37fe137 100644 --- a/components/operators/openshift-gitops-operator/INFO.md +++ b/components/operators/openshift-gitops-operator/INFO.md @@ -3,7 +3,6 @@ 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 repeatable application delivery across hybrid multi-cluster Kubernetes environments. Following GitOps and infrastructure as code principles, you can store the configuration of clusters and applications in Git repositories and use Git workflows to roll them out to the target clusters. ## Features - * Automated install and upgrades of Argo CD * Manual and automated configuration sync from Git repositories to target OpenShift and Kubernetes clusters * Support for the Helm and Kustomize templating tools @@ -13,14 +12,11 @@ Red Hat OpenShift GitOps is a declarative continuous delivery platform based on * Automated GitOps bootstrapping using Tekton and Argo CD with [GitOps Application Manager CLI](https://github.com/redhat-developer/kam) ## Components - -* Argo CD v2.1.16 +* Argo CD v2.2.14 * GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases)) -## How to Install - -After installing the OpenShift GitOps operator, an instance of Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges for managing cluster configurations. You can create additional Argo CD instances using the `ArgoCD` custom resource within the desired namespaces. - +## How to Install +After installing the OpenShift GitOps operator, an instance of Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges for managing cluster configurations. You can create additional Argo CD instances using the `ArgoCD` custom resource within the desired namespaces. ```yaml apiVersion: argoproj.io/v1alpha1 kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/README.md b/components/operators/openshift-gitops-operator/README.md index a11a420..aae65b4 100644 --- a/components/operators/openshift-gitops-operator/README.md +++ b/components/operators/openshift-gitops-operator/README.md @@ -6,11 +6,15 @@ Do not use the `base` directory directly, as you will need to patch the `channel The current *overlays* available are for the following channels: +* [gitops-1.10](operator/overlays/gitops-1.10) +* [gitops-1.11](operator/overlays/gitops-1.11) * [gitops-1.3](operator/overlays/gitops-1.3) * [gitops-1.4](operator/overlays/gitops-1.4) * [gitops-1.5](operator/overlays/gitops-1.5) * [gitops-1.6](operator/overlays/gitops-1.6) * [gitops-1.7](operator/overlays/gitops-1.7) +* [gitops-1.8](operator/overlays/gitops-1.8) +* [gitops-1.9](operator/overlays/gitops-1.9) * [latest](operator/overlays/latest) * [preview](operator/overlays/preview) * [stable](operator/overlays/stable) diff --git a/components/operators/openshift-nfd/aggregate/overlays/default/kustomization.yaml b/components/operators/openshift-gitops-operator/aggregate/overlays/default/kustomization.yaml similarity index 76% rename from components/operators/openshift-nfd/aggregate/overlays/default/kustomization.yaml rename to components/operators/openshift-gitops-operator/aggregate/overlays/default/kustomization.yaml index 303e947..b0b198f 100644 --- a/components/operators/openshift-nfd/aggregate/overlays/default/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/aggregate/overlays/default/kustomization.yaml @@ -4,8 +4,6 @@ kind: Kustomization commonAnnotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -namespace: openshift-nfd - resources: - - ../../../operator/overlays/stable - ../../../instance/overlays/default + - ../../../operator/overlays/latest diff --git a/components/operators/openshift-gitops-operator/instance/base/argocd-ssh-known-hosts-cm.yaml b/components/operators/openshift-gitops-operator/instance/base/argocd-ssh-known-hosts-cm.yaml new file mode 100644 index 0000000..7f6fd84 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/base/argocd-ssh-known-hosts-cm.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + labels: + kludge: "true" + name: argocd-ssh-known-hosts-cm +data: + ssh_known_hosts: | + bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw== + github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY= + gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf + gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9 + ssh.dev.azure.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H + vs-ssh.visualstudio.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H + # additional github keys + github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= + github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl diff --git a/components/operators/openshift-gitops-operator/instance/base/cluster-role-binding.yaml b/components/operators/openshift-gitops-operator/instance/base/cluster-role-binding.yaml index b3fac75..62a6071 100644 --- a/components/operators/openshift-gitops-operator/instance/base/cluster-role-binding.yaml +++ b/components/operators/openshift-gitops-operator/instance/base/cluster-role-binding.yaml @@ -1,6 +1,9 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: + annotations: + kludge: 'true' + todo: 'improve cluster security' name: argocd-application-controller-cluster-admin subjects: - kind: ServiceAccount diff --git a/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.sh b/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.sh new file mode 100755 index 0000000..f46cf18 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +enable_console_plugin(){ + [ -z "${PLUGIN_NAME}" ] && return 1 + + echo "Attempting to enable ${PLUGIN_NAME} plugin" + echo "" + + # Create the plugins section on the object if it doesn't exist + if [ -z "$(oc get consoles.operator.openshift.io cluster -o=jsonpath='{.spec.plugins}')" ]; then + echo "Creating plugins object" + oc patch consoles.operator.openshift.io cluster --patch '{ "spec": { "plugins": [] } }' --type=merge + fi + + INSTALLED_PLUGINS=$(oc get consoles.operator.openshift.io cluster -o=jsonpath='{.spec.plugins}') + echo "Current plugins:" + echo "${INSTALLED_PLUGINS}" + + if [[ "${INSTALLED_PLUGINS}" == *"${PLUGIN_NAME}"* ]]; then + echo "${PLUGIN_NAME} is already enabled" + else + echo "Enabling plugin: ${PLUGIN_NAME}" + oc patch consoles.operator.openshift.io cluster --type=json --patch '[{"op": "add", "path": "/spec/plugins/-", "value": "'"${PLUGIN_NAME}"'"}]' + fi + + sleep 6 + oc get consoles.operator.openshift.io cluster -o=jsonpath='{.spec.plugins}' +} + +enable_console_plugin diff --git a/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.yaml b/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.yaml new file mode 100644 index 0000000..b25b2f9 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.yaml @@ -0,0 +1,64 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: job-gitops-console-plugin +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: job-gitops-console-plugin +rules: + - apiGroups: + - operator.openshift.io + resources: + - consoles + verbs: + - get + - list + - patch + - label +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: job-gitops-console-plugin +subjects: + - kind: ServiceAccount + name: job-gitops-console-plugin +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: job-gitops-console-plugin +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: job-gitops-console-plugin + annotations: + argocd.argoproj.io/sync-wave: "10" +spec: + template: + spec: + containers: + - name: minion + image: registry.redhat.io/openshift4/ose-cli + env: + - name: PLUGIN_NAME + value: gitops-plugin + command: + - /bin/bash + - -c + - /scripts/console-plugin-job.sh + volumeMounts: + - name: scripts + mountPath: /scripts + volumes: + - name: scripts + configMap: + name: job-gitops-console-plugin + defaultMode: 0755 + restartPolicy: Never + serviceAccount: job-gitops-console-plugin + serviceAccountName: job-gitops-console-plugin + backoffLimit: 4 diff --git a/components/operators/openshift-gitops-operator/instance/overlays/default/gitops-admin-group.yaml b/components/operators/openshift-gitops-operator/instance/base/gitops-admin-group.yaml similarity index 70% rename from components/operators/openshift-gitops-operator/instance/overlays/default/gitops-admin-group.yaml rename to components/operators/openshift-gitops-operator/instance/base/gitops-admin-group.yaml index 586e0ec..bd227fd 100644 --- a/components/operators/openshift-gitops-operator/instance/overlays/default/gitops-admin-group.yaml +++ b/components/operators/openshift-gitops-operator/instance/base/gitops-admin-group.yaml @@ -2,6 +2,4 @@ kind: Group apiVersion: user.openshift.io/v1 metadata: name: gitops-admins -users: - - admin - - opentlc-mgr +users: [] diff --git a/components/operators/openshift-gitops-operator/instance/base/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/base/kustomization.yaml index e2c96a6..bfafa60 100644 --- a/components/operators/openshift-gitops-operator/instance/base/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/instance/base/kustomization.yaml @@ -4,6 +4,17 @@ kind: Kustomization namespace: openshift-gitops resources: +- argocd-ssh-known-hosts-cm.yaml - cluster-role-binding.yaml -# - namespace.yaml +- console-plugin-job.yaml +- gitops-admin-group.yaml +- namespace.yaml - openshift-gitops-cr.yaml + +generatorOptions: + disableNameSuffixHash: true + +configMapGenerator: + - name: job-gitops-console-plugin + files: + - console-plugin-job.sh diff --git a/components/operators/openshift-gitops-operator/instance/base/namespace.yaml b/components/operators/openshift-gitops-operator/instance/base/namespace.yaml index 838dc88..6229e00 100644 --- a/components/operators/openshift-gitops-operator/instance/base/namespace.yaml +++ b/components/operators/openshift-gitops-operator/instance/base/namespace.yaml @@ -3,4 +3,5 @@ kind: Namespace metadata: annotations: openshift.io/display-name: OpenShift GitOps + openshift.io/description: The default instance of ArgoCD on OpenShift name: openshift-gitops diff --git a/components/operators/openshift-gitops-operator/instance/overlays/default/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/overlays/default/kustomization.yaml index 1d5bb85..c06b43b 100644 --- a/components/operators/openshift-gitops-operator/instance/overlays/default/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/instance/overlays/default/kustomization.yaml @@ -5,18 +5,25 @@ namespace: openshift-gitops resources: - ../../base - - gitops-admin-group.yaml patches: - - patch: |- + - target: + kind: Group + patch: |- + - op: replace + path: /users + value: + - admin + - opentlc-mgr + - target: + kind: ArgoCD + patch: |- - op: replace path: /spec/rbac/policy value: | g, gitops-admins, role:admin g, system:cluster-admins, role:admin g, cluster-admins, role:admin - target: - kind: ArgoCD - - path: patch-resource-customizations.yaml - target: - kind: ArgoCD + # - target: + # kind: ArgoCD + # path: patch-resource-customizations.yaml diff --git a/components/operators/openshift-gitops-operator/instance/overlays/default/patch-resource-customizations.yaml b/components/operators/openshift-gitops-operator/instance/overlays/default/patch-resource-customizations.yaml index 35d38c2..a6d9064 100644 --- a/components/operators/openshift-gitops-operator/instance/overlays/default/patch-resource-customizations.yaml +++ b/components/operators/openshift-gitops-operator/instance/overlays/default/patch-resource-customizations.yaml @@ -51,7 +51,7 @@ elseif (condition.type == "StorageSystemInvalid" and condition.status == "True") or (condition.type == "VendorCsvReady" and condition.status == "False") or (condition.type == "VendorSystemPresent" and condition.status == "False") then health_status.status = "Degraded" end - + end health_status.message = msg diff --git a/components/operators/openshift-gitops-operator/operator/README.md b/components/operators/openshift-gitops-operator/operator/README.md deleted file mode 100644 index b6fbb25..0000000 --- a/components/operators/openshift-gitops-operator/operator/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# OpenShift GitOps Operator - -Installs the OpenShift GitOps (Argo CD) operator. - -Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. - -The current *overlays* available are for the following channels: -* [preview](overlays/preview) -* [stable](overlays/stable) -* [latest](overlays/latest) -* [gitops-1.5](overlays/gitops-1.5) -* [gitops-1.6](overlays/gitops-1.6) - -If you want to use the latest stable version of OpenShift GitOps, it is recommended that you use the `latest` channel. If you want to stay on a particular release, please use the associated `gitops-1.x` channel. - - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install the OpenShift GitOps operator based on the overlay of your choice by running from the root `gitops-catalog` directory - -``` -oc apply -k openshift-gitops-operator/overlays/ -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-gitops-operator/overlays/ -``` diff --git a/components/operators/openshift-gitops-operator/operator/base/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/base/kustomization.yaml index 00078e0..1e66bd5 100644 --- a/components/operators/openshift-gitops-operator/operator/base/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/base/kustomization.yaml @@ -2,4 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml + - operator-group.yaml - subscription.yaml diff --git a/components/operators/gpu-operator-certified/operator/base/namespace.yaml b/components/operators/openshift-gitops-operator/operator/base/namespace.yaml similarity index 55% rename from components/operators/gpu-operator-certified/operator/base/namespace.yaml rename to components/operators/openshift-gitops-operator/operator/base/namespace.yaml index 45086f4..5509025 100644 --- a/components/operators/gpu-operator-certified/operator/base/namespace.yaml +++ b/components/operators/openshift-gitops-operator/operator/base/namespace.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - openshift.io/display-name: "NVIDIA GPU Operator" + openshift.io/display-name: Red Hat OpenShift GitOps labels: openshift.io/cluster-monitoring: 'true' - name: nvidia-gpu-operator + name: openshift-gitops-operator diff --git a/components/operators/openshift-gitops-operator/operator/base/openshift-gitops-operator-subscription.yaml b/components/operators/openshift-gitops-operator/operator/base/openshift-gitops-operator-subscription.yaml deleted file mode 100644 index 2b23cc8..0000000 --- a/components/operators/openshift-gitops-operator/operator/base/openshift-gitops-operator-subscription.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: openshift-gitops-operator - namespace: openshift-operators -spec: - channel: patch-me-see-overlays-dir - installPlanApproval: Automatic - name: openshift-gitops-operator - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/components/operators/openshift-gitops-operator/operator/base/operator-group.yaml b/components/operators/openshift-gitops-operator/operator/base/operator-group.yaml new file mode 100644 index 0000000..8096346 --- /dev/null +++ b/components/operators/openshift-gitops-operator/operator/base/operator-group.yaml @@ -0,0 +1,5 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: openshift-gitops-operator + namespace: openshift-gitops-operator diff --git a/components/operators/openshift-gitops-operator/operator/base/subscription.yaml b/components/operators/openshift-gitops-operator/operator/base/subscription.yaml index 2b23cc8..b3de71e 100644 --- a/components/operators/openshift-gitops-operator/operator/base/subscription.yaml +++ b/components/operators/openshift-gitops-operator/operator/base/subscription.yaml @@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: name: openshift-gitops-operator - namespace: openshift-operators + namespace: openshift-gitops-operator spec: channel: patch-me-see-overlays-dir installPlanApproval: Automatic diff --git a/components/operators/gpu-operator-certified/operator/overlays/v22.9/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.10/kustomization.yaml similarity index 81% rename from components/operators/gpu-operator-certified/operator/overlays/v22.9/kustomization.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.10/kustomization.yaml index c771cd2..b84bcd2 100644 --- a/components/operators/gpu-operator-certified/operator/overlays/v22.9/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.10/kustomization.yaml @@ -7,5 +7,5 @@ resources: patches: - target: kind: Subscription - name: gpu-operator-certified + name: openshift-gitops-operator path: patch-channel.yaml diff --git a/components/operators/gpu-operator-certified/operator/overlays/v1.11/patch-channel.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.10/patch-channel.yaml similarity index 63% rename from components/operators/gpu-operator-certified/operator/overlays/v1.11/patch-channel.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.10/patch-channel.yaml index 75dec96..816300c 100644 --- a/components/operators/gpu-operator-certified/operator/overlays/v1.11/patch-channel.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.10/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: v1.11 + value: gitops-1.10 diff --git a/components/operators/gpu-operator-certified/operator/overlays/v1.10/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml similarity index 81% rename from components/operators/gpu-operator-certified/operator/overlays/v1.10/kustomization.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml index c771cd2..b84bcd2 100644 --- a/components/operators/gpu-operator-certified/operator/overlays/v1.10/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml @@ -7,5 +7,5 @@ resources: patches: - target: kind: Subscription - name: gpu-operator-certified + name: openshift-gitops-operator path: patch-channel.yaml diff --git a/components/operators/gpu-operator-certified/operator/overlays/v22.9/patch-channel.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-channel.yaml similarity index 63% rename from components/operators/gpu-operator-certified/operator/overlays/v22.9/patch-channel.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-channel.yaml index fe4b08c..9ce419d 100644 --- a/components/operators/gpu-operator-certified/operator/overlays/v22.9/patch-channel.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: v22.9 + value: gitops-1.11 diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.5/README.md b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.5/README.md deleted file mode 100644 index 8b7f52f..0000000 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.5/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *gitops-1.5* channel version of the OpenShift GitOps Operator. This channel tracks updates to OpenShift GitOps 1.5. diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.6/README.md b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.6/README.md deleted file mode 100644 index 3104be6..0000000 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.6/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *gitops-1.6* channel version of the OpenShift GitOps Operator. This channel tracks updates to OpenShift GitOps 1.6. diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.7/README.md b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.7/README.md deleted file mode 100644 index 5d2e8bc..0000000 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.7/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *gitops-1.7* channel version of the OpenShift GitOps Operator. This channel tracks updates to OpenShift GitOps 1.7. diff --git a/components/operators/gpu-operator-certified/operator/overlays/stable/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.8/kustomization.yaml similarity index 81% rename from components/operators/gpu-operator-certified/operator/overlays/stable/kustomization.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.8/kustomization.yaml index c771cd2..b84bcd2 100644 --- a/components/operators/gpu-operator-certified/operator/overlays/stable/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.8/kustomization.yaml @@ -7,5 +7,5 @@ resources: patches: - target: kind: Subscription - name: gpu-operator-certified + name: openshift-gitops-operator path: patch-channel.yaml diff --git a/components/operators/gpu-operator-certified/operator/overlays/stable/patch-channel.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.8/patch-channel.yaml similarity index 64% rename from components/operators/gpu-operator-certified/operator/overlays/stable/patch-channel.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.8/patch-channel.yaml index 6642eb1..dcfc50c 100644 --- a/components/operators/gpu-operator-certified/operator/overlays/stable/patch-channel.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.8/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: stable + value: gitops-1.8 diff --git a/components/operators/gpu-operator-certified/operator/overlays/v1.11/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.9/kustomization.yaml similarity index 81% rename from components/operators/gpu-operator-certified/operator/overlays/v1.11/kustomization.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.9/kustomization.yaml index c771cd2..b84bcd2 100644 --- a/components/operators/gpu-operator-certified/operator/overlays/v1.11/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.9/kustomization.yaml @@ -7,5 +7,5 @@ resources: patches: - target: kind: Subscription - name: gpu-operator-certified + name: openshift-gitops-operator path: patch-channel.yaml diff --git a/components/operators/gpu-operator-certified/operator/overlays/v1.10/patch-channel.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.9/patch-channel.yaml similarity index 64% rename from components/operators/gpu-operator-certified/operator/overlays/v1.10/patch-channel.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.9/patch-channel.yaml index 5c303df..bb9dffc 100644 --- a/components/operators/gpu-operator-certified/operator/overlays/v1.10/patch-channel.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.9/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: v1.10 + value: gitops-1.9 diff --git a/components/operators/openshift-gitops-operator/operator/overlays/preview/README.md b/components/operators/openshift-gitops-operator/operator/overlays/preview/README.md deleted file mode 100644 index f568bbf..0000000 --- a/components/operators/openshift-gitops-operator/operator/overlays/preview/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *preview* channel version of the OpenShift GitOps Operator diff --git a/components/operators/openshift-gitops-operator/operator/overlays/stable/README.md b/components/operators/openshift-gitops-operator/operator/overlays/stable/README.md deleted file mode 100644 index ee33a75..0000000 --- a/components/operators/openshift-gitops-operator/operator/overlays/stable/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *stable* channel version of the OpenShift GitOps Operator. This channel may be removed in a future version of OpenShift GitOps. diff --git a/components/operators/openshift-keda/README.md b/components/operators/openshift-keda/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/components/operators/openshift-keda/operator/base/kustomization.yaml b/components/operators/openshift-keda/operator/base/kustomization.yaml deleted file mode 100644 index 1e66bd5..0000000 --- a/components/operators/openshift-keda/operator/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - namespace.yaml - - operator-group.yaml - - subscription.yaml diff --git a/components/operators/openshift-keda/operator/base/namespace.yaml b/components/operators/openshift-keda/operator/base/namespace.yaml deleted file mode 100644 index 7b2b563..0000000 --- a/components/operators/openshift-keda/operator/base/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - annotations: - openshift.io/display-name: Custom Metrics Autoscaler - labels: - openshift.io/cluster-monitoring: 'true' - name: openshift-keda diff --git a/components/operators/openshift-keda/operator/base/operator-group.yaml b/components/operators/openshift-keda/operator/base/operator-group.yaml deleted file mode 100644 index afeeb44..0000000 --- a/components/operators/openshift-keda/operator/base/operator-group.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: openshift-custom-metrics-autoscaler-operator-group - namespace: openshift-keda diff --git a/components/operators/openshift-keda/operator/base/subscription.yaml b/components/operators/openshift-keda/operator/base/subscription.yaml deleted file mode 100644 index 1402d03..0000000 --- a/components/operators/openshift-keda/operator/base/subscription.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: openshift-custom-metrics-autoscaler-operator - namespace: openshift-keda -spec: - channel: patch-me-see-overlays-dir - installPlanApproval: Automatic - name: openshift-custom-metrics-autoscaler-operator - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/components/operators/openshift-keda/operator/overlays/stable/README.md b/components/operators/openshift-keda/operator/overlays/stable/README.md deleted file mode 100644 index b2c11e7..0000000 --- a/components/operators/openshift-keda/operator/overlays/stable/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *stable* channel version of the OpenShift Custom Metrics Autoscaler Operator diff --git a/components/operators/openshift-keda/operator/overlays/stable/kustomization.yaml b/components/operators/openshift-keda/operator/overlays/stable/kustomization.yaml deleted file mode 100644 index e5d5e79..0000000 --- a/components/operators/openshift-keda/operator/overlays/stable/kustomization.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-keda - -resources: - - ../../base - -patches: - - target: - group: operators.coreos.com - version: v1alpha1 - kind: Subscription - name: openshift-custom-metrics-autoscaler-operator - namespace: openshift-keda - path: patch-channel.yaml diff --git a/components/operators/openshift-keda/operator/overlays/stable/patch-channel.yaml b/components/operators/openshift-keda/operator/overlays/stable/patch-channel.yaml deleted file mode 100644 index 6642eb1..0000000 --- a/components/operators/openshift-keda/operator/overlays/stable/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: stable diff --git a/components/operators/openshift-logging/aggregate/base/kustomization.yaml b/components/operators/openshift-logging/aggregate/base/kustomization.yaml deleted file mode 100644 index bd0fa60..0000000 --- a/components/operators/openshift-logging/aggregate/base/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -commonAnnotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - -resources: - - https://github.com/redhat-cop/gitops-catalog/openshift-logging/operator/overlays/stable - - https://github.com/redhat-cop/gitops-catalog/openshift-logging/instance/overlays/default diff --git a/components/operators/openshift-logging/aggregate/overlays/default/kustomization.yaml b/components/operators/openshift-logging/aggregate/overlays/default/kustomization.yaml deleted file mode 100644 index 70e6d70..0000000 --- a/components/operators/openshift-logging/aggregate/overlays/default/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-logging - -resources: - - ../../base diff --git a/components/operators/openshift-nfd/README.md b/components/operators/openshift-nfd/README.md deleted file mode 100644 index 277b047..0000000 --- a/components/operators/openshift-nfd/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# OpenShift Node Feature Discovery (NFD) - -Installs the OpenShift Node Feature Discovery operator. - -Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. - -The current *overlays* available are for the following channels: -* [stable](overlays/stable) - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install the OpenShift Container Storage operator based on the overlay of your choice by running from the root `gitops-catalog` directory - -``` -oc apply -k openshift-nfd-operator/overlays/ -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-nfd-operator/operator/overlays/ -``` - -As part of a different overlay in your own GitOps repo: - -``` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - github.com/redhat-cop/gitops-catalog/openshift-nfd-operator/operator/overlays/?ref=main -``` diff --git a/components/operators/openshift-nfd/instance/README.md b/components/operators/openshift-nfd/instance/README.md deleted file mode 100644 index af250a8..0000000 --- a/components/operators/openshift-nfd/instance/README.md +++ /dev/null @@ -1,42 +0,0 @@ -# OpenShift Node Feature Discovery (NFD) - -Installs a basic nodeFeatureDiscovery instance. - -## Prerequisites - -First, install the [OpenShift NFD Operator](../operator) in your cluster. - -Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. - -## Overlays - -The options for this operator are the following *overlays*: -* [default](overlays/default) - -### Default - -[default](overlays/default) configures a basic default configuration for a nodeFeatureDiscovery instance. For more details on customizing the NFD workers, refer to the [docs](https://kubernetes-sigs.github.io/node-feature-discovery/v0.10/advanced/worker-configuration-reference.html). - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install the Storage System by running from the root `gitops-catalog` directory - -``` -oc apply -k openshift-nfd-operator/instance/overlays/default -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-nfd-operator/instance/overlays/default -``` - -As part of a different overlay in your own GitOps repo: - -``` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - github.com/redhat-cop/gitops-catalog/openshift-nfd-operator/instance/overlays/default?ref=main -``` diff --git a/components/operators/openshift-nfd/instance/base/kustomization.yaml b/components/operators/openshift-nfd/instance/base/kustomization.yaml deleted file mode 100644 index 309c6ea..0000000 --- a/components/operators/openshift-nfd/instance/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-nfd - -resources: - - node-feature-discovery.yaml diff --git a/components/operators/openshift-nfd/instance/base/node-feature-discovery.yaml b/components/operators/openshift-nfd/instance/base/node-feature-discovery.yaml deleted file mode 100644 index 606fef8..0000000 --- a/components/operators/openshift-nfd/instance/base/node-feature-discovery.yaml +++ /dev/null @@ -1,122 +0,0 @@ -kind: NodeFeatureDiscovery -apiVersion: nfd.openshift.io/v1 -metadata: - name: nfd-instance -spec: - # customConfig: - # configData: | - # - name: "more.kernel.features" - # matchOn: - # - loadedKMod: ["example_kmod3"] - # - name: "more.features.by.nodename" - # value: customValue - # matchOn: - # - nodename: ["special-.*-node-.*"] - workerConfig: - configData: | - core: - # labelWhiteList: - # noPublish: false - sleepInterval: 60s - # sources: [all] - # klog: - # addDirHeader: false - # alsologtostderr: false - # logBacktraceAt: - # logtostderr: true - # skipHeaders: false - # stderrthreshold: 2 - # v: 0 - # vmodule: - ## NOTE: the following options are not dynamically run-time - ## configurable and require a nfd-worker restart to take effect - ## after being changed - # logDir: - # logFile: - # logFileMaxSize: 1800 - # skipLogHeaders: false - sources: - # cpu: - # cpuid: - ## NOTE: whitelist has priority over blacklist - # attributeBlacklist: - # - "BMI1" - # - "BMI2" - # - "CLMUL" - # - "CMOV" - # - "CX16" - # - "ERMS" - # - "F16C" - # - "HTT" - # - "LZCNT" - # - "MMX" - # - "MMXEXT" - # - "NX" - # - "POPCNT" - # - "RDRAND" - # - "RDSEED" - # - "RDTSCP" - # - "SGX" - # - "SSE" - # - "SSE2" - # - "SSE3" - # - "SSE4.1" - # - "SSE4.2" - # - "SSSE3" - # attributeWhitelist: - # kernel: - # kconfigFile: "/path/to/kconfig" - # configOpts: - # - "NO_HZ" - # - "X86" - # - "DMI" - pci: - deviceClassWhitelist: - - "0200" - - "03" - - "12" - deviceLabelFields: - # - "class" - - "vendor" - # - "device" - # - "subsystem_vendor" - # - "subsystem_device" - # usb: - # deviceClassWhitelist: - # - "0e" - # - "ef" - # - "fe" - # - "ff" - # deviceLabelFields: - # - "class" - # - "vendor" - # - "device" - # custom: - # - name: "my.kernel.feature" - # matchOn: - # - loadedKMod: ["example_kmod1", "example_kmod2"] - # - name: "my.pci.feature" - # matchOn: - # - pciId: - # class: ["0200"] - # vendor: ["15b3"] - # device: ["1014", "1017"] - # - pciId : - # vendor: ["8086"] - # device: ["1000", "1100"] - # - name: "my.usb.feature" - # matchOn: - # - usbId: - # class: ["ff"] - # vendor: ["03e7"] - # device: ["2485"] - # - usbId: - # class: ["fe"] - # vendor: ["1a6e"] - # device: ["089a"] - # - name: "my.combined.feature" - # matchOn: - # - pciId: - # vendor: ["15b3"] - # device: ["1014", "1017"] - # loadedKMod : ["vendor_kmod1", "vendor_kmod2"] diff --git a/components/operators/openshift-nfd/instance/overlays/default/kustomization.yaml b/components/operators/openshift-nfd/instance/overlays/default/kustomization.yaml deleted file mode 100644 index 774a422..0000000 --- a/components/operators/openshift-nfd/instance/overlays/default/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base diff --git a/components/operators/openshift-nfd/operator/base/kustomization.yaml b/components/operators/openshift-nfd/operator/base/kustomization.yaml deleted file mode 100644 index 1e66bd5..0000000 --- a/components/operators/openshift-nfd/operator/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - namespace.yaml - - operator-group.yaml - - subscription.yaml diff --git a/components/operators/openshift-nfd/operator/base/namespace.yaml b/components/operators/openshift-nfd/operator/base/namespace.yaml deleted file mode 100644 index 5d9b5ce..0000000 --- a/components/operators/openshift-nfd/operator/base/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - annotations: - openshift.io/display-name: Node Feature Discovery Operator - labels: - openshift.io/cluster-monitoring: 'true' - name: openshift-nfd diff --git a/components/operators/openshift-nfd/operator/base/operator-group.yaml b/components/operators/openshift-nfd/operator/base/operator-group.yaml deleted file mode 100644 index 538018b..0000000 --- a/components/operators/openshift-nfd/operator/base/operator-group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: nfd-group - namespace: openshift-nfd -spec: - targetNamespaces: - - openshift-nfd diff --git a/components/operators/openshift-nfd/operator/base/subscription.yaml b/components/operators/openshift-nfd/operator/base/subscription.yaml deleted file mode 100644 index 9e2484b..0000000 --- a/components/operators/openshift-nfd/operator/base/subscription.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: nfd - namespace: openshift-nfd -spec: - channel: patch-me-see-overlays-dir - installPlanApproval: Automatic - name: nfd - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/components/operators/openshift-nfd/operator/overlays/4.9/kustomization.yaml b/components/operators/openshift-nfd/operator/overlays/4.9/kustomization.yaml deleted file mode 100644 index 80c7de8..0000000 --- a/components/operators/openshift-nfd/operator/overlays/4.9/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - kind: Subscription - name: nfd - path: patch-channel.yaml diff --git a/components/operators/openshift-nfd/operator/overlays/4.9/patch-channel.yaml b/components/operators/openshift-nfd/operator/overlays/4.9/patch-channel.yaml deleted file mode 100644 index 10b938c..0000000 --- a/components/operators/openshift-nfd/operator/overlays/4.9/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: '4.9' diff --git a/components/operators/openshift-nfd/operator/overlays/stable/kustomization.yaml b/components/operators/openshift-nfd/operator/overlays/stable/kustomization.yaml deleted file mode 100644 index 80c7de8..0000000 --- a/components/operators/openshift-nfd/operator/overlays/stable/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - kind: Subscription - name: nfd - path: patch-channel.yaml diff --git a/components/operators/openshift-nfd/operator/overlays/stable/patch-channel.yaml b/components/operators/openshift-nfd/operator/overlays/stable/patch-channel.yaml deleted file mode 100644 index 6642eb1..0000000 --- a/components/operators/openshift-nfd/operator/overlays/stable/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: stable diff --git a/components/operators/quay-operator/INFO.md b/components/operators/quay-operator/INFO.md deleted file mode 100644 index 59b609a..0000000 --- a/components/operators/quay-operator/INFO.md +++ /dev/null @@ -1,41 +0,0 @@ -# quay-operator - -The Red Hat Quay Operator deploys and manages a production-ready -[Red Hat Quay](https://www.openshift.com/products/quay) private container registry. -This operator provides an opinionated installation and configuration of Red Hat Quay. -All components required, including Clair, database, and storage, are provided in an -operator-managed fashion. Each component may optionally be self-managed. - -## Operator Features - -* Automated installation of Red Hat Quay -* Provisions instance of Redis -* Provisions PostgreSQL to support both Quay and Clair -* Installation of Clair for container scanning and integration with Quay -* Provisions and configures RHOCS for supported registry object storage -* Enables and configures Quay's registry mirroring feature - -## Prerequisites - -By default, the Red Hat Quay operator expects RHOCS to be installed on the cluster to -provide the _ObjectBucketClaim_ API for object storage. For instructions installing and -configuring the RHOCS Operator, see the "Enabling OpenShift Container Storage" in the -[official documentation](https://access.redhat.com/documentation/en-us/red_hat_quay/3/html-single/deploy_red_hat_quay_on_openshift_with_the_quay_operator/index#enabling_openshift_container_storage). - -## Simplified Deployment - -The following example provisions a fully operator-managed deployment of Red Hat Quay, -including all services necessary for production: - -``` -apiVersion: quay.redhat.com/v1 -kind: QuayRegistry -metadata: - name: my-registry -``` - -## Documentation - -See the -[official documentation](https://access.redhat.com/documentation/en-us/red_hat_quay/3/html/deploy_red_hat_quay_on_openshift_with_the_quay_operator/index) -for more complex deployment scenarios and information. \ No newline at end of file diff --git a/components/operators/quay-operator/README.md b/components/operators/quay-operator/README.md deleted file mode 100644 index bc60740..0000000 --- a/components/operators/quay-operator/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# Red Hat Quay - -Install Red Hat Quay. - -Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use. - -The current *overlays* available are for the following channels: - -* [quay-v3.4](operator/overlays/quay-v3.4) -* [quay-v3.5](operator/overlays/quay-v3.5) -* [stable-3.6](operator/overlays/stable-3.6) -* [stable-3.7](operator/overlays/stable-3.7) -* [stable-3.8](operator/overlays/stable-3.8) - -## Usage - -If you have cloned the `gitops-catalog` repository, you can install Red Hat Quay based on the overlay of your choice by running from the root (`gitops-catalog`) directory. - -``` -oc apply -k quay-operator/operator/overlays/ -``` - -Or, without cloning: - -``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/quay-operator/operator/overlays/ -``` - -As part of a different overlay in your own GitOps repo: - -``` -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - https://github.com/redhat-cop/gitops-catalog/quay-operator/operator/overlays/?ref=main -``` diff --git a/components/operators/quay-operator/operator/base/kustomization.yaml b/components/operators/quay-operator/operator/base/kustomization.yaml deleted file mode 100644 index 1e66bd5..0000000 --- a/components/operators/quay-operator/operator/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - namespace.yaml - - operator-group.yaml - - subscription.yaml diff --git a/components/operators/quay-operator/operator/base/namespace.yaml b/components/operators/quay-operator/operator/base/namespace.yaml deleted file mode 100644 index 2764865..0000000 --- a/components/operators/quay-operator/operator/base/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - annotations: - openshift.io/display-name: "Red Hat Quay" - labels: - openshift.io/cluster-monitoring: 'true' - name: quay-operator diff --git a/components/operators/quay-operator/operator/base/operator-group.yaml b/components/operators/quay-operator/operator/base/operator-group.yaml deleted file mode 100644 index 735d0e9..0000000 --- a/components/operators/quay-operator/operator/base/operator-group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: quay-operator-group - namespace: quay-operator -spec: - targetNamespaces: - - quay-operator diff --git a/components/operators/quay-operator/operator/base/subscription.yaml b/components/operators/quay-operator/operator/base/subscription.yaml deleted file mode 100644 index 98b5e2b..0000000 --- a/components/operators/quay-operator/operator/base/subscription.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: quay-operator - namespace: quay-operator -spec: - channel: patch-me-see-overlays-dir - installPlanApproval: Automatic - name: quay-operator - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/components/operators/quay-operator/operator/overlays/quay-v3.4/kustomization.yaml b/components/operators/quay-operator/operator/overlays/quay-v3.4/kustomization.yaml deleted file mode 100644 index 057fb80..0000000 --- a/components/operators/quay-operator/operator/overlays/quay-v3.4/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - kind: Subscription - name: quay-operator - path: patch-channel.yaml diff --git a/components/operators/quay-operator/operator/overlays/quay-v3.4/patch-channel.yaml b/components/operators/quay-operator/operator/overlays/quay-v3.4/patch-channel.yaml deleted file mode 100644 index bd07568..0000000 --- a/components/operators/quay-operator/operator/overlays/quay-v3.4/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: quay-v3.4 diff --git a/components/operators/quay-operator/operator/overlays/quay-v3.5/kustomization.yaml b/components/operators/quay-operator/operator/overlays/quay-v3.5/kustomization.yaml deleted file mode 100644 index 057fb80..0000000 --- a/components/operators/quay-operator/operator/overlays/quay-v3.5/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - kind: Subscription - name: quay-operator - path: patch-channel.yaml diff --git a/components/operators/quay-operator/operator/overlays/quay-v3.5/patch-channel.yaml b/components/operators/quay-operator/operator/overlays/quay-v3.5/patch-channel.yaml deleted file mode 100644 index e552fe7..0000000 --- a/components/operators/quay-operator/operator/overlays/quay-v3.5/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: quay-v3.5 diff --git a/components/operators/quay-operator/operator/overlays/stable-3.6/kustomization.yaml b/components/operators/quay-operator/operator/overlays/stable-3.6/kustomization.yaml deleted file mode 100644 index 057fb80..0000000 --- a/components/operators/quay-operator/operator/overlays/stable-3.6/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - kind: Subscription - name: quay-operator - path: patch-channel.yaml diff --git a/components/operators/quay-operator/operator/overlays/stable-3.6/patch-channel.yaml b/components/operators/quay-operator/operator/overlays/stable-3.6/patch-channel.yaml deleted file mode 100644 index 2e4e3d6..0000000 --- a/components/operators/quay-operator/operator/overlays/stable-3.6/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: stable-3.6 diff --git a/components/operators/quay-operator/operator/overlays/stable-3.7/kustomization.yaml b/components/operators/quay-operator/operator/overlays/stable-3.7/kustomization.yaml deleted file mode 100644 index 057fb80..0000000 --- a/components/operators/quay-operator/operator/overlays/stable-3.7/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - kind: Subscription - name: quay-operator - path: patch-channel.yaml diff --git a/components/operators/quay-operator/operator/overlays/stable-3.7/patch-channel.yaml b/components/operators/quay-operator/operator/overlays/stable-3.7/patch-channel.yaml deleted file mode 100644 index fc99b22..0000000 --- a/components/operators/quay-operator/operator/overlays/stable-3.7/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: stable-3.7 diff --git a/components/operators/quay-operator/operator/overlays/stable-3.8/kustomization.yaml b/components/operators/quay-operator/operator/overlays/stable-3.8/kustomization.yaml deleted file mode 100644 index 057fb80..0000000 --- a/components/operators/quay-operator/operator/overlays/stable-3.8/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - kind: Subscription - name: quay-operator - path: patch-channel.yaml diff --git a/components/operators/quay-operator/operator/overlays/stable-3.8/patch-channel.yaml b/components/operators/quay-operator/operator/overlays/stable-3.8/patch-channel.yaml deleted file mode 100644 index 0c3e74c..0000000 --- a/components/operators/quay-operator/operator/overlays/stable-3.8/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: stable-3.8 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 24094b0..d45940b 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -8,7 +8,7 @@ source "$(dirname "$0")/functions.sh" LANG=C SLEEP_SECONDS=8 ARGO_NS="openshift-gitops" -ARGO_CHANNEL="stable" +ARGO_CHANNEL="gitops-1.9" ARGO_DEPLOY_STABLE=(cluster kam openshift-gitops-applicationset-controller openshift-gitops-redis openshift-gitops-repo-server openshift-gitops-server) # kludge: rhdp setup @@ -20,7 +20,7 @@ fi wait_for_gitops(){ echo "Waiting for operator to start" - until oc get deployment gitops-operator-controller-manager -n openshift-operators >/dev/null 2>&1 + until oc get deployment gitops-operator-controller-manager -n openshift-gitops-operator >/dev/null 2>&1 do sleep 1 done