diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4367c36f..f53cf214 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,4 +12,4 @@ updates: - package-ecosystem: "pip" directory: "/" schedule: - interval: "weekly" \ No newline at end of file + interval: "weekly" diff --git a/.github/workflows/dependabot.yaml b/.github/workflows/dependabot.yaml index 8251ad81..8fe516fb 100644 --- a/.github/workflows/dependabot.yaml +++ b/.github/workflows/dependabot.yaml @@ -20,4 +20,4 @@ jobs: run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml index 88d62e4a..902dc61c 100644 --- a/.github/workflows/linting.yaml +++ b/.github/workflows/linting.yaml @@ -14,23 +14,6 @@ on: # yamllint disable-line rule:truthy - docs/*.md jobs: - lint-kustomize: - runs-on: ubuntu-latest - env: - KUSTOMIZE_VERSION: 3.9.4 - KUSTOMIZE_URL: https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64 - BIN_PATH: /usr/bin - steps: - - name: Install Kustomize - run: | - sudo curl "${KUSTOMIZE_URL}" -L -o ${BIN_PATH}/kustomize - sudo chmod +x ${BIN_PATH}/kustomize - - name: Code Checkout - uses: actions/checkout@v4 - - name: Validate Manifests - run: | - [ -d ./bootstrap/base ] && touch bootstrap/base/sealed-secrets-secret.yaml - ./scripts/validate_manifests.sh lint-yaml: runs-on: ubuntu-latest @@ -65,4 +48,27 @@ jobs: uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: Dockerfile - recursive: true \ No newline at end of file + recursive: true + + lint-manifests: + runs-on: ubuntu-latest + env: + # KUSTOMIZE_VERSION: v5.0.1 + BIN_PATH: /usr/bin + steps: + - name: Install Kustomize + run: | + set -x + LATEST=$( curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases/latest | jq .name | sed 's#kustomize/##; s#"##g') + BIN_VERSION=${KUSTOMIZE_VERSION:-${LATEST}} + DOWNLOAD_URL=https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${BIN_VERSION}/kustomize_${BIN_VERSION}_linux_amd64.tar.gz + + curl "${DOWNLOAD_URL}" -sL | sudo tar zx -C "${BIN_PATH}/" kustomize + sudo chmod +x "${BIN_PATH}"/kustomize + - name: Code Checkout + uses: actions/checkout@v4 + - name: Validate Manifests + run: | + [ -d ./bootstrap/base ] && touch bootstrap/base/sealed-secrets-secret.yaml + ./scripts/validate_kustomize.sh + ./scripts/validate_helm.sh diff --git a/.gitignore b/.gitignore index fbfaf851..d92b6627 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ scratch/ files.txt bootstrap/sealed-secrets-secret.yaml **/charts/ - dictionary.dic # swap files diff --git a/.hadolint.yaml b/.hadolint.yaml index d6258e00..e8c7b4b6 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -3,6 +3,7 @@ override: info: - DL3006 # Always tag the version of an image explicitly - DL3013 # Pin versions in pip - - DL3033 # Specify version with `dnf install - - DL3041 # Specify version with `yum install - - DL4006 # Set the SHELL option -o pipefail before RUN \ No newline at end of file + - DL4006 # Set the SHELL option -o pipefail before RUN +ignored: + - DL3033 # Specify version with `dnf install + - DL3041 # Specify version with `yum install diff --git a/.pyspelling.yml b/.pyspelling.yml index 6bedb35e..4e180cd8 100644 --- a/.pyspelling.yml +++ b/.pyspelling.yml @@ -7,6 +7,7 @@ matrix: encoding: utf-8 wordlists: - .wordlist-md + output: scratch/dictionary.dic pipeline: - pyspelling.filters.markdown: - pyspelling.filters.html: @@ -17,3 +18,32 @@ matrix: sources: - '!**/INFO.md|!**/TODO.md|!venv/**|!scratch/**|**/*.md' default_encoding: utf-8 + - name: Scripts + aspell: + lang: en + dictionary: + encoding: utf-8 + wordlists: + - .wordlist-md + - .wordlist-sh + output: scratch/dictionary.dic + pipeline: + - pyspelling.filters.text: + sources: + - '!venv/**|!scratch/**|!*/wip/**|**/*.sh' + default_encoding: utf-8 + - name: Python + aspell: + lang: en + # ignore-case: true + dictionary: + encoding: utf-8 + wordlists: + - .wordlist-md + - .wordlist-sh + output: scratch/dictionary.dic + pipeline: + - pyspelling.filters.python: + sources: + - '!venv/**|!scratch/**|**/*.py' + default_encoding: utf-8 diff --git a/.wordlist-md b/.wordlist-md index 73688d25..f2134098 100644 --- a/.wordlist-md +++ b/.wordlist-md @@ -1,141 +1,39 @@ -ACK -ACM -ACS -APIs -ARN -AdoptedResource -AmazonS -AmazonSageMakerFullAccess -Analytics -Ansible -ArgoCD -Authorino -Bitnami -CICD -CIDR -CRD -CRDs -CRs -CSS -CUDA -CheCluster -ClusterPolicy -ClusterRoleBindings -ClusterTask -CodeReady -ConfigMap -DCGM -DNS -Dev -DevWorkspace -DevWorkspaces -Devfile -Dockerfile -DotNET -EOF -Eventing -FullAccess -GPUs -Gi -GitOps -HTPasswd -Hashicorp -IAM -IOV -IgnoreExtraneous -Jaeger -Jenkins -Jira -KFP -Kafka -KieApp -Koku -KokuMetricsConfig -Kubernetes -Kyverno -LDAP -LVM -Lifecycle -MLOps -MTA -MachineConfig -MachineSet -MultiClusterHub -NFD -NFS -NMState -Noobaa -NuGet -Nvidia's -OADP -OAuth -OCSInitialization -OCSInitilization -OLM -Observability -OpenDataHub -OpenShift -OpenVINO -OperatorGroup -PV -PolicyReport -PriorityClasses -Prometheus -Provisioner -QuickStart -RBAC -README -RHACM -RollingUpdate -Rollout -SAR -SNO -SSO -Sagemaker -SecretManager -SecureCluster -ServiceMesh -Skupper -SonarQube -Stackrox -StorageCluster -StorageSystem -Strimzi -TALM -TBD -TLS -TODO -TaskRun -Tekton -Thanos -UI -VolSync -Weaviate -Workspaces -XDG -YOLO ack +ACK acm +ACM acs +ACS activedirectory addr adhoc adm +AdoptedResource ai aiservices alongsecret +AmazonS +AmazonSageMakerFullAccess amq +Analytics +Ansible api -apiVersion apicast +APIs +apiVersion approver arg argo argocd +ArgoCD +ArgoCD's argoproj arn +ARN auth authfile +authorino +Authorino autoscale autoscaler autoscaling @@ -143,6 +41,7 @@ aws backplane belyakov bitnami +Bitnami bkoz canada cd @@ -151,70 +50,104 @@ ceph cephfs che checluster +CheCluster cicd +CICD +CIDR cli clientSecret clusterissuer clusterpolicies +ClusterPolicy clusterrolebinding +ClusterRoleBindings +ClusterTask cmd +CodeFlare +CodeReady composable conf config configmap +ConfigMap configs contrib cp cr +CRD +CRDs creds +CRs +CSS cuda +CUDA cudnn +culler +DataSciencePipelines datasource +DCGM dcgmExporter defaultRoute deployable descheduler dev +Dev devel devfile +Devfile devspaces devworkspace +DevWorkspace devworkspaces +DevWorkspaces dir disableNameSuffixHash dns +DNS dockerconfigjson +Dockerfile dotnet +DotNET ec elasticsearch env +EOF eus eventing +Eventing finalizer +FullAccess generatorOptions getsops ghcr +Gi github githubusercontent gitops +GitOps gitops-admins gmail godmode gp gpu gpus +GPUs grafana gui +Hashicorp heartexlabs homelab html htpass htpasswd +HTPasswd http httpErrorCodePages https iam +IAM idp +IgnoreExtraneous igor imageregistry inB @@ -224,38 +157,55 @@ initContainers installplan installplans io +IOV jaeger +Jaeger james jenkins +Jenkins jharmison +Jira jq json jsonpath jupyter kafka +Kafka kataconfig +KFP kiali +KieApp knative +Koku +KokuMetricsConfig +KServe kube kubeadmin kubectl kubernetes +Kubernetes kubeseal kubevirt kustomization kustomize kustomized kyverno +Kyverno labeler ldap +LDAP letsencrypt libvirt lifecycle +Lifecycle linkedin linux llm localhost +LVM +MachineConfig machineset +MachineSet managementState mariadb mastersSchedulable @@ -263,8 +213,12 @@ memberof mig minio mkdir +MLOps +ModelMesh +MTA mufg multicluster +MultiClusterHub mv na namespace @@ -272,55 +226,82 @@ namespaced namespaces newman nfd +NFD nfs +NFS +NMState nodeFeatureDiscovery noobaa +Noobaa +NuGet nvidia +Nvidia's nw +OADP oauth +OAuth +Observability oc ocp ocs +OCSInitialization +OCSInitilization odf odo ok olm +OLM oneAPI openai opendatahub +OpenDataHub openldap openshift +OpenShift opentlc openvino +OpenVINO openvinotoolkit operatorGroup +OperatorGroup operatorGroups patchesJson +pipelinerun podman +PolicyReport popd postgres pre prem prereqs priorityclass +PriorityClasses prometheus +Prometheus provisioner +Provisioner pushd +PV pvc pwd quickstart +QuickStart rahasak raj rbac +RBAC rc rcd rclone +README redhat redhat-na-ssa redistributions repo +resourceexclusion reusability rh +RHACM rhacs rhdp rhel @@ -329,14 +310,20 @@ rhoas rhods rhpds ritesh +RollingUpdate +Rollout rolloutStrategy rpardini runtime sagemaker +Sagemaker sandboxed +SAR sc sealedsecret sealedsecrets +SecretManager +SecureCluster securityContext sed seldon @@ -344,38 +331,61 @@ selectable serverless serviceaccount servicemesh +ServiceMesh sfdc sigs +Skupper +SNO +SonarQube ss ssa sshd +SSO +Stackrox statefulset storageclass storagecluster +StorageCluster +StorageSystem strimzi +Strimzi stringData stringsource subdir sublicense +TALM +TaskRun +TBD tekton +Tekton templating thanos +Thanos +TLS tmp +TODO traefik triggerer +triton txt ubi udi +UI untar untardir useable -vSphere vllm +VolSync vscode vsphere +vSphere weaviate +Weaviate whoami wip workspaces +Workspaces www +XDG yaml +YOLO diff --git a/.wordlist-sh b/.wordlist-sh new file mode 100644 index 00000000..8e0a9de8 --- /dev/null +++ b/.wordlist-sh @@ -0,0 +1,306 @@ +Aa +AAAA +aarch +acc +acks +addext +addon +adp +af +AllNamespaces +amd +apis +apiserver +applicationset +applicationsets +argocds +args +aro +ARO +aspell +awk +az +backupStorage +bak +baremetalassets +baseDomain +basename +bashrc +BASHRC +bB +blockDevices +busybox +bz +bzcat +catalogSource +catalogSourceNamespace +ce +chgrp +chmod +chroot +clustermanagementaddons +clustermanagers +CN +Containerfile +containerregistry +coreos +crd +crds +crt +CTRL +currentCSVDesc +CustomResourceDefinition +daemonsets +dcgm +defaultCertificate +defaultChannel +deployables +deviceName +df +dirname +DIRS +displayName +dl +DL +dn +dnf +dockerfiles +dport +dryrun +ebs +ecr +eE +eee +ef +egrep +elasticsearches +elif +emptydir +entrypoint +ENTRYPOINT +esac +etcd +euo +Ev +EVAL +ExecStart +ExecStop +ExitOnForwardFailure +fi +FiloSottile +finalizers +FNR +Fv +GatewayPorts +gaudi +gb +gcp +gcrane +genpass +gitconfig +groupdel +gz +gzip +hadolint +helmreleases +HighNodeUtilization +HOSTNAME +hou +httpd +iid +ingresscontrollers +initalize +installModes +installPlanApproval +InstanceId +instanceType +iops +iptables +jaegers +jaegertracing +journalctl +Jx +kam +keygen +keyout +keyset +kialis +klusterlet +KLUSTERLET +klusterletaddonconfigs +klusterlets +kmsKey +knativeservings +krew +KREW +ksh +kubeval +ln +LowNodeUtilization +LsO +MachineAutoscaler +machinesets +MAINTINAER +maistra +managedclusteractions +managedclusteraddons +managedclusterinfos +managedclustermutators +managedclusters +managedclustersetbindings +managedclustersetbindingv +managedclustersetbindingvalidators +managedclustersets +managedclustervalidators +managedclusterviews +manifestworks +manifestworkvalidators +masterPublicURL +maxReplicas +md +mikefarah +minReplicas +mirroredmanagedclusters +multiclusterengines +multiclusterhub +multiclusterhubs +multiclusterobservabilities +MultiNamespace +musl +namedCertificates +nat +nbB +ne +newkey +NGC +nN +noncore +NorthCarolina +NoSchedule +NoScoring +ns +NUM +nvme +oadp +observability +observabilityaddons +odc +onmicrosoft +oO +openssl +operatorframework +opm +Opqaue +OU +OwnNamespace +packagemanifest +packagemanifests +packageName +passwd +pem +PermitRootLogin +PID +pipefail +pki +placementbindings +placementrules +POSIX +preferredVersion +PREROUTING +printf +providerSpec +PublicDnsName +publickey +pv +py +pyspelling +qi +readme +redis +req +reqs +resourcegroup +restic +rf +RG +rollout +rsa +scaleTargetRef +SCHED +schedulable +schemas +SCHEMAS +searchcustomizations +searchoperators +ServerAliveInterval +servicemeshcontrolplanes +servingCertificate +servingCerts +sha +shellcheck +SingleNamespace +skel +sl +sL +sLfO +sLo +sourceNamespace +sS +StrictHostKeyChecking +su +subctl +subjectAltName +submarineraddon +submarinerconfigs +sudo +svc +systemctl +systemd +targetNamespaces +tcp +tkn +tls +tpm +uname +uncordon +uniq +untaint +uptime +urandom +useradd +userdel +usermod +userpreferences +usr +uuid +UUID +validatingwebhookconfigurations +validators +velero +VELERO +venv +virtctl +vmSize +volumeSize +volumeSnapshot +volumeType +vwc +vzx +WantedBy +wc +webhook +wipefs +wo +wordlist +xargs +xlarge +xvdb +xz +yamllint +yml +yq +yY +zn +ZSH +zx +zZ diff --git a/.yamllint b/.yamllint index e4ab4804..683c3a84 100644 --- a/.yamllint +++ b/.yamllint @@ -4,7 +4,7 @@ rules: document-start: disable line-length: disable comments-indentation: disable - new-line-at-end-of-file: disable + new-line-at-end-of-file: enable indentation: indent-sequences: whatever ignore: kludgeops/ diff --git a/README.md b/README.md index 80fe1564..ed5137ee 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The intention of this repository is to help support practical use of OpenShift f Please look at the [GitOps Catalog](https://github.com/redhat-cop/gitops-catalog) if you only need to automate an operator install. -In this repo, look at various [kustomized configs](components/configs) and [argo apps](components/argocd/apps) for ideas. +In this repo, look at various [kustomized configs](components/cluster-configs) and [argo apps](components/argocd/apps) for ideas. For issues with `oc apply -k` see the [known issues](#known-issues) section below. @@ -106,7 +106,7 @@ This script handles configurations that are not fully declarative, require imper ## Cherry Picking Configurations -Various [kustomized configs](components/configs) can be applied individually. +Various kustomized [app configs](components/app-configs) and [cluster configs](components/cluster-configs) can be applied individually. [Operator installs](components/operators/) can be done quickly via `oc` - similar to the [GitOps Catalog](https://github.com/redhat-cop/gitops-catalog). @@ -114,16 +114,16 @@ Various [kustomized configs](components/configs) can be applied individually. ```sh # setup htpasswd based login -oc apply -k components/configs/cluster/login/overlays/htpasswd +oc apply -k components/cluster-configs/login/overlays/htpasswd # disable self provisioner in cluster -oc apply -k components/configs/cluster/rbac/overlays/no-self-provisioner +oc apply -k components/cluster-configs/rbac/overlays/no-self-provisioner # install minio w/ minio namespace -oc apply -k components/configs/kustomized/minio/overlays/with-namespace +oc apply -k components/app-configs/minio/overlays/with-namespace # install the nfs provisioner -oc apply -k components/configs/kustomized/nfs-provisioner/overlays/default +oc apply -k components/app-configs/nfs-provisioner/overlays/default ``` Examples with operators that require CRDs @@ -195,11 +195,11 @@ until oc apply -k < path to kustomization.yaml >; do : ; done Always reference with a commit hash or tag -``` +```sh apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://github.com/redhat-na-ssa/demo-ai-gitops-catalog/components/configs/kustomized/nvidia-gpu-verification/overlays/toleration-replicas-6?ref=v0.04 + - https://github.com/redhat-na-ssa/demo-ai-gitops-catalog/components/app-configs/nvidia-gpu-verification/overlays/toleration-replicas-6?ref=v0.04 ``` ## Development @@ -232,7 +232,7 @@ scripts/lint.sh +If you have deployed a default cluster the `sandbox` [namespace](components/cluster-configs/namespaces/instance/sandbox/namespace.yaml) is useable by all [authenticated users](components/cluster-configs/namespaces/instance/sandbox/rolebinding-edit.yaml). All objects in the sandbox are [cleaned out weekly](components/cluster-configs/namespace-cleanup/overlays/sandbox/sandbox-cleanup-cj.yaml). --> ### Internal Docs diff --git a/clusters/default/kustomization.yaml b/clusters/default/kustomization.yaml index d7f1e690..45a7fb28 100644 --- a/clusters/default/kustomization.yaml +++ b/clusters/default/kustomization.yaml @@ -4,11 +4,11 @@ kind: Kustomization resources: - ../../components/operators/web-terminal/operator/overlays/fast - ../../components/operators/web-terminal/instance/overlays/enhanced -- ../../components/configs/cluster/autoscale/overlays/default -# - ../../components/configs/cluster/etcd-backup/overlays/default -# - ../../components/configs/cluster/namespace-cleanup/overlays/sandbox -- ../../components/configs/cluster/console-config/overlays/default -- ../../components/configs/cluster/console-samples -- ../../components/configs/cluster/namespaces/overlays/default -- ../../components/configs/cluster/rbac/overlays/no-self-provisioner -- ../../components/configs/kustomized/ubi-images/overlays/cluster +- ../../components/cluster-configs/autoscale/overlays/default +# - ../../components/cluster-configs/etcd-backup/overlays/default +# - ../../components/cluster-configs/namespace-cleanup/overlays/sandbox +- ../../components/cluster-configs/console-config/overlays/default +- ../../components/cluster-configs/console-samples +- ../../components/cluster-configs/namespaces/overlays/default +- ../../components/cluster-configs/rbac/overlays/no-self-provisioner +- ../../components/app-configs/ubi-images/overlays/cluster diff --git a/components/configs/kustomized/custom-notebook-images/NOTES.md b/components/app-configs/custom-notebook-images/NOTES.md similarity index 100% rename from components/configs/kustomized/custom-notebook-images/NOTES.md rename to components/app-configs/custom-notebook-images/NOTES.md diff --git a/components/configs/kustomized/custom-notebook-images/base/code-server/imagestream.yaml b/components/app-configs/custom-notebook-images/base/code-server/imagestream.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/code-server/imagestream.yaml rename to components/app-configs/custom-notebook-images/base/code-server/imagestream.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/code-server/kustomization.yaml b/components/app-configs/custom-notebook-images/base/code-server/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/code-server/kustomization.yaml rename to components/app-configs/custom-notebook-images/base/code-server/kustomization.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/kustomization.yaml b/components/app-configs/custom-notebook-images/base/kustomization.yaml similarity index 53% rename from components/configs/kustomized/custom-notebook-images/base/kustomization.yaml rename to components/app-configs/custom-notebook-images/base/kustomization.yaml index 00b67cd9..98aaf978 100644 --- a/components/configs/kustomized/custom-notebook-images/base/kustomization.yaml +++ b/components/app-configs/custom-notebook-images/base/kustomization.yaml @@ -4,11 +4,13 @@ kind: Kustomization commonAnnotations: opendatahub.io/notebook-image-creator: ai-catalog -commonLabels: - component: custom-notebook-images - # note: the following label allows the notebook to show up in the dashboard - # note: byon = bring your own notebook? - app.kubernetes.io/created-by: byon +labels: +- includeSelectors: false + pairs: + component: custom-notebook-images + # note: the following label allows the notebook to show up in the dashboard + # note: byon = bring your own notebook? + app.kubernetes.io/created-by: byon namespace: custom-notebooks diff --git a/components/configs/kustomized/custom-notebook-images/base/lightgbm/Containerfile b/components/app-configs/custom-notebook-images/base/lightgbm/Containerfile similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/lightgbm/Containerfile rename to components/app-configs/custom-notebook-images/base/lightgbm/Containerfile diff --git a/components/configs/kustomized/custom-notebook-images/base/lightgbm/Pipfile b/components/app-configs/custom-notebook-images/base/lightgbm/Pipfile similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/lightgbm/Pipfile rename to components/app-configs/custom-notebook-images/base/lightgbm/Pipfile diff --git a/components/configs/kustomized/custom-notebook-images/base/lightgbm/Pipfile.lock b/components/app-configs/custom-notebook-images/base/lightgbm/Pipfile.lock similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/lightgbm/Pipfile.lock rename to components/app-configs/custom-notebook-images/base/lightgbm/Pipfile.lock diff --git a/components/configs/kustomized/custom-notebook-images/base/lightgbm/buildconfig.yml b/components/app-configs/custom-notebook-images/base/lightgbm/buildconfig.yml similarity index 85% rename from components/configs/kustomized/custom-notebook-images/base/lightgbm/buildconfig.yml rename to components/app-configs/custom-notebook-images/base/lightgbm/buildconfig.yml index 519a7868..5c64017c 100644 --- a/components/configs/kustomized/custom-notebook-images/base/lightgbm/buildconfig.yml +++ b/components/app-configs/custom-notebook-images/base/lightgbm/buildconfig.yml @@ -17,7 +17,7 @@ spec: source: git: uri: https://github.com/redhat-na-ssa/demo-ai-gitops-catalog.git - contextDir: components/configs/kustomized/custom-notebook-images/base/lightgbm + contextDir: components/app-configs/custom-notebook-images/base/lightgbm strategy: dockerStrategy: from: @@ -27,4 +27,4 @@ spec: output: to: kind: ImageStreamTag - name: lightgbm:3.3.5 \ No newline at end of file + name: lightgbm:3.3.5 diff --git a/components/configs/kustomized/custom-notebook-images/base/lightgbm/imagestream.yml b/components/app-configs/custom-notebook-images/base/lightgbm/imagestream.yml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/lightgbm/imagestream.yml rename to components/app-configs/custom-notebook-images/base/lightgbm/imagestream.yml diff --git a/components/configs/kustomized/custom-notebook-images/base/lightgbm/kustomization.yaml b/components/app-configs/custom-notebook-images/base/lightgbm/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/lightgbm/kustomization.yaml rename to components/app-configs/custom-notebook-images/base/lightgbm/kustomization.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/namespace-rb.yaml b/components/app-configs/custom-notebook-images/base/namespace-rb.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/namespace-rb.yaml rename to components/app-configs/custom-notebook-images/base/namespace-rb.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/namespace.yaml b/components/app-configs/custom-notebook-images/base/namespace.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/namespace.yaml rename to components/app-configs/custom-notebook-images/base/namespace.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/opencv/Containerfile b/components/app-configs/custom-notebook-images/base/opencv/Containerfile similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/opencv/Containerfile rename to components/app-configs/custom-notebook-images/base/opencv/Containerfile diff --git a/components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig-graphviz.yaml b/components/app-configs/custom-notebook-images/base/opencv/buildconfig-graphviz.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig-graphviz.yaml rename to components/app-configs/custom-notebook-images/base/opencv/buildconfig-graphviz.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig.yaml b/components/app-configs/custom-notebook-images/base/opencv/buildconfig.yaml similarity index 87% rename from components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig.yaml rename to components/app-configs/custom-notebook-images/base/opencv/buildconfig.yaml index 5e354f49..f4635862 100644 --- a/components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig.yaml +++ b/components/app-configs/custom-notebook-images/base/opencv/buildconfig.yaml @@ -7,7 +7,7 @@ spec: type: Git git: uri: https://github.com/redhat-na-ssa/demo-ai-gitops-catalog.git - contextDir: components/configs/kustomized/custom-notebook-images/base/opencv + contextDir: components/app-configs/custom-notebook-images/base/opencv strategy: type: Docker dockerStrategy: diff --git a/components/configs/kustomized/custom-notebook-images/base/opencv/imagestream.yaml b/components/app-configs/custom-notebook-images/base/opencv/imagestream.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/opencv/imagestream.yaml rename to components/app-configs/custom-notebook-images/base/opencv/imagestream.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/opencv/kustomization.yaml b/components/app-configs/custom-notebook-images/base/opencv/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/opencv/kustomization.yaml rename to components/app-configs/custom-notebook-images/base/opencv/kustomization.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/rstudio/imagestream.yaml b/components/app-configs/custom-notebook-images/base/rstudio/imagestream.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/rstudio/imagestream.yaml rename to components/app-configs/custom-notebook-images/base/rstudio/imagestream.yaml diff --git a/components/configs/kustomized/custom-notebook-images/base/rstudio/kustomization.yaml b/components/app-configs/custom-notebook-images/base/rstudio/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/base/rstudio/kustomization.yaml rename to components/app-configs/custom-notebook-images/base/rstudio/kustomization.yaml diff --git a/components/configs/kustomized/custom-notebook-images/overlays/rhoai/kustomization.yaml b/components/app-configs/custom-notebook-images/overlays/rhoai/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/overlays/rhoai/kustomization.yaml rename to components/app-configs/custom-notebook-images/overlays/rhoai/kustomization.yaml diff --git a/components/configs/kustomized/generic-device-plugin/README.md b/components/app-configs/generic-device-plugin/README.md similarity index 100% rename from components/configs/kustomized/generic-device-plugin/README.md rename to components/app-configs/generic-device-plugin/README.md diff --git a/components/configs/kustomized/generic-device-plugin/base/kustomization.yaml b/components/app-configs/generic-device-plugin/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/generic-device-plugin/base/kustomization.yaml rename to components/app-configs/generic-device-plugin/base/kustomization.yaml diff --git a/components/configs/kustomized/generic-device-plugin/base/namespace.yaml b/components/app-configs/generic-device-plugin/base/namespace.yaml similarity index 100% rename from components/configs/kustomized/generic-device-plugin/base/namespace.yaml rename to components/app-configs/generic-device-plugin/base/namespace.yaml diff --git a/components/configs/kustomized/generic-device-plugin/base/rolebinding.yaml b/components/app-configs/generic-device-plugin/base/rolebinding.yaml similarity index 100% rename from components/configs/kustomized/generic-device-plugin/base/rolebinding.yaml rename to components/app-configs/generic-device-plugin/base/rolebinding.yaml diff --git a/components/configs/kustomized/generic-device-plugin/base/scc.yaml b/components/app-configs/generic-device-plugin/base/scc.yaml similarity index 99% rename from components/configs/kustomized/generic-device-plugin/base/scc.yaml rename to components/app-configs/generic-device-plugin/base/scc.yaml index 6806fdc4..b6872571 100644 --- a/components/configs/kustomized/generic-device-plugin/base/scc.yaml +++ b/components/app-configs/generic-device-plugin/base/scc.yaml @@ -42,4 +42,4 @@ volumes: - ephemeral - hostPath - projected -- secret \ No newline at end of file +- secret diff --git a/components/configs/kustomized/generic-device-plugin/overlays/basic/kustomization.yaml b/components/app-configs/generic-device-plugin/overlays/basic/kustomization.yaml similarity index 100% rename from components/configs/kustomized/generic-device-plugin/overlays/basic/kustomization.yaml rename to components/app-configs/generic-device-plugin/overlays/basic/kustomization.yaml diff --git a/components/configs/kustomized/generic-device-plugin/overlays/default/kustomization.yaml b/components/app-configs/generic-device-plugin/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/generic-device-plugin/overlays/default/kustomization.yaml rename to components/app-configs/generic-device-plugin/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/generic-device-plugin/overlays/logitec-c920/kustomization.yaml b/components/app-configs/generic-device-plugin/overlays/logitec-c920/kustomization.yaml similarity index 100% rename from components/configs/kustomized/generic-device-plugin/overlays/logitec-c920/kustomization.yaml rename to components/app-configs/generic-device-plugin/overlays/logitec-c920/kustomization.yaml diff --git a/components/configs/kustomized/generic-device-plugin/overlays/tpm/kustomization.yaml b/components/app-configs/generic-device-plugin/overlays/tpm/kustomization.yaml similarity index 100% rename from components/configs/kustomized/generic-device-plugin/overlays/tpm/kustomization.yaml rename to components/app-configs/generic-device-plugin/overlays/tpm/kustomization.yaml diff --git a/components/configs/kustomized/generic-device-plugin/overlays/tpm/pod.yaml b/components/app-configs/generic-device-plugin/overlays/tpm/pod.yaml similarity index 89% rename from components/configs/kustomized/generic-device-plugin/overlays/tpm/pod.yaml rename to components/app-configs/generic-device-plugin/overlays/tpm/pod.yaml index d52123bf..878fc2a2 100644 --- a/components/configs/kustomized/generic-device-plugin/overlays/tpm/pod.yaml +++ b/components/app-configs/generic-device-plugin/overlays/tpm/pod.yaml @@ -11,4 +11,4 @@ spec: - infinity resources: limits: - devices.custom.io/tpm: 1 \ No newline at end of file + devices.custom.io/tpm: 1 diff --git a/components/configs/kustomized/image-puller/base/ds.yaml b/components/app-configs/image-puller/base/ds.yaml similarity index 95% rename from components/configs/kustomized/image-puller/base/ds.yaml rename to components/app-configs/image-puller/base/ds.yaml index 6dfa7cd9..f24b4ad6 100644 --- a/components/configs/kustomized/image-puller/base/ds.yaml +++ b/components/app-configs/image-puller/base/ds.yaml @@ -25,4 +25,4 @@ spec: memory: 20Mi requests: cpu: 10m - memory: 10Mi \ No newline at end of file + memory: 10Mi diff --git a/components/configs/kustomized/image-puller/base/kustomization.yaml b/components/app-configs/image-puller/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/image-puller/base/kustomization.yaml rename to components/app-configs/image-puller/base/kustomization.yaml diff --git a/components/configs/cluster/etcd-backup/overlays/default/kustomization.yaml b/components/app-configs/image-puller/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/cluster/etcd-backup/overlays/default/kustomization.yaml rename to components/app-configs/image-puller/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/image-puller/overlays/example/kustomization.yaml b/components/app-configs/image-puller/overlays/example/kustomization.yaml similarity index 100% rename from components/configs/kustomized/image-puller/overlays/example/kustomization.yaml rename to components/app-configs/image-puller/overlays/example/kustomization.yaml diff --git a/components/configs/kustomized/image-puller/overlays/example/namespace.yaml b/components/app-configs/image-puller/overlays/example/namespace.yaml similarity index 100% rename from components/configs/kustomized/image-puller/overlays/example/namespace.yaml rename to components/app-configs/image-puller/overlays/example/namespace.yaml diff --git a/components/configs/kustomized/kafka/base/edit-rolebinding.yaml b/components/app-configs/kafka/base/edit-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/kafka/base/edit-rolebinding.yaml rename to components/app-configs/kafka/base/edit-rolebinding.yaml diff --git a/components/configs/kustomized/kafka/base/kafka-cluster-config.yaml b/components/app-configs/kafka/base/kafka-cluster-config.yaml similarity index 100% rename from components/configs/kustomized/kafka/base/kafka-cluster-config.yaml rename to components/app-configs/kafka/base/kafka-cluster-config.yaml diff --git a/components/configs/kustomized/kafka/base/kustomization.yaml b/components/app-configs/kafka/base/kustomization.yaml similarity index 88% rename from components/configs/kustomized/kafka/base/kustomization.yaml rename to components/app-configs/kafka/base/kustomization.yaml index c80b0502..bfbaf65b 100644 --- a/components/configs/kustomized/kafka/base/kustomization.yaml +++ b/components/app-configs/kafka/base/kustomization.yaml @@ -6,4 +6,4 @@ namespace: kafka resources: - edit-rolebinding.yaml - kafka-cluster-config.yaml - - namespace.yaml \ No newline at end of file + - namespace.yaml diff --git a/components/configs/kustomized/kafka/base/namespace.yaml b/components/app-configs/kafka/base/namespace.yaml similarity index 100% rename from components/configs/kustomized/kafka/base/namespace.yaml rename to components/app-configs/kafka/base/namespace.yaml diff --git a/components/configs/cluster/autoscale/overlays/default/kustomization.yaml b/components/app-configs/kafka/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/cluster/autoscale/overlays/default/kustomization.yaml rename to components/app-configs/kafka/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/kafka/overlays/kafdrop/app-kafdrop.yaml b/components/app-configs/kafka/overlays/kafdrop/app-kafdrop.yaml similarity index 100% rename from components/configs/kustomized/kafka/overlays/kafdrop/app-kafdrop.yaml rename to components/app-configs/kafka/overlays/kafdrop/app-kafdrop.yaml diff --git a/components/configs/kustomized/kafka/overlays/kafdrop/kafdrop-route.yaml b/components/app-configs/kafka/overlays/kafdrop/kafdrop-route.yaml similarity index 100% rename from components/configs/kustomized/kafka/overlays/kafdrop/kafdrop-route.yaml rename to components/app-configs/kafka/overlays/kafdrop/kafdrop-route.yaml diff --git a/components/configs/kustomized/kafka/overlays/kafdrop/kustomization.yaml b/components/app-configs/kafka/overlays/kafdrop/kustomization.yaml similarity index 100% rename from components/configs/kustomized/kafka/overlays/kafdrop/kustomization.yaml rename to components/app-configs/kafka/overlays/kafdrop/kustomization.yaml diff --git a/components/configs/kustomized/label-studio/base/bc-patch.yaml b/components/app-configs/label-studio/base/bc-patch.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/bc-patch.yaml rename to components/app-configs/label-studio/base/bc-patch.yaml diff --git a/components/configs/kustomized/label-studio/base/bc-s2i.yaml b/components/app-configs/label-studio/base/bc-s2i.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/bc-s2i.yaml rename to components/app-configs/label-studio/base/bc-s2i.yaml diff --git a/components/configs/kustomized/label-studio/base/db-deploy.yaml b/components/app-configs/label-studio/base/db-deploy.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/db-deploy.yaml rename to components/app-configs/label-studio/base/db-deploy.yaml diff --git a/components/configs/kustomized/label-studio/base/db-pvc.yaml b/components/app-configs/label-studio/base/db-pvc.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/db-pvc.yaml rename to components/app-configs/label-studio/base/db-pvc.yaml diff --git a/components/configs/kustomized/label-studio/base/db-secret.yaml b/components/app-configs/label-studio/base/db-secret.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/db-secret.yaml rename to components/app-configs/label-studio/base/db-secret.yaml diff --git a/components/configs/kustomized/label-studio/base/db-svc.yaml b/components/app-configs/label-studio/base/db-svc.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/db-svc.yaml rename to components/app-configs/label-studio/base/db-svc.yaml diff --git a/components/configs/kustomized/label-studio/base/deploy-patch.yaml b/components/app-configs/label-studio/base/deploy-patch.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/deploy-patch.yaml rename to components/app-configs/label-studio/base/deploy-patch.yaml diff --git a/components/configs/kustomized/label-studio/base/deploy-sqlite.yaml b/components/app-configs/label-studio/base/deploy-sqlite.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/deploy-sqlite.yaml rename to components/app-configs/label-studio/base/deploy-sqlite.yaml diff --git a/components/configs/kustomized/label-studio/base/deploy.yaml b/components/app-configs/label-studio/base/deploy.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/deploy.yaml rename to components/app-configs/label-studio/base/deploy.yaml diff --git a/components/configs/kustomized/label-studio/base/is.yaml b/components/app-configs/label-studio/base/is.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/is.yaml rename to components/app-configs/label-studio/base/is.yaml diff --git a/components/app-configs/label-studio/base/kustomization.yaml b/components/app-configs/label-studio/base/kustomization.yaml new file mode 100644 index 00000000..4a930cea --- /dev/null +++ b/components/app-configs/label-studio/base/kustomization.yaml @@ -0,0 +1,25 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +labels: +- includeSelectors: false + pairs: + component: label-studio + # app.kubernetes.io/component: label-studio + # app.kubernetes.io/instance: label-studio + # app.kubernetes.io/name: label-studio + # app.kubernetes.io/part-of: label-studio + +resources: +# - bc-patch.yaml +- bc-s2i.yaml +- db-deploy.yaml +- db-pvc.yaml +- db-secret.yaml +- db-svc.yaml +# - deploy-patch.yaml +- deploy.yaml +- is.yaml +- pvc.yaml +- route.yaml +- svc.yaml diff --git a/components/configs/kustomized/label-studio/base/pvc.yaml b/components/app-configs/label-studio/base/pvc.yaml similarity index 86% rename from components/configs/kustomized/label-studio/base/pvc.yaml rename to components/app-configs/label-studio/base/pvc.yaml index c5c8c527..d1529f70 100644 --- a/components/configs/kustomized/label-studio/base/pvc.yaml +++ b/components/app-configs/label-studio/base/pvc.yaml @@ -8,4 +8,4 @@ spec: resources: requests: storage: 1Gi - volumeMode: Filesystem \ No newline at end of file + volumeMode: Filesystem diff --git a/components/configs/kustomized/label-studio/base/route.yaml b/components/app-configs/label-studio/base/route.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/route.yaml rename to components/app-configs/label-studio/base/route.yaml diff --git a/components/configs/kustomized/label-studio/base/svc.yaml b/components/app-configs/label-studio/base/svc.yaml similarity index 100% rename from components/configs/kustomized/label-studio/base/svc.yaml rename to components/app-configs/label-studio/base/svc.yaml diff --git a/components/configs/kustomized/label-studio/container/patch/Dockerfile b/components/app-configs/label-studio/container/patch/Dockerfile similarity index 95% rename from components/configs/kustomized/label-studio/container/patch/Dockerfile rename to components/app-configs/label-studio/container/patch/Dockerfile index 5ce4ad09..d5ee646e 100644 --- a/components/configs/kustomized/label-studio/container/patch/Dockerfile +++ b/components/app-configs/label-studio/container/patch/Dockerfile @@ -3,6 +3,7 @@ FROM docker.io/heartexlabs/label-studio:ubi_latest ENV DEBUG=true # update: label-studio version +# hadolint ignore=DL3013 RUN pip install --no-cache-dir -U \ label-studio pip diff --git a/components/configs/kustomized/label-studio/container/patch/README.md b/components/app-configs/label-studio/container/patch/README.md similarity index 100% rename from components/configs/kustomized/label-studio/container/patch/README.md rename to components/app-configs/label-studio/container/patch/README.md diff --git a/components/configs/kustomized/label-studio/container/s2i/.s2i/bin/assemble b/components/app-configs/label-studio/container/s2i/.s2i/bin/assemble similarity index 100% rename from components/configs/kustomized/label-studio/container/s2i/.s2i/bin/assemble rename to components/app-configs/label-studio/container/s2i/.s2i/bin/assemble diff --git a/components/configs/kustomized/label-studio/container/s2i/.s2i/bin/run b/components/app-configs/label-studio/container/s2i/.s2i/bin/run similarity index 100% rename from components/configs/kustomized/label-studio/container/s2i/.s2i/bin/run rename to components/app-configs/label-studio/container/s2i/.s2i/bin/run diff --git a/components/configs/kustomized/label-studio/container/s2i/.s2i/environment b/components/app-configs/label-studio/container/s2i/.s2i/environment similarity index 100% rename from components/configs/kustomized/label-studio/container/s2i/.s2i/environment rename to components/app-configs/label-studio/container/s2i/.s2i/environment diff --git a/components/configs/kustomized/label-studio/container/s2i/Dockerfile b/components/app-configs/label-studio/container/s2i/Dockerfile similarity index 90% rename from components/configs/kustomized/label-studio/container/s2i/Dockerfile rename to components/app-configs/label-studio/container/s2i/Dockerfile index b94f1ff4..c9c29320 100644 --- a/components/configs/kustomized/label-studio/container/s2i/Dockerfile +++ b/components/app-configs/label-studio/container/s2i/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/python-39 +FROM registry.access.redhat.com/ubi8/python-311 ENV LS_DIR=/opt/app-root/src \ HOME=/opt/app-root/src @@ -7,6 +7,8 @@ WORKDIR ${LS_DIR} # copy and install dependencies COPY --chown=1001:0 requirements.txt . + +# hadolint ignore=DL3013 RUN pip3 install --no-cache-dir -U pip setuptools wheel && \ pip3 install --no-cache-dir -r requirements.txt diff --git a/components/configs/kustomized/label-studio/container/s2i/Dockerfile.ubi b/components/app-configs/label-studio/container/s2i/Dockerfile.ubi similarity index 100% rename from components/configs/kustomized/label-studio/container/s2i/Dockerfile.ubi rename to components/app-configs/label-studio/container/s2i/Dockerfile.ubi diff --git a/components/configs/kustomized/label-studio/container/s2i/entrypoint.sh b/components/app-configs/label-studio/container/s2i/entrypoint.sh similarity index 100% rename from components/configs/kustomized/label-studio/container/s2i/entrypoint.sh rename to components/app-configs/label-studio/container/s2i/entrypoint.sh diff --git a/components/configs/kustomized/label-studio/container/s2i/requirements.txt b/components/app-configs/label-studio/container/s2i/requirements.txt similarity index 100% rename from components/configs/kustomized/label-studio/container/s2i/requirements.txt rename to components/app-configs/label-studio/container/s2i/requirements.txt diff --git a/components/configs/kustomized/label-studio/overlays/default/kustomization.yaml b/components/app-configs/label-studio/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/label-studio/overlays/default/kustomization.yaml rename to components/app-configs/label-studio/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/label-studio/overlays/default/namespace.yaml b/components/app-configs/label-studio/overlays/default/namespace.yaml similarity index 100% rename from components/configs/kustomized/label-studio/overlays/default/namespace.yaml rename to components/app-configs/label-studio/overlays/default/namespace.yaml diff --git a/components/configs/kustomized/label-studio/overlays/flyingthings/kustomization.yaml b/components/app-configs/label-studio/overlays/flyingthings/kustomization.yaml similarity index 100% rename from components/configs/kustomized/label-studio/overlays/flyingthings/kustomization.yaml rename to components/app-configs/label-studio/overlays/flyingthings/kustomization.yaml diff --git a/components/configs/kustomized/label-studio/overlays/flyingthings/patch-deployment.yaml b/components/app-configs/label-studio/overlays/flyingthings/patch-deployment.yaml similarity index 100% rename from components/configs/kustomized/label-studio/overlays/flyingthings/patch-deployment.yaml rename to components/app-configs/label-studio/overlays/flyingthings/patch-deployment.yaml diff --git a/components/configs/kustomized/ldap-sync/base/cronjob.yaml b/components/app-configs/ldap-sync/base/cronjob.yaml similarity index 100% rename from components/configs/kustomized/ldap-sync/base/cronjob.yaml rename to components/app-configs/ldap-sync/base/cronjob.yaml diff --git a/components/configs/kustomized/ldap-sync/base/kustomization.yaml b/components/app-configs/ldap-sync/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/ldap-sync/base/kustomization.yaml rename to components/app-configs/ldap-sync/base/kustomization.yaml diff --git a/components/configs/kustomized/ldap-sync/base/ldap-bind-secret.yaml b/components/app-configs/ldap-sync/base/ldap-bind-secret.yaml similarity index 100% rename from components/configs/kustomized/ldap-sync/base/ldap-bind-secret.yaml rename to components/app-configs/ldap-sync/base/ldap-bind-secret.yaml diff --git a/components/configs/kustomized/ldap-sync/base/ldap-group-secret.yaml b/components/app-configs/ldap-sync/base/ldap-group-secret.yaml similarity index 97% rename from components/configs/kustomized/ldap-sync/base/ldap-group-secret.yaml rename to components/app-configs/ldap-sync/base/ldap-group-secret.yaml index a5517aba..65662931 100644 --- a/components/configs/kustomized/ldap-sync/base/ldap-group-secret.yaml +++ b/components/app-configs/ldap-sync/base/ldap-group-secret.yaml @@ -36,4 +36,4 @@ stringData: CN=OCP-Users,OU=Groups,DC=demo,DC=openshift,DC=pub ca.crt: | -----BEGIN CERTIFICATE----- - -----END CERTIFICATE----- \ No newline at end of file + -----END CERTIFICATE----- diff --git a/components/configs/kustomized/ldap-sync/base/namespace.yaml b/components/app-configs/ldap-sync/base/namespace.yaml similarity index 100% rename from components/configs/kustomized/ldap-sync/base/namespace.yaml rename to components/app-configs/ldap-sync/base/namespace.yaml diff --git a/components/configs/kustomized/ldap-sync/base/rbac.yaml b/components/app-configs/ldap-sync/base/rbac.yaml similarity index 95% rename from components/configs/kustomized/ldap-sync/base/rbac.yaml rename to components/app-configs/ldap-sync/base/rbac.yaml index a4efdd9f..f4eeb871 100644 --- a/components/configs/kustomized/ldap-sync/base/rbac.yaml +++ b/components/app-configs/ldap-sync/base/rbac.yaml @@ -32,4 +32,4 @@ subjects: roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ldap-group-sync \ No newline at end of file + name: ldap-group-sync diff --git a/components/configs/kustomized/image-puller/overlays/default/kustomization.yaml b/components/app-configs/ldap-sync/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/image-puller/overlays/default/kustomization.yaml rename to components/app-configs/ldap-sync/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/minio/base/data-connector-rb.yaml b/components/app-configs/minio/base/data-connector-rb.yaml similarity index 100% rename from components/configs/kustomized/minio/base/data-connector-rb.yaml rename to components/app-configs/minio/base/data-connector-rb.yaml diff --git a/components/configs/kustomized/minio/base/deployment.yaml b/components/app-configs/minio/base/deployment.yaml similarity index 100% rename from components/configs/kustomized/minio/base/deployment.yaml rename to components/app-configs/minio/base/deployment.yaml diff --git a/components/configs/kustomized/minio/base/job-setup-root-user.yaml b/components/app-configs/minio/base/job-setup-root-user.yaml similarity index 100% rename from components/configs/kustomized/minio/base/job-setup-root-user.yaml rename to components/app-configs/minio/base/job-setup-root-user.yaml diff --git a/components/configs/kustomized/minio/base/job.sh b/components/app-configs/minio/base/job.sh similarity index 100% rename from components/configs/kustomized/minio/base/job.sh rename to components/app-configs/minio/base/job.sh diff --git a/components/configs/kustomized/minio/base/job.yaml b/components/app-configs/minio/base/job.yaml similarity index 100% rename from components/configs/kustomized/minio/base/job.yaml rename to components/app-configs/minio/base/job.yaml diff --git a/components/configs/kustomized/minio/base/kustomization.yaml b/components/app-configs/minio/base/kustomization.yaml similarity index 59% rename from components/configs/kustomized/minio/base/kustomization.yaml rename to components/app-configs/minio/base/kustomization.yaml index 20287a24..7f6a1727 100644 --- a/components/configs/kustomized/minio/base/kustomization.yaml +++ b/components/app-configs/minio/base/kustomization.yaml @@ -1,12 +1,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - component: minio - # app.kubernetes.io/component: minio - # app.kubernetes.io/instance: minio - # app.kubernetes.io/name: minio - # app.kubernetes.io/part-of: minio +labels: +- includeSelectors: false + pairs: + component: minio + # app.kubernetes.io/component: minio + # app.kubernetes.io/instance: minio + # app.kubernetes.io/name: minio + # app.kubernetes.io/part-of: minio generatorOptions: disableNameSuffixHash: true diff --git a/components/configs/kustomized/minio/base/link-minio.yaml b/components/app-configs/minio/base/link-minio.yaml similarity index 100% rename from components/configs/kustomized/minio/base/link-minio.yaml rename to components/app-configs/minio/base/link-minio.yaml diff --git a/components/configs/kustomized/minio/base/pvc.yaml b/components/app-configs/minio/base/pvc.yaml similarity index 100% rename from components/configs/kustomized/minio/base/pvc.yaml rename to components/app-configs/minio/base/pvc.yaml diff --git a/components/configs/kustomized/minio/base/route.yaml b/components/app-configs/minio/base/route.yaml similarity index 100% rename from components/configs/kustomized/minio/base/route.yaml rename to components/app-configs/minio/base/route.yaml diff --git a/components/configs/kustomized/minio/base/service.yaml b/components/app-configs/minio/base/service.yaml similarity index 100% rename from components/configs/kustomized/minio/base/service.yaml rename to components/app-configs/minio/base/service.yaml diff --git a/components/configs/kustomized/ldap-sync/overlays/default/kustomization.yaml b/components/app-configs/minio/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/ldap-sync/overlays/default/kustomization.yaml rename to components/app-configs/minio/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/minio/overlays/known-password/exclude-job.yaml b/components/app-configs/minio/overlays/known-password/exclude-job.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/known-password/exclude-job.yaml rename to components/app-configs/minio/overlays/known-password/exclude-job.yaml diff --git a/components/configs/kustomized/minio/overlays/known-password/exclude-rb-connect.yaml b/components/app-configs/minio/overlays/known-password/exclude-rb-connect.yaml similarity index 73% rename from components/configs/kustomized/minio/overlays/known-password/exclude-rb-connect.yaml rename to components/app-configs/minio/overlays/known-password/exclude-rb-connect.yaml index de022a2d..0e289292 100644 --- a/components/configs/kustomized/minio/overlays/known-password/exclude-rb-connect.yaml +++ b/components/app-configs/minio/overlays/known-password/exclude-rb-connect.yaml @@ -2,4 +2,4 @@ $patch: delete apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: data-connection-setup \ No newline at end of file + name: data-connection-setup diff --git a/components/configs/kustomized/minio/overlays/known-password/exclude-rb-secret.yaml b/components/app-configs/minio/overlays/known-password/exclude-rb-secret.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/known-password/exclude-rb-secret.yaml rename to components/app-configs/minio/overlays/known-password/exclude-rb-secret.yaml diff --git a/components/configs/kustomized/minio/overlays/known-password/exclude-sa.yaml b/components/app-configs/minio/overlays/known-password/exclude-sa.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/known-password/exclude-sa.yaml rename to components/app-configs/minio/overlays/known-password/exclude-sa.yaml diff --git a/components/configs/kustomized/minio/overlays/known-password/kustomization.yaml b/components/app-configs/minio/overlays/known-password/kustomization.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/known-password/kustomization.yaml rename to components/app-configs/minio/overlays/known-password/kustomization.yaml diff --git a/components/configs/kustomized/minio/overlays/known-password/secret.yaml b/components/app-configs/minio/overlays/known-password/secret.yaml similarity index 78% rename from components/configs/kustomized/minio/overlays/known-password/secret.yaml rename to components/app-configs/minio/overlays/known-password/secret.yaml index 74362795..227f5a51 100644 --- a/components/configs/kustomized/minio/overlays/known-password/secret.yaml +++ b/components/app-configs/minio/overlays/known-password/secret.yaml @@ -6,4 +6,4 @@ metadata: type: Opqaue stringData: MINIO_ROOT_USER: minioadmin - MINIO_ROOT_PASSWORD: minioadmin \ No newline at end of file + MINIO_ROOT_PASSWORD: minioadmin diff --git a/components/configs/kustomized/minio/overlays/with-namespace-known-password/kustomization.yaml b/components/app-configs/minio/overlays/with-namespace-known-password/kustomization.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/with-namespace-known-password/kustomization.yaml rename to components/app-configs/minio/overlays/with-namespace-known-password/kustomization.yaml diff --git a/components/configs/kustomized/minio/overlays/with-namespace-known-password/namespace.yaml b/components/app-configs/minio/overlays/with-namespace-known-password/namespace.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/with-namespace-known-password/namespace.yaml rename to components/app-configs/minio/overlays/with-namespace-known-password/namespace.yaml diff --git a/components/configs/kustomized/minio/overlays/with-namespace/kustomization.yaml b/components/app-configs/minio/overlays/with-namespace/kustomization.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/with-namespace/kustomization.yaml rename to components/app-configs/minio/overlays/with-namespace/kustomization.yaml diff --git a/components/configs/kustomized/minio/overlays/with-namespace/namespace.yaml b/components/app-configs/minio/overlays/with-namespace/namespace.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/with-namespace/namespace.yaml rename to components/app-configs/minio/overlays/with-namespace/namespace.yaml diff --git a/components/configs/kustomized/nfs-provisioner/README.md b/components/app-configs/nfs-provisioner/README.md similarity index 100% rename from components/configs/kustomized/nfs-provisioner/README.md rename to components/app-configs/nfs-provisioner/README.md diff --git a/components/configs/kustomized/nfs-provisioner/base/kustomization.yaml b/components/app-configs/nfs-provisioner/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/nfs-provisioner/base/kustomization.yaml rename to components/app-configs/nfs-provisioner/base/kustomization.yaml diff --git a/components/configs/kustomized/nfs-provisioner/base/namespace.yaml b/components/app-configs/nfs-provisioner/base/namespace.yaml similarity index 100% rename from components/configs/kustomized/nfs-provisioner/base/namespace.yaml rename to components/app-configs/nfs-provisioner/base/namespace.yaml diff --git a/components/configs/kustomized/nfs-provisioner/base/scc-custom.yaml b/components/app-configs/nfs-provisioner/base/scc-custom.yaml similarity index 100% rename from components/configs/kustomized/nfs-provisioner/base/scc-custom.yaml rename to components/app-configs/nfs-provisioner/base/scc-custom.yaml diff --git a/components/configs/kustomized/nfs-provisioner/base/scc.yaml b/components/app-configs/nfs-provisioner/base/scc.yaml similarity index 100% rename from components/configs/kustomized/nfs-provisioner/base/scc.yaml rename to components/app-configs/nfs-provisioner/base/scc.yaml diff --git a/components/configs/kustomized/minio/overlays/default/kustomization.yaml b/components/app-configs/nfs-provisioner/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/minio/overlays/default/kustomization.yaml rename to components/app-configs/nfs-provisioner/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/nfs-provisioner/test/kustomization.yaml b/components/app-configs/nfs-provisioner/test/kustomization.yaml similarity index 100% rename from components/configs/kustomized/nfs-provisioner/test/kustomization.yaml rename to components/app-configs/nfs-provisioner/test/kustomization.yaml diff --git a/components/configs/kustomized/nfs-provisioner/test/pod.yaml b/components/app-configs/nfs-provisioner/test/pod.yaml similarity index 93% rename from components/configs/kustomized/nfs-provisioner/test/pod.yaml rename to components/app-configs/nfs-provisioner/test/pod.yaml index 09d0abb7..2afc28f1 100644 --- a/components/configs/kustomized/nfs-provisioner/test/pod.yaml +++ b/components/app-configs/nfs-provisioner/test/pod.yaml @@ -19,4 +19,4 @@ spec: volumes: - name: nfs-pvc persistentVolumeClaim: - claimName: test-nfs \ No newline at end of file + claimName: test-nfs diff --git a/components/configs/kustomized/nfs-provisioner/test/pvc.yaml b/components/app-configs/nfs-provisioner/test/pvc.yaml similarity index 90% rename from components/configs/kustomized/nfs-provisioner/test/pvc.yaml rename to components/app-configs/nfs-provisioner/test/pvc.yaml index 350fbfe1..01159ecb 100644 --- a/components/configs/kustomized/nfs-provisioner/test/pvc.yaml +++ b/components/app-configs/nfs-provisioner/test/pvc.yaml @@ -9,4 +9,4 @@ spec: - ReadWriteMany resources: requests: - storage: 1Mi \ No newline at end of file + storage: 1Mi diff --git a/components/configs/kustomized/nfs-static/README.md b/components/app-configs/nfs-static/README.md similarity index 100% rename from components/configs/kustomized/nfs-static/README.md rename to components/app-configs/nfs-static/README.md diff --git a/components/configs/kustomized/nfs-static/base/kustomization.yaml b/components/app-configs/nfs-static/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/nfs-static/base/kustomization.yaml rename to components/app-configs/nfs-static/base/kustomization.yaml diff --git a/components/configs/kustomized/nfs-static/base/pv.yaml b/components/app-configs/nfs-static/base/pv.yaml similarity index 100% rename from components/configs/kustomized/nfs-static/base/pv.yaml rename to components/app-configs/nfs-static/base/pv.yaml diff --git a/components/configs/kustomized/nfs-static/base/sc.yaml b/components/app-configs/nfs-static/base/sc.yaml similarity index 100% rename from components/configs/kustomized/nfs-static/base/sc.yaml rename to components/app-configs/nfs-static/base/sc.yaml diff --git a/components/configs/kustomized/nfs-static/nfs_static.sh b/components/app-configs/nfs-static/nfs_static.sh similarity index 100% rename from components/configs/kustomized/nfs-static/nfs_static.sh rename to components/app-configs/nfs-static/nfs_static.sh diff --git a/components/configs/kustomized/nfs-provisioner/overlays/default/kustomization.yaml b/components/app-configs/nfs-static/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/nfs-provisioner/overlays/default/kustomization.yaml rename to components/app-configs/nfs-static/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/nfs-static/test/kustomization.yaml b/components/app-configs/nfs-static/test/kustomization.yaml similarity index 100% rename from components/configs/kustomized/nfs-static/test/kustomization.yaml rename to components/app-configs/nfs-static/test/kustomization.yaml diff --git a/components/configs/kustomized/nfs-static/test/pod.yaml b/components/app-configs/nfs-static/test/pod.yaml similarity index 92% rename from components/configs/kustomized/nfs-static/test/pod.yaml rename to components/app-configs/nfs-static/test/pod.yaml index 4cd2c49f..53482748 100644 --- a/components/configs/kustomized/nfs-static/test/pod.yaml +++ b/components/app-configs/nfs-static/test/pod.yaml @@ -19,4 +19,4 @@ spec: volumes: - name: nfs-pvc persistentVolumeClaim: - claimName: test-nfs-static \ No newline at end of file + claimName: test-nfs-static diff --git a/components/configs/kustomized/nfs-static/test/pvc.yaml b/components/app-configs/nfs-static/test/pvc.yaml similarity index 90% rename from components/configs/kustomized/nfs-static/test/pvc.yaml rename to components/app-configs/nfs-static/test/pvc.yaml index 1d1ea8f2..6b1e7087 100644 --- a/components/configs/kustomized/nfs-static/test/pvc.yaml +++ b/components/app-configs/nfs-static/test/pvc.yaml @@ -9,4 +9,4 @@ spec: - ReadWriteMany resources: requests: - storage: 1Mi \ No newline at end of file + storage: 1Mi diff --git a/components/configs/kustomized/nvidia-gpu-verification/base/deployment.yaml b/components/app-configs/nvidia-gpu-verification/base/deployment.yaml similarity index 100% rename from components/configs/kustomized/nvidia-gpu-verification/base/deployment.yaml rename to components/app-configs/nvidia-gpu-verification/base/deployment.yaml diff --git a/components/configs/kustomized/nvidia-gpu-verification/base/kustomization.yaml b/components/app-configs/nvidia-gpu-verification/base/kustomization.yaml similarity index 58% rename from components/configs/kustomized/nvidia-gpu-verification/base/kustomization.yaml rename to components/app-configs/nvidia-gpu-verification/base/kustomization.yaml index e3ab02ae..71be388b 100644 --- a/components/configs/kustomized/nvidia-gpu-verification/base/kustomization.yaml +++ b/components/app-configs/nvidia-gpu-verification/base/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - app: nvidia-gpu-verification +labels: +- includeSelectors: false + pairs: + app: nvidia-gpu-verification resources: - deployment.yaml diff --git a/components/configs/kustomized/nvidia-gpu-verification/base/pod.yaml b/components/app-configs/nvidia-gpu-verification/base/pod.yaml similarity index 91% rename from components/configs/kustomized/nvidia-gpu-verification/base/pod.yaml rename to components/app-configs/nvidia-gpu-verification/base/pod.yaml index d228c466..00f26621 100644 --- a/components/configs/kustomized/nvidia-gpu-verification/base/pod.yaml +++ b/components/app-configs/nvidia-gpu-verification/base/pod.yaml @@ -11,4 +11,4 @@ spec: image: "nvcr.io/nvidia/k8s/cuda-sample:vectoradd-cuda11.7.1-ubuntu20.04" resources: limits: - nvidia.com/gpu: 1 \ No newline at end of file + nvidia.com/gpu: 1 diff --git a/components/configs/kustomized/nvidia-gpu-verification/overlays/default/kustomization.yaml b/components/app-configs/nvidia-gpu-verification/overlays/default/kustomization.yaml similarity index 88% rename from components/configs/kustomized/nvidia-gpu-verification/overlays/default/kustomization.yaml rename to components/app-configs/nvidia-gpu-verification/overlays/default/kustomization.yaml index 5eabc5e2..c2b75c2b 100644 --- a/components/configs/kustomized/nvidia-gpu-verification/overlays/default/kustomization.yaml +++ b/components/app-configs/nvidia-gpu-verification/overlays/default/kustomization.yaml @@ -5,4 +5,4 @@ namespace: nvidia-gpu-verification resources: - ../../base -- namespace.yaml \ No newline at end of file +- namespace.yaml diff --git a/components/configs/kustomized/nvidia-gpu-verification/overlays/default/namespace.yaml b/components/app-configs/nvidia-gpu-verification/overlays/default/namespace.yaml similarity index 79% rename from components/configs/kustomized/nvidia-gpu-verification/overlays/default/namespace.yaml rename to components/app-configs/nvidia-gpu-verification/overlays/default/namespace.yaml index b9d9de5d..4637adc0 100644 --- a/components/configs/kustomized/nvidia-gpu-verification/overlays/default/namespace.yaml +++ b/components/app-configs/nvidia-gpu-verification/overlays/default/namespace.yaml @@ -5,4 +5,4 @@ metadata: name: nvidia-gpu-verification annotations: openshift.io/display-name: "NVIDIA GPU Verification" - argocd.argoproj.io/sync-wave: "0" \ No newline at end of file + argocd.argoproj.io/sync-wave: "0" diff --git a/components/configs/kustomized/nvidia-gpu-verification/overlays/one-shot/delete-deployment.yaml b/components/app-configs/nvidia-gpu-verification/overlays/one-shot/delete-deployment.yaml similarity index 100% rename from components/configs/kustomized/nvidia-gpu-verification/overlays/one-shot/delete-deployment.yaml rename to components/app-configs/nvidia-gpu-verification/overlays/one-shot/delete-deployment.yaml diff --git a/components/configs/kustomized/nvidia-gpu-verification/overlays/one-shot/kustomization.yaml b/components/app-configs/nvidia-gpu-verification/overlays/one-shot/kustomization.yaml similarity index 100% rename from components/configs/kustomized/nvidia-gpu-verification/overlays/one-shot/kustomization.yaml rename to components/app-configs/nvidia-gpu-verification/overlays/one-shot/kustomization.yaml diff --git a/components/configs/kustomized/nvidia-gpu-verification/overlays/toleration-replicas-6/kustomization.yaml b/components/app-configs/nvidia-gpu-verification/overlays/toleration-replicas-6/kustomization.yaml similarity index 100% rename from components/configs/kustomized/nvidia-gpu-verification/overlays/toleration-replicas-6/kustomization.yaml rename to components/app-configs/nvidia-gpu-verification/overlays/toleration-replicas-6/kustomization.yaml diff --git a/components/configs/kustomized/nvidia-gpu-verification/overlays/toleration/kustomization.yaml b/components/app-configs/nvidia-gpu-verification/overlays/toleration/kustomization.yaml similarity index 94% rename from components/configs/kustomized/nvidia-gpu-verification/overlays/toleration/kustomization.yaml rename to components/app-configs/nvidia-gpu-verification/overlays/toleration/kustomization.yaml index c60782e5..45f62ef2 100644 --- a/components/configs/kustomized/nvidia-gpu-verification/overlays/toleration/kustomization.yaml +++ b/components/app-configs/nvidia-gpu-verification/overlays/toleration/kustomization.yaml @@ -26,4 +26,4 @@ patches: value: - key: nvidia-gpu-only operator: Exists - effect: NoSchedule \ No newline at end of file + effect: NoSchedule diff --git a/components/configs/kustomized/oauth-proxy/base/INFO.md b/components/app-configs/oauth-proxy/base/INFO.md similarity index 100% rename from components/configs/kustomized/oauth-proxy/base/INFO.md rename to components/app-configs/oauth-proxy/base/INFO.md diff --git a/components/configs/kustomized/oauth-proxy/base/deployment.yaml b/components/app-configs/oauth-proxy/base/deployment.yaml similarity index 100% rename from components/configs/kustomized/oauth-proxy/base/deployment.yaml rename to components/app-configs/oauth-proxy/base/deployment.yaml diff --git a/components/configs/kustomized/oauth-proxy/base/kustomization.yaml b/components/app-configs/oauth-proxy/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/oauth-proxy/base/kustomization.yaml rename to components/app-configs/oauth-proxy/base/kustomization.yaml diff --git a/components/configs/kustomized/oauth-proxy/base/route.yaml b/components/app-configs/oauth-proxy/base/route.yaml similarity index 100% rename from components/configs/kustomized/oauth-proxy/base/route.yaml rename to components/app-configs/oauth-proxy/base/route.yaml diff --git a/components/configs/kustomized/oauth-proxy/base/sa.yaml b/components/app-configs/oauth-proxy/base/sa.yaml similarity index 100% rename from components/configs/kustomized/oauth-proxy/base/sa.yaml rename to components/app-configs/oauth-proxy/base/sa.yaml diff --git a/components/configs/kustomized/oauth-proxy/base/secret.yaml b/components/app-configs/oauth-proxy/base/secret.yaml similarity index 100% rename from components/configs/kustomized/oauth-proxy/base/secret.yaml rename to components/app-configs/oauth-proxy/base/secret.yaml diff --git a/components/configs/kustomized/oauth-proxy/base/service.yaml b/components/app-configs/oauth-proxy/base/service.yaml similarity index 100% rename from components/configs/kustomized/oauth-proxy/base/service.yaml rename to components/app-configs/oauth-proxy/base/service.yaml diff --git a/components/configs/kustomized/nfs-static/overlays/default/kustomization.yaml b/components/app-configs/oauth-proxy/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/nfs-static/overlays/default/kustomization.yaml rename to components/app-configs/oauth-proxy/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/pgadmin4/base/kustomization.yaml b/components/app-configs/pgadmin4/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/pgadmin4/base/kustomization.yaml rename to components/app-configs/pgadmin4/base/kustomization.yaml diff --git a/components/configs/kustomized/pgadmin4/base/pgadmin4-bc.yml b/components/app-configs/pgadmin4/base/pgadmin4-bc.yml similarity index 100% rename from components/configs/kustomized/pgadmin4/base/pgadmin4-bc.yml rename to components/app-configs/pgadmin4/base/pgadmin4-bc.yml diff --git a/components/configs/kustomized/pgadmin4/base/pgadmin4-deployement.yml b/components/app-configs/pgadmin4/base/pgadmin4-deployement.yml similarity index 100% rename from components/configs/kustomized/pgadmin4/base/pgadmin4-deployement.yml rename to components/app-configs/pgadmin4/base/pgadmin4-deployement.yml diff --git a/components/configs/kustomized/pgadmin4/base/pgadmin4-is.yml b/components/app-configs/pgadmin4/base/pgadmin4-is.yml similarity index 100% rename from components/configs/kustomized/pgadmin4/base/pgadmin4-is.yml rename to components/app-configs/pgadmin4/base/pgadmin4-is.yml diff --git a/components/configs/kustomized/pgadmin4/base/pgadmin4-route.yml b/components/app-configs/pgadmin4/base/pgadmin4-route.yml similarity index 100% rename from components/configs/kustomized/pgadmin4/base/pgadmin4-route.yml rename to components/app-configs/pgadmin4/base/pgadmin4-route.yml diff --git a/components/configs/kustomized/pgadmin4/base/pgadmin4-svc.yml b/components/app-configs/pgadmin4/base/pgadmin4-svc.yml similarity index 100% rename from components/configs/kustomized/pgadmin4/base/pgadmin4-svc.yml rename to components/app-configs/pgadmin4/base/pgadmin4-svc.yml diff --git a/components/configs/cluster/rbac/overlays/default/kustomization.yaml b/components/app-configs/pgadmin4/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/default/kustomization.yaml rename to components/app-configs/pgadmin4/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/pgadmin4/overlays/persistent/kustomization.yaml b/components/app-configs/pgadmin4/overlays/persistent/kustomization.yaml similarity index 100% rename from components/configs/kustomized/pgadmin4/overlays/persistent/kustomization.yaml rename to components/app-configs/pgadmin4/overlays/persistent/kustomization.yaml diff --git a/components/configs/kustomized/pgadmin4/overlays/persistent/pvc.yaml b/components/app-configs/pgadmin4/overlays/persistent/pvc.yaml similarity index 100% rename from components/configs/kustomized/pgadmin4/overlays/persistent/pvc.yaml rename to components/app-configs/pgadmin4/overlays/persistent/pvc.yaml diff --git a/components/configs/kustomized/pipelines/kustomization.yaml b/components/app-configs/pipelines/kustomization.yaml similarity index 100% rename from components/configs/kustomized/pipelines/kustomization.yaml rename to components/app-configs/pipelines/kustomization.yaml diff --git a/components/configs/kustomized/pipelines/pipeline-build-worker.yaml b/components/app-configs/pipelines/pipeline-build-worker.yaml similarity index 100% rename from components/configs/kustomized/pipelines/pipeline-build-worker.yaml rename to components/app-configs/pipelines/pipeline-build-worker.yaml diff --git a/components/configs/kustomized/pipelines/pipeline-train.yaml b/components/app-configs/pipelines/pipeline-train.yaml similarity index 100% rename from components/configs/kustomized/pipelines/pipeline-train.yaml rename to components/app-configs/pipelines/pipeline-train.yaml diff --git a/components/configs/kustomized/pipelines/pvc.yaml b/components/app-configs/pipelines/pvc.yaml similarity index 100% rename from components/configs/kustomized/pipelines/pvc.yaml rename to components/app-configs/pipelines/pvc.yaml diff --git a/components/configs/kustomized/pipelines/tasks/python-task.yaml b/components/app-configs/pipelines/tasks/python-task.yaml similarity index 100% rename from components/configs/kustomized/pipelines/tasks/python-task.yaml rename to components/app-configs/pipelines/tasks/python-task.yaml diff --git a/components/configs/kustomized/registry-v2/base/config.yaml b/components/app-configs/registry-v2/base/config.yaml similarity index 98% rename from components/configs/kustomized/registry-v2/base/config.yaml rename to components/app-configs/registry-v2/base/config.yaml index 554c50be..c0a82907 100644 --- a/components/configs/kustomized/registry-v2/base/config.yaml +++ b/components/app-configs/registry-v2/base/config.yaml @@ -23,4 +23,4 @@ stringData: # echo -n "$PASSWORD" | htpasswd -inB -C10 admin # or # htpasswd -nB -C10 admin -type: Opaque \ No newline at end of file +type: Opaque diff --git a/components/configs/kustomized/registry-v2/base/deployment.yaml b/components/app-configs/registry-v2/base/deployment.yaml similarity index 100% rename from components/configs/kustomized/registry-v2/base/deployment.yaml rename to components/app-configs/registry-v2/base/deployment.yaml diff --git a/components/configs/kustomized/registry-v2/base/kustomization.yaml b/components/app-configs/registry-v2/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/registry-v2/base/kustomization.yaml rename to components/app-configs/registry-v2/base/kustomization.yaml diff --git a/components/configs/kustomized/registry-v2/base/pvc.yaml b/components/app-configs/registry-v2/base/pvc.yaml similarity index 100% rename from components/configs/kustomized/registry-v2/base/pvc.yaml rename to components/app-configs/registry-v2/base/pvc.yaml diff --git a/components/configs/kustomized/registry-v2/base/route.yaml b/components/app-configs/registry-v2/base/route.yaml similarity index 100% rename from components/configs/kustomized/registry-v2/base/route.yaml rename to components/app-configs/registry-v2/base/route.yaml diff --git a/components/configs/kustomized/registry-v2/base/service.yaml b/components/app-configs/registry-v2/base/service.yaml similarity index 100% rename from components/configs/kustomized/registry-v2/base/service.yaml rename to components/app-configs/registry-v2/base/service.yaml diff --git a/components/configs/kustomized/registry-v2/local.sh b/components/app-configs/registry-v2/local.sh similarity index 100% rename from components/configs/kustomized/registry-v2/local.sh rename to components/app-configs/registry-v2/local.sh diff --git a/components/configs/kustomized/oauth-proxy/overlays/default/kustomization.yaml b/components/app-configs/registry-v2/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/oauth-proxy/overlays/default/kustomization.yaml rename to components/app-configs/registry-v2/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/registry-v2/overlays/with-namespace/kustomization.yaml b/components/app-configs/registry-v2/overlays/with-namespace/kustomization.yaml similarity index 100% rename from components/configs/kustomized/registry-v2/overlays/with-namespace/kustomization.yaml rename to components/app-configs/registry-v2/overlays/with-namespace/kustomization.yaml diff --git a/components/configs/kustomized/registry-v2/overlays/with-namespace/namespace.yaml b/components/app-configs/registry-v2/overlays/with-namespace/namespace.yaml similarity index 100% rename from components/configs/kustomized/registry-v2/overlays/with-namespace/namespace.yaml rename to components/app-configs/registry-v2/overlays/with-namespace/namespace.yaml diff --git a/components/configs/kustomized/rhoai-config/admins-group.yaml b/components/app-configs/rhoai-config/admins-group.yaml similarity index 81% rename from components/configs/kustomized/rhoai-config/admins-group.yaml rename to components/app-configs/rhoai-config/admins-group.yaml index 2cad25e1..f5a0410e 100644 --- a/components/configs/kustomized/rhoai-config/admins-group.yaml +++ b/components/app-configs/rhoai-config/admins-group.yaml @@ -1,7 +1,7 @@ kind: Group apiVersion: user.openshift.io/v1 metadata: - name: rhoai-admins + name: rhods-admins users: - b64:kube:admin - admin diff --git a/components/configs/kustomized/rhoai-config/dashboard-config-cr.yaml b/components/app-configs/rhoai-config/dashboard-config-cr.yaml similarity index 75% rename from components/configs/kustomized/rhoai-config/dashboard-config-cr.yaml rename to components/app-configs/rhoai-config/dashboard-config-cr.yaml index 5d37f96a..10e2eab8 100644 --- a/components/configs/kustomized/rhoai-config/dashboard-config-cr.yaml +++ b/components/app-configs/rhoai-config/dashboard-config-cr.yaml @@ -3,6 +3,9 @@ kind: OdhDashboardConfig metadata: name: odh-dashboard-config namespace: redhat-ods-applications + labels: + app.kubernetes.io/part-of: rhods-dashboard + app.opendatahub.io/rhods-dashboard: 'true' spec: dashboardConfig: enablement: true @@ -10,6 +13,7 @@ spec: disableProjects: false disableBiasMetrics: false disableSupport: false + disableHome: false disablePipelines: false disableProjectSharing: false disableModelServing: false @@ -20,14 +24,15 @@ spec: disableKServeAuth: false disableISVBadges: false disableInfo: false + disableKServeMetrics: true disableClusterManager: false disablePerformanceMetrics: false disableBYONImageStream: false disableModelRegistry: true disableTracking: false groupsConfig: - adminGroups: rhoai-admins - allowedGroups: 'rhoai-users,system:authenticated' + adminGroups: rhods-admins + allowedGroups: 'system:authenticated' modelServerSizes: - name: Small resources: @@ -56,36 +61,17 @@ spec: notebookController: enabled: true notebookNamespace: rhods-notebooks - notebookTolerationSettings: - enabled: false - key: NotebooksOnly - pvcSize: 10Gi + pvcSize: 20Gi notebookSizes: # kludge: everyone picks the largest, why offer more than one? - name: Demo / Workshop resources: limits: cpu: '6' - memory: 20Gi + memory: 24Gi requests: cpu: '3' - memory: 10Gi - - name: Small - resources: - limits: - cpu: '2' - memory: 8Gi - requests: - cpu: '1' - memory: 8Gi - # - name: Medium - # resources: - # limits: - # cpu: '6' - # memory: 24Gi - # requests: - # cpu: '3' - # memory: 24Gi + memory: 24Gi # - name: Large # resources: # limits: @@ -97,8 +83,10 @@ spec: # - name: X Large # resources: # limits: - # cpu: '40' - # memory: 186Gi - # requests: # cpu: '30' # memory: 120Gi + # requests: + # cpu: '15' + # memory: 120Gi + templateDisablement: [] + templateOrder: [] diff --git a/components/configs/kustomized/rhoai-config/kustomization.yaml b/components/app-configs/rhoai-config/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-config/kustomization.yaml rename to components/app-configs/rhoai-config/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-config/nb-culler-config.yaml b/components/app-configs/rhoai-config/nb-culler-config.yaml similarity index 100% rename from components/configs/kustomized/rhoai-config/nb-culler-config.yaml rename to components/app-configs/rhoai-config/nb-culler-config.yaml diff --git a/components/configs/kustomized/rhoai-config/users-group.yaml b/components/app-configs/rhoai-config/users-group.yaml similarity index 100% rename from components/configs/kustomized/rhoai-config/users-group.yaml rename to components/app-configs/rhoai-config/users-group.yaml diff --git a/components/configs/kustomized/rhoai-data-connector/base/data-connector-secret.yaml b/components/app-configs/rhoai-data-connector/base/data-connector-secret.yaml similarity index 100% rename from components/configs/kustomized/rhoai-data-connector/base/data-connector-secret.yaml rename to components/app-configs/rhoai-data-connector/base/data-connector-secret.yaml diff --git a/components/configs/kustomized/rhoai-data-connector/base/job-create-data-connection.yaml b/components/app-configs/rhoai-data-connector/base/job-create-data-connection.yaml similarity index 100% rename from components/configs/kustomized/rhoai-data-connector/base/job-create-data-connection.yaml rename to components/app-configs/rhoai-data-connector/base/job-create-data-connection.yaml diff --git a/components/configs/kustomized/rhoai-data-connector/base/kustomization.yaml b/components/app-configs/rhoai-data-connector/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-data-connector/base/kustomization.yaml rename to components/app-configs/rhoai-data-connector/base/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-data-connector/kustomization.yaml b/components/app-configs/rhoai-data-connector/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-data-connector/kustomization.yaml rename to components/app-configs/rhoai-data-connector/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-data-connector/overlays/group-project/kustomization.yaml b/components/app-configs/rhoai-data-connector/overlays/group-project/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-data-connector/overlays/group-project/kustomization.yaml rename to components/app-configs/rhoai-data-connector/overlays/group-project/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-data-connector/overlays/kserve-project/kustomization.yaml b/components/app-configs/rhoai-data-connector/overlays/kserve-project/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-data-connector/overlays/kserve-project/kustomization.yaml rename to components/app-configs/rhoai-data-connector/overlays/kserve-project/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml b/components/app-configs/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml rename to components/app-configs/rhoai-data-connector/overlays/modelmesh-project/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-kludge/rhel-subscription-secret.yaml b/components/app-configs/rhoai-kludge/rhel-subscription-secret.yaml similarity index 100% rename from components/configs/kustomized/rhoai-kludge/rhel-subscription-secret.yaml rename to components/app-configs/rhoai-kludge/rhel-subscription-secret.yaml diff --git a/components/configs/kustomized/rhoai-kserve-instances/caikit-tgis/kustomization.yaml b/components/app-configs/rhoai-kserve-instances/caikit-tgis/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-kserve-instances/caikit-tgis/kustomization.yaml rename to components/app-configs/rhoai-kserve-instances/caikit-tgis/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-kserve-instances/caikit-tgis/model-caikit.yaml b/components/app-configs/rhoai-kserve-instances/caikit-tgis/model-caikit.yaml similarity index 100% rename from components/configs/kustomized/rhoai-kserve-instances/caikit-tgis/model-caikit.yaml rename to components/app-configs/rhoai-kserve-instances/caikit-tgis/model-caikit.yaml diff --git a/components/configs/kustomized/rhoai-kserve-instances/caikit-tgis/server.yaml b/components/app-configs/rhoai-kserve-instances/caikit-tgis/server.yaml similarity index 100% rename from components/configs/kustomized/rhoai-kserve-instances/caikit-tgis/server.yaml rename to components/app-configs/rhoai-kserve-instances/caikit-tgis/server.yaml diff --git a/components/configs/kustomized/rhoai-kserve-instances/kustomization.yaml b/components/app-configs/rhoai-kserve-instances/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-kserve-instances/kustomization.yaml rename to components/app-configs/rhoai-kserve-instances/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-kserve-instances/upload-model-job.yaml b/components/app-configs/rhoai-kserve-instances/upload-model-job.yaml similarity index 100% rename from components/configs/kustomized/rhoai-kserve-instances/upload-model-job.yaml rename to components/app-configs/rhoai-kserve-instances/upload-model-job.yaml diff --git a/components/configs/kustomized/rhoai-model-runtimes/kustomization.yaml b/components/app-configs/rhoai-model-runtimes/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-model-runtimes/kustomization.yaml rename to components/app-configs/rhoai-model-runtimes/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-model-runtimes/triton-runtime.yaml b/components/app-configs/rhoai-model-runtimes/triton-runtime.yaml similarity index 100% rename from components/configs/kustomized/rhoai-model-runtimes/triton-runtime.yaml rename to components/app-configs/rhoai-model-runtimes/triton-runtime.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/fraud/job-upload-model.yaml b/components/app-configs/rhoai-modelmesh/base/fraud/job-upload-model.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/fraud/job-upload-model.yaml rename to components/app-configs/rhoai-modelmesh/base/fraud/job-upload-model.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/fraud/kustomization.yaml b/components/app-configs/rhoai-modelmesh/base/fraud/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/fraud/kustomization.yaml rename to components/app-configs/rhoai-modelmesh/base/fraud/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/fraud/triton/kustomization.yaml b/components/app-configs/rhoai-modelmesh/base/fraud/triton/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/fraud/triton/kustomization.yaml rename to components/app-configs/rhoai-modelmesh/base/fraud/triton/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/fraud/triton/model.yaml b/components/app-configs/rhoai-modelmesh/base/fraud/triton/model.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/fraud/triton/model.yaml rename to components/app-configs/rhoai-modelmesh/base/fraud/triton/model.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/fraud/triton/server.yaml b/components/app-configs/rhoai-modelmesh/base/fraud/triton/server.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/fraud/triton/server.yaml rename to components/app-configs/rhoai-modelmesh/base/fraud/triton/server.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/fraud/vino/kustomization.yaml b/components/app-configs/rhoai-modelmesh/base/fraud/vino/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/fraud/vino/kustomization.yaml rename to components/app-configs/rhoai-modelmesh/base/fraud/vino/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/fraud/vino/model.yaml b/components/app-configs/rhoai-modelmesh/base/fraud/vino/model.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/fraud/vino/model.yaml rename to components/app-configs/rhoai-modelmesh/base/fraud/vino/model.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/fraud/vino/server.yaml b/components/app-configs/rhoai-modelmesh/base/fraud/vino/server.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/fraud/vino/server.yaml rename to components/app-configs/rhoai-modelmesh/base/fraud/vino/server.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/base/kustomization.yaml b/components/app-configs/rhoai-modelmesh/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/base/kustomization.yaml rename to components/app-configs/rhoai-modelmesh/base/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/overlays/group-project/kustomization.yaml b/components/app-configs/rhoai-modelmesh/overlays/group-project/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/overlays/group-project/kustomization.yaml rename to components/app-configs/rhoai-modelmesh/overlays/group-project/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-modelmesh/overlays/modelmesh-project/kustomization.yaml b/components/app-configs/rhoai-modelmesh/overlays/modelmesh-project/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-modelmesh/overlays/modelmesh-project/kustomization.yaml rename to components/app-configs/rhoai-modelmesh/overlays/modelmesh-project/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-notebook/base/kustomization.yaml b/components/app-configs/rhoai-notebook/base/kustomization.yaml similarity index 89% rename from components/configs/kustomized/rhoai-notebook/base/kustomization.yaml rename to components/app-configs/rhoai-notebook/base/kustomization.yaml index b8067c03..57eea8d6 100644 --- a/components/configs/kustomized/rhoai-notebook/base/kustomization.yaml +++ b/components/app-configs/rhoai-notebook/base/kustomization.yaml @@ -3,4 +3,4 @@ kind: Kustomization resources: - notebook.yaml -- pvc.yaml \ No newline at end of file +- pvc.yaml diff --git a/components/configs/kustomized/rhoai-notebook/base/notebook.yaml b/components/app-configs/rhoai-notebook/base/notebook.yaml similarity index 100% rename from components/configs/kustomized/rhoai-notebook/base/notebook.yaml rename to components/app-configs/rhoai-notebook/base/notebook.yaml diff --git a/components/configs/kustomized/rhoai-notebook/base/pvc.yaml b/components/app-configs/rhoai-notebook/base/pvc.yaml similarity index 100% rename from components/configs/kustomized/rhoai-notebook/base/pvc.yaml rename to components/app-configs/rhoai-notebook/base/pvc.yaml diff --git a/components/configs/kustomized/rhoai-notebook/kustomization.yaml b/components/app-configs/rhoai-notebook/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-notebook/kustomization.yaml rename to components/app-configs/rhoai-notebook/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-notebook/overlays/group-project/kustomization.yaml b/components/app-configs/rhoai-notebook/overlays/group-project/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-notebook/overlays/group-project/kustomization.yaml rename to components/app-configs/rhoai-notebook/overlays/group-project/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-pipelines/base/kustomization.yaml b/components/app-configs/rhoai-pipelines/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-pipelines/base/kustomization.yaml rename to components/app-configs/rhoai-pipelines/base/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-pipelines/base/pipeline-server.yaml b/components/app-configs/rhoai-pipelines/base/pipeline-server.yaml similarity index 100% rename from components/configs/kustomized/rhoai-pipelines/base/pipeline-server.yaml rename to components/app-configs/rhoai-pipelines/base/pipeline-server.yaml diff --git a/components/configs/kustomized/rhoai-pipelines/kustomization.yaml b/components/app-configs/rhoai-pipelines/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-pipelines/kustomization.yaml rename to components/app-configs/rhoai-pipelines/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-pipelines/overlays/group-project/kustomization.yaml b/components/app-configs/rhoai-pipelines/overlays/group-project/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-pipelines/overlays/group-project/kustomization.yaml rename to components/app-configs/rhoai-pipelines/overlays/group-project/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-projects/group/admin-rolebinding.yaml b/components/app-configs/rhoai-projects/group/admin-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/group/admin-rolebinding.yaml rename to components/app-configs/rhoai-projects/group/admin-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/group/edit-rolebinding.yaml b/components/app-configs/rhoai-projects/group/edit-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/group/edit-rolebinding.yaml rename to components/app-configs/rhoai-projects/group/edit-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/group/kustomization.yaml b/components/app-configs/rhoai-projects/group/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/group/kustomization.yaml rename to components/app-configs/rhoai-projects/group/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-projects/group/namespace.yaml b/components/app-configs/rhoai-projects/group/namespace.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/group/namespace.yaml rename to components/app-configs/rhoai-projects/group/namespace.yaml diff --git a/components/configs/kustomized/rhoai-projects/individual/admin-rolebinding.yaml b/components/app-configs/rhoai-projects/individual/admin-rolebinding.yaml similarity index 94% rename from components/configs/kustomized/rhoai-projects/individual/admin-rolebinding.yaml rename to components/app-configs/rhoai-projects/individual/admin-rolebinding.yaml index 484b18b6..50eb44a9 100644 --- a/components/configs/kustomized/rhoai-projects/individual/admin-rolebinding.yaml +++ b/components/app-configs/rhoai-projects/individual/admin-rolebinding.yaml @@ -12,4 +12,4 @@ roleRef: subjects: - apiGroup: rbac.authorization.k8s.io kind: Group - name: rhoai-admins \ No newline at end of file + name: rhoai-admins diff --git a/components/configs/kustomized/rhoai-projects/individual/edit-rolebinding.yaml b/components/app-configs/rhoai-projects/individual/edit-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/individual/edit-rolebinding.yaml rename to components/app-configs/rhoai-projects/individual/edit-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/individual/kustomization.yaml b/components/app-configs/rhoai-projects/individual/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/individual/kustomization.yaml rename to components/app-configs/rhoai-projects/individual/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-projects/individual/namespace.yaml b/components/app-configs/rhoai-projects/individual/namespace.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/individual/namespace.yaml rename to components/app-configs/rhoai-projects/individual/namespace.yaml diff --git a/components/configs/kustomized/rhoai-projects/kserve/admin-rolebinding.yaml b/components/app-configs/rhoai-projects/kserve/admin-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/kserve/admin-rolebinding.yaml rename to components/app-configs/rhoai-projects/kserve/admin-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/kserve/edit-rolebinding.yaml b/components/app-configs/rhoai-projects/kserve/edit-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/kserve/edit-rolebinding.yaml rename to components/app-configs/rhoai-projects/kserve/edit-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/kserve/kustomization.yaml b/components/app-configs/rhoai-projects/kserve/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/kserve/kustomization.yaml rename to components/app-configs/rhoai-projects/kserve/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-projects/kserve/limit-range.yaml b/components/app-configs/rhoai-projects/kserve/limit-range.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/kserve/limit-range.yaml rename to components/app-configs/rhoai-projects/kserve/limit-range.yaml diff --git a/components/configs/kustomized/rhoai-projects/kserve/namespace.yaml b/components/app-configs/rhoai-projects/kserve/namespace.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/kserve/namespace.yaml rename to components/app-configs/rhoai-projects/kserve/namespace.yaml diff --git a/components/configs/kustomized/rhoai-projects/kserve/quota.yaml b/components/app-configs/rhoai-projects/kserve/quota.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/kserve/quota.yaml rename to components/app-configs/rhoai-projects/kserve/quota.yaml diff --git a/components/configs/kustomized/rhoai-projects/kustomization.yaml b/components/app-configs/rhoai-projects/kustomization.yaml similarity index 68% rename from components/configs/kustomized/rhoai-projects/kustomization.yaml rename to components/app-configs/rhoai-projects/kustomization.yaml index b1b3ab5f..4cbae07c 100644 --- a/components/configs/kustomized/rhoai-projects/kustomization.yaml +++ b/components/app-configs/rhoai-projects/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - demo: ds-project +labels: +- includeSelectors: false + pairs: + demo: ai-project resources: - group diff --git a/components/configs/kustomized/rhoai-projects/modelmesh/admin-rolebinding.yaml b/components/app-configs/rhoai-projects/modelmesh/admin-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/modelmesh/admin-rolebinding.yaml rename to components/app-configs/rhoai-projects/modelmesh/admin-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/modelmesh/edit-rolebinding.yaml b/components/app-configs/rhoai-projects/modelmesh/edit-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/modelmesh/edit-rolebinding.yaml rename to components/app-configs/rhoai-projects/modelmesh/edit-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/modelmesh/kustomization.yaml b/components/app-configs/rhoai-projects/modelmesh/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/modelmesh/kustomization.yaml rename to components/app-configs/rhoai-projects/modelmesh/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-projects/modelmesh/limit-range.yaml b/components/app-configs/rhoai-projects/modelmesh/limit-range.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/modelmesh/limit-range.yaml rename to components/app-configs/rhoai-projects/modelmesh/limit-range.yaml diff --git a/components/configs/kustomized/rhoai-projects/modelmesh/namespace.yaml b/components/app-configs/rhoai-projects/modelmesh/namespace.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/modelmesh/namespace.yaml rename to components/app-configs/rhoai-projects/modelmesh/namespace.yaml diff --git a/components/configs/kustomized/rhoai-projects/modelmesh/quota.yaml b/components/app-configs/rhoai-projects/modelmesh/quota.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/modelmesh/quota.yaml rename to components/app-configs/rhoai-projects/modelmesh/quota.yaml diff --git a/components/configs/kustomized/rhoai-projects/open/admin-rolebinding.yaml b/components/app-configs/rhoai-projects/open/admin-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/open/admin-rolebinding.yaml rename to components/app-configs/rhoai-projects/open/admin-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/open/edit-rolebinding.yaml b/components/app-configs/rhoai-projects/open/edit-rolebinding.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/open/edit-rolebinding.yaml rename to components/app-configs/rhoai-projects/open/edit-rolebinding.yaml diff --git a/components/configs/kustomized/rhoai-projects/open/kustomization.yaml b/components/app-configs/rhoai-projects/open/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/open/kustomization.yaml rename to components/app-configs/rhoai-projects/open/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-projects/open/limit-range.yaml b/components/app-configs/rhoai-projects/open/limit-range.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/open/limit-range.yaml rename to components/app-configs/rhoai-projects/open/limit-range.yaml diff --git a/components/configs/kustomized/rhoai-projects/open/namespace.yaml b/components/app-configs/rhoai-projects/open/namespace.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/open/namespace.yaml rename to components/app-configs/rhoai-projects/open/namespace.yaml diff --git a/components/configs/kustomized/rhoai-projects/open/quota.yaml b/components/app-configs/rhoai-projects/open/quota.yaml similarity index 100% rename from components/configs/kustomized/rhoai-projects/open/quota.yaml rename to components/app-configs/rhoai-projects/open/quota.yaml diff --git a/components/configs/kustomized/rhoai-rbac-notebooks/custom-notebooks-rb.yaml b/components/app-configs/rhoai-rbac-notebooks/custom-notebooks-rb.yaml similarity index 100% rename from components/configs/kustomized/rhoai-rbac-notebooks/custom-notebooks-rb.yaml rename to components/app-configs/rhoai-rbac-notebooks/custom-notebooks-rb.yaml diff --git a/components/configs/kustomized/rhoai-rbac-notebooks/kustomization.yaml b/components/app-configs/rhoai-rbac-notebooks/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-rbac-notebooks/kustomization.yaml rename to components/app-configs/rhoai-rbac-notebooks/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-rbac/kustomization.yaml b/components/app-configs/rhoai-rbac/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-rbac/kustomization.yaml rename to components/app-configs/rhoai-rbac/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-rbac/self-provisioner-crb.yaml b/components/app-configs/rhoai-rbac/self-provisioner-crb.yaml similarity index 100% rename from components/configs/kustomized/rhoai-rbac/self-provisioner-crb.yaml rename to components/app-configs/rhoai-rbac/self-provisioner-crb.yaml diff --git a/components/configs/kustomized/rhoai-rbac/self-provisioner-group.yaml b/components/app-configs/rhoai-rbac/self-provisioner-group.yaml similarity index 100% rename from components/configs/kustomized/rhoai-rbac/self-provisioner-group.yaml rename to components/app-configs/rhoai-rbac/self-provisioner-group.yaml diff --git a/components/configs/kustomized/rhoai-rbac/update-users-crb.yaml b/components/app-configs/rhoai-rbac/update-users-crb.yaml similarity index 100% rename from components/configs/kustomized/rhoai-rbac/update-users-crb.yaml rename to components/app-configs/rhoai-rbac/update-users-crb.yaml diff --git a/components/configs/kustomized/rhoai-rbac/user-manager-group.yaml b/components/app-configs/rhoai-rbac/user-manager-group.yaml similarity index 100% rename from components/configs/kustomized/rhoai-rbac/user-manager-group.yaml rename to components/app-configs/rhoai-rbac/user-manager-group.yaml diff --git a/components/configs/kustomized/rhoai-trustyai/base/kustomization.yaml b/components/app-configs/rhoai-trustyai/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-trustyai/base/kustomization.yaml rename to components/app-configs/rhoai-trustyai/base/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-trustyai/base/trustyai-service.yaml b/components/app-configs/rhoai-trustyai/base/trustyai-service.yaml similarity index 100% rename from components/configs/kustomized/rhoai-trustyai/base/trustyai-service.yaml rename to components/app-configs/rhoai-trustyai/base/trustyai-service.yaml diff --git a/components/configs/kustomized/rhoai-trustyai/kustomization.yaml b/components/app-configs/rhoai-trustyai/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-trustyai/kustomization.yaml rename to components/app-configs/rhoai-trustyai/kustomization.yaml diff --git a/components/configs/kustomized/rhoai-trustyai/overlays/default/kustomization.yaml b/components/app-configs/rhoai-trustyai/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/rhoai-trustyai/overlays/default/kustomization.yaml rename to components/app-configs/rhoai-trustyai/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/runai-kubeflow/base/kustomization.yaml b/components/app-configs/runai-kubeflow/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/runai-kubeflow/base/kustomization.yaml rename to components/app-configs/runai-kubeflow/base/kustomization.yaml diff --git a/components/configs/kustomized/runai-kubeflow/base/mpi/kustomization.yaml b/components/app-configs/runai-kubeflow/base/mpi/kustomization.yaml similarity index 100% rename from components/configs/kustomized/runai-kubeflow/base/mpi/kustomization.yaml rename to components/app-configs/runai-kubeflow/base/mpi/kustomization.yaml diff --git a/components/configs/kustomized/runai-kubeflow/base/training/exclude-mpijob.yaml b/components/app-configs/runai-kubeflow/base/training/exclude-mpijob.yaml similarity index 100% rename from components/configs/kustomized/runai-kubeflow/base/training/exclude-mpijob.yaml rename to components/app-configs/runai-kubeflow/base/training/exclude-mpijob.yaml diff --git a/components/configs/kustomized/runai-kubeflow/base/training/kustomization.yaml b/components/app-configs/runai-kubeflow/base/training/kustomization.yaml similarity index 100% rename from components/configs/kustomized/runai-kubeflow/base/training/kustomization.yaml rename to components/app-configs/runai-kubeflow/base/training/kustomization.yaml diff --git a/components/configs/kustomized/registry-v2/overlays/default/kustomization.yaml b/components/app-configs/runai-kubeflow/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/registry-v2/overlays/default/kustomization.yaml rename to components/app-configs/runai-kubeflow/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/runai-kubeflow/overlays/other-frameworks/kustomization.yaml b/components/app-configs/runai-kubeflow/overlays/other-frameworks/kustomization.yaml similarity index 100% rename from components/configs/kustomized/runai-kubeflow/overlays/other-frameworks/kustomization.yaml rename to components/app-configs/runai-kubeflow/overlays/other-frameworks/kustomization.yaml diff --git a/components/configs/kustomized/runai-setup/.gitignore b/components/app-configs/runai-setup/.gitignore similarity index 100% rename from components/configs/kustomized/runai-setup/.gitignore rename to components/app-configs/runai-setup/.gitignore diff --git a/components/configs/kustomized/runai-setup/kustomization.yaml b/components/app-configs/runai-setup/kustomization.yaml similarity index 64% rename from components/configs/kustomized/runai-setup/kustomization.yaml rename to components/app-configs/runai-setup/kustomization.yaml index 7566882b..25c6ced7 100644 --- a/components/configs/kustomized/runai-setup/kustomization.yaml +++ b/components/app-configs/runai-setup/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - kubernetes.io/part-of: runai +labels: +- includeSelectors: false + pairs: + kubernetes.io/part-of: runai resources: - namespace.yaml diff --git a/components/configs/kustomized/runai-setup/namespace.yaml b/components/app-configs/runai-setup/namespace.yaml similarity index 100% rename from components/configs/kustomized/runai-setup/namespace.yaml rename to components/app-configs/runai-setup/namespace.yaml diff --git a/components/configs/kustomized/runai-setup/sandbox-ns.yaml b/components/app-configs/runai-setup/sandbox-ns.yaml similarity index 85% rename from components/configs/kustomized/runai-setup/sandbox-ns.yaml rename to components/app-configs/runai-setup/sandbox-ns.yaml index 7839658a..f94578f1 100644 --- a/components/configs/kustomized/runai-setup/sandbox-ns.yaml +++ b/components/app-configs/runai-setup/sandbox-ns.yaml @@ -5,4 +5,4 @@ metadata: labels: kubernetes.io/metadata.name: runai-sandbox runai/namespace-version: v2 - runai/queue: sandbox \ No newline at end of file + runai/queue: sandbox diff --git a/components/configs/kustomized/standalone-notebook/deployment.yaml b/components/app-configs/standalone-notebook/deployment.yaml similarity index 100% rename from components/configs/kustomized/standalone-notebook/deployment.yaml rename to components/app-configs/standalone-notebook/deployment.yaml diff --git a/components/configs/kustomized/standalone-notebook/kustomization.yaml b/components/app-configs/standalone-notebook/kustomization.yaml similarity index 69% rename from components/configs/kustomized/standalone-notebook/kustomization.yaml rename to components/app-configs/standalone-notebook/kustomization.yaml index 197b3f3b..ff5f545b 100644 --- a/components/configs/kustomized/standalone-notebook/kustomization.yaml +++ b/components/app-configs/standalone-notebook/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - component: jupyter +labels: +- includeSelectors: false + pairs: + component: jupyter resources: - deployment.yaml diff --git a/components/configs/kustomized/standalone-notebook/pvc.yaml b/components/app-configs/standalone-notebook/pvc.yaml similarity index 100% rename from components/configs/kustomized/standalone-notebook/pvc.yaml rename to components/app-configs/standalone-notebook/pvc.yaml diff --git a/components/configs/kustomized/standalone-notebook/route.yaml b/components/app-configs/standalone-notebook/route.yaml similarity index 100% rename from components/configs/kustomized/standalone-notebook/route.yaml rename to components/app-configs/standalone-notebook/route.yaml diff --git a/components/configs/kustomized/standalone-notebook/service.yaml b/components/app-configs/standalone-notebook/service.yaml similarity index 100% rename from components/configs/kustomized/standalone-notebook/service.yaml rename to components/app-configs/standalone-notebook/service.yaml diff --git a/components/configs/kustomized/standalone-notebook/template.yaml b/components/app-configs/standalone-notebook/template.yaml similarity index 99% rename from components/configs/kustomized/standalone-notebook/template.yaml rename to components/app-configs/standalone-notebook/template.yaml index 9926ff38..99cf3643 100644 --- a/components/configs/kustomized/standalone-notebook/template.yaml +++ b/components/app-configs/standalone-notebook/template.yaml @@ -362,4 +362,4 @@ objects: targetPort: 8080-tcp tls: termination: edge - insecureEdgeTerminationPolicy: Redirect \ No newline at end of file + insecureEdgeTerminationPolicy: Redirect diff --git a/components/configs/kustomized/turbonomic/base/kustomization.yaml b/components/app-configs/turbonomic/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/turbonomic/base/kustomization.yaml rename to components/app-configs/turbonomic/base/kustomization.yaml diff --git a/components/configs/kustomized/turbonomic/base/turbo-cr-patch-job.yaml b/components/app-configs/turbonomic/base/turbo-cr-patch-job.yaml similarity index 100% rename from components/configs/kustomized/turbonomic/base/turbo-cr-patch-job.yaml rename to components/app-configs/turbonomic/base/turbo-cr-patch-job.yaml diff --git a/components/configs/kustomized/turbonomic/base/turbo-cr.yaml b/components/app-configs/turbonomic/base/turbo-cr.yaml similarity index 98% rename from components/configs/kustomized/turbonomic/base/turbo-cr.yaml rename to components/app-configs/turbonomic/base/turbo-cr.yaml index cdb17cd1..47848340 100644 --- a/components/configs/kustomized/turbonomic/base/turbo-cr.yaml +++ b/components/app-configs/turbonomic/base/turbo-cr.yaml @@ -47,4 +47,4 @@ spec: suspend: enabled: false openshiftingress: - enabled: true \ No newline at end of file + enabled: true diff --git a/components/configs/kustomized/turbonomic/overlays/default/kustomization.yaml b/components/app-configs/turbonomic/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/turbonomic/overlays/default/kustomization.yaml rename to components/app-configs/turbonomic/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/turbonomic/overlays/hou-edge/kustomization.yaml b/components/app-configs/turbonomic/overlays/hou-edge/kustomization.yaml similarity index 100% rename from components/configs/kustomized/turbonomic/overlays/hou-edge/kustomization.yaml rename to components/app-configs/turbonomic/overlays/hou-edge/kustomization.yaml diff --git a/components/configs/kustomized/turbonomic/overlays/hou-edge/turbo-sc.yaml b/components/app-configs/turbonomic/overlays/hou-edge/turbo-sc.yaml similarity index 100% rename from components/configs/kustomized/turbonomic/overlays/hou-edge/turbo-sc.yaml rename to components/app-configs/turbonomic/overlays/hou-edge/turbo-sc.yaml diff --git a/components/configs/kustomized/ubi-images/kustomization.yaml b/components/app-configs/ubi-images/kustomization.yaml similarity index 100% rename from components/configs/kustomized/ubi-images/kustomization.yaml rename to components/app-configs/ubi-images/kustomization.yaml diff --git a/components/configs/kustomized/ubi-images/overlays/cluster/kustomization.yaml b/components/app-configs/ubi-images/overlays/cluster/kustomization.yaml similarity index 100% rename from components/configs/kustomized/ubi-images/overlays/cluster/kustomization.yaml rename to components/app-configs/ubi-images/overlays/cluster/kustomization.yaml diff --git a/components/configs/kustomized/ubi-images/overlays/default/kustomization.yaml b/components/app-configs/ubi-images/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/ubi-images/overlays/default/kustomization.yaml rename to components/app-configs/ubi-images/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/ubi-images/ubi8/imagestream.yaml b/components/app-configs/ubi-images/ubi8/imagestream.yaml similarity index 100% rename from components/configs/kustomized/ubi-images/ubi8/imagestream.yaml rename to components/app-configs/ubi-images/ubi8/imagestream.yaml diff --git a/components/configs/kustomized/ubi-images/ubi8/kustomization.yaml b/components/app-configs/ubi-images/ubi8/kustomization.yaml similarity index 100% rename from components/configs/kustomized/ubi-images/ubi8/kustomization.yaml rename to components/app-configs/ubi-images/ubi8/kustomization.yaml diff --git a/components/configs/kustomized/ubi-images/ubi9/imagestream.yaml b/components/app-configs/ubi-images/ubi9/imagestream.yaml similarity index 100% rename from components/configs/kustomized/ubi-images/ubi9/imagestream.yaml rename to components/app-configs/ubi-images/ubi9/imagestream.yaml diff --git a/components/configs/kustomized/ubi-images/ubi9/kustomization.yaml b/components/app-configs/ubi-images/ubi9/kustomization.yaml similarity index 100% rename from components/configs/kustomized/ubi-images/ubi9/kustomization.yaml rename to components/app-configs/ubi-images/ubi9/kustomization.yaml diff --git a/components/configs/kustomized/virt-demo/base/kustomization.yaml b/components/app-configs/virt-demo/base/kustomization.yaml similarity index 69% rename from components/configs/kustomized/virt-demo/base/kustomization.yaml rename to components/app-configs/virt-demo/base/kustomization.yaml index a3533d72..2e3baa16 100644 --- a/components/configs/kustomized/virt-demo/base/kustomization.yaml +++ b/components/app-configs/virt-demo/base/kustomization.yaml @@ -3,8 +3,10 @@ kind: Kustomization namespace: virt-demo -commonLabels: - demo: virtualization +labels: +- includeSelectors: false + pairs: + demo: virtualization resources: - namespace.yaml diff --git a/components/configs/kustomized/virt-demo/base/namespace.yaml b/components/app-configs/virt-demo/base/namespace.yaml similarity index 100% rename from components/configs/kustomized/virt-demo/base/namespace.yaml rename to components/app-configs/virt-demo/base/namespace.yaml diff --git a/components/configs/kustomized/virt-demo/base/rhel9-pub-key.yaml b/components/app-configs/virt-demo/base/rhel9-pub-key.yaml similarity index 100% rename from components/configs/kustomized/virt-demo/base/rhel9-pub-key.yaml rename to components/app-configs/virt-demo/base/rhel9-pub-key.yaml diff --git a/components/configs/kustomized/virt-demo/base/rhel9-vm.yaml b/components/app-configs/virt-demo/base/rhel9-vm.yaml similarity index 100% rename from components/configs/kustomized/virt-demo/base/rhel9-vm.yaml rename to components/app-configs/virt-demo/base/rhel9-vm.yaml diff --git a/components/configs/kustomized/runai-kubeflow/overlays/default/kustomization.yaml b/components/app-configs/virt-demo/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/runai-kubeflow/overlays/default/kustomization.yaml rename to components/app-configs/virt-demo/overlays/default/kustomization.yaml diff --git a/components/configs/kustomized/weaviate/NOTES.md b/components/app-configs/weaviate/NOTES.md similarity index 100% rename from components/configs/kustomized/weaviate/NOTES.md rename to components/app-configs/weaviate/NOTES.md diff --git a/components/configs/kustomized/weaviate/openshift/weaviate-bc.yml b/components/app-configs/weaviate/openshift/weaviate-bc.yml similarity index 100% rename from components/configs/kustomized/weaviate/openshift/weaviate-bc.yml rename to components/app-configs/weaviate/openshift/weaviate-bc.yml diff --git a/components/configs/kustomized/weaviate/openshift/weaviate-is.yml b/components/app-configs/weaviate/openshift/weaviate-is.yml similarity index 100% rename from components/configs/kustomized/weaviate/openshift/weaviate-is.yml rename to components/app-configs/weaviate/openshift/weaviate-is.yml diff --git a/components/configs/kustomized/weaviate/src/00-weaviate-test-connection.py b/components/app-configs/weaviate/src/00-weaviate-test-connection.py similarity index 100% rename from components/configs/kustomized/weaviate/src/00-weaviate-test-connection.py rename to components/app-configs/weaviate/src/00-weaviate-test-connection.py diff --git a/components/configs/kustomized/weaviate/src/requirements.txt b/components/app-configs/weaviate/src/requirements.txt similarity index 100% rename from components/configs/kustomized/weaviate/src/requirements.txt rename to components/app-configs/weaviate/src/requirements.txt diff --git a/components/configs/kustomized/weaviate/values.yaml b/components/app-configs/weaviate/values.yaml similarity index 100% rename from components/configs/kustomized/weaviate/values.yaml rename to components/app-configs/weaviate/values.yaml diff --git a/components/argocd/apps/base/cluster-automation-applicationset.yaml b/components/argocd/apps/base/cluster-automation-applicationset.yaml index 47b00344..d475ac4f 100644 --- a/components/argocd/apps/base/cluster-automation-applicationset.yaml +++ b/components/argocd/apps/base/cluster-automation-applicationset.yaml @@ -15,7 +15,7 @@ spec: values: name: simple-sandbox-cleanup namespace: openshift-gitops - path: components/configs/simple/sandbox-cleanup + path: components/cluster-configs/simple/sandbox-cleanup template: metadata: name: '{{values.name}}' diff --git a/components/argocd/apps/base/cluster-configs-applicationset.yaml b/components/argocd/apps/base/cluster-configs-applicationset.yaml index 4fdfdc79..4728bd3f 100644 --- a/components/argocd/apps/base/cluster-configs-applicationset.yaml +++ b/components/argocd/apps/base/cluster-configs-applicationset.yaml @@ -35,4 +35,4 @@ spec: path: '{{values.path}}' destination: server: https://kubernetes.default.svc - namespace: '{{values.namespace}}' \ No newline at end of file + namespace: '{{values.namespace}}' diff --git a/components/argocd/apps/base/cluster-operators-applicationset.yaml b/components/argocd/apps/base/cluster-operators-applicationset.yaml index 6108a01c..787f8fcd 100644 --- a/components/argocd/apps/base/cluster-operators-applicationset.yaml +++ b/components/argocd/apps/base/cluster-operators-applicationset.yaml @@ -35,4 +35,4 @@ spec: path: '{{values.path}}' destination: server: https://kubernetes.default.svc - namespace: openshift-gitops \ No newline at end of file + namespace: openshift-gitops diff --git a/components/argocd/apps/overlays/default/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/default/patch-cluster-config-app-of-apps.yaml index 952eaf8b..88a78197 100644 --- a/components/argocd/apps/overlays/default/patch-cluster-config-app-of-apps.yaml +++ b/components/argocd/apps/overlays/default/patch-cluster-config-app-of-apps.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/source/path - value: components/argocd/apps/overlays/default \ No newline at end of file + value: components/argocd/apps/overlays/default diff --git a/components/argocd/apps/overlays/default/patch-configs-applicationset.yaml b/components/argocd/apps/overlays/default/patch-configs-applicationset.yaml index 3ac8bb5b..a6b5ef1e 100644 --- a/components/argocd/apps/overlays/default/patch-configs-applicationset.yaml +++ b/components/argocd/apps/overlays/default/patch-configs-applicationset.yaml @@ -6,37 +6,37 @@ values: name: config-cluster-console namespace: openshift-gitops - path: components/configs/cluster/console-config/overlays/argocd + path: components/cluster-configs/console-config/overlays/argocd - cluster: local url: https://kubernetes.default.svc values: name: config-cluster-console-samples namespace: openshift-gitops - path: components/configs/cluster/console-samples + path: components/cluster-configs/console-samples # - cluster: local # url: https://kubernetes.default.svc # values: # name: config-cluster-login # namespace: openshift-config - # path: components/configs/login/overlays/default + # path: components/cluster-configs/login/overlays/default - cluster: local url: https://kubernetes.default.svc values: name: config-cluster-namespaces namespace: openshift-gitops - path: components/configs/cluster/namespaces/overlays/default + path: components/cluster-configs/namespaces/overlays/default - cluster: local url: https://kubernetes.default.svc values: name: config-cluster-rbac namespace: openshift-gitops - path: components/configs/cluster/rbac/overlays/default + path: components/cluster-configs/rbac/overlays/default - cluster: local url: https://kubernetes.default.svc values: name: config-sandbox-cleanup namespace: openshift-gitops - path: components/configs/cluster/namespace-cleanup/overlays/sandbox + path: components/cluster-configs/namespace-cleanup/overlays/sandbox # - cluster: local # url: https://kubernetes.default.svc # values: diff --git a/components/argocd/apps/overlays/manual-user-config/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/manual-user-config/patch-cluster-config-app-of-apps.yaml index a9dc582e..e6dcee9c 100644 --- a/components/argocd/apps/overlays/manual-user-config/patch-cluster-config-app-of-apps.yaml +++ b/components/argocd/apps/overlays/manual-user-config/patch-cluster-config-app-of-apps.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/source/path - value: components/argocd/apps/overlays/manual-user-config \ No newline at end of file + value: components/argocd/apps/overlays/manual-user-config diff --git a/components/argocd/apps/overlays/manual-user-config/patch-configs-applicationset.yaml b/components/argocd/apps/overlays/manual-user-config/patch-configs-applicationset.yaml index 4421f659..96f83d69 100644 --- a/components/argocd/apps/overlays/manual-user-config/patch-configs-applicationset.yaml +++ b/components/argocd/apps/overlays/manual-user-config/patch-configs-applicationset.yaml @@ -6,37 +6,37 @@ values: name: config-cluster-console namespace: openshift-gitops - path: components/configs/cluster/console-config/overlays/argocd + path: components/cluster-configs/console-config/overlays/argocd - cluster: local url: https://kubernetes.default.svc values: name: config-cluster-console-samples namespace: openshift-gitops - path: components/configs/cluster/console-samples + path: components/cluster-configs/console-samples # - cluster: local # url: https://kubernetes.default.svc # values: # name: config-cluster-login # namespace: openshift-config - # path: components/configs/login/overlays/default + # path: components/cluster-configs/login/overlays/default - cluster: local url: https://kubernetes.default.svc values: name: config-cluster-namespaces namespace: openshift-gitops - path: components/configs/cluster/namespaces/overlays/default + path: components/cluster-configs/namespaces/overlays/default - cluster: local url: https://kubernetes.default.svc values: name: config-cluster-rbac namespace: openshift-gitops - path: components/configs/cluster/rbac/overlays/manual-user-config + path: components/cluster-configs/rbac/overlays/manual-user-config - cluster: local url: https://kubernetes.default.svc values: name: config-sandbox-cleanup namespace: openshift-gitops - path: components/configs/cluster/namespace-cleanup/overlays/sandbox + path: components/cluster-configs/namespace-cleanup/overlays/sandbox # - cluster: local # url: https://kubernetes.default.svc # values: diff --git a/components/argocd/projects/base/cluster-config-project.yaml b/components/argocd/projects/base/cluster-config-project.yaml index 8bfd8a5c..893bf4cb 100644 --- a/components/argocd/projects/base/cluster-config-project.yaml +++ b/components/argocd/projects/base/cluster-config-project.yaml @@ -11,4 +11,4 @@ spec: - namespace: '*' server: '*' sourceRepos: - - '*' \ No newline at end of file + - '*' diff --git a/components/argocd/projects/overlays/default/kustomization.yaml b/components/argocd/projects/overlays/default/kustomization.yaml index 681848f0..774a422d 100644 --- a/components/argocd/projects/overlays/default/kustomization.yaml +++ b/components/argocd/projects/overlays/default/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base \ No newline at end of file + - ../../base diff --git a/components/configs/cluster/adhoc-admin/README.md b/components/cluster-configs/adhoc-admin/README.md similarity index 100% rename from components/configs/cluster/adhoc-admin/README.md rename to components/cluster-configs/adhoc-admin/README.md diff --git a/components/configs/cluster/adhoc-admin/base/admin-rolebinding.yaml b/components/cluster-configs/adhoc-admin/base/admin-rolebinding.yaml similarity index 93% rename from components/configs/cluster/adhoc-admin/base/admin-rolebinding.yaml rename to components/cluster-configs/adhoc-admin/base/admin-rolebinding.yaml index 8124d534..1e82db7a 100644 --- a/components/configs/cluster/adhoc-admin/base/admin-rolebinding.yaml +++ b/components/cluster-configs/adhoc-admin/base/admin-rolebinding.yaml @@ -16,4 +16,4 @@ apiVersion: v1 kind: ServiceAccount metadata: name: cluster-admin-adhoc-helper - namespace: adhoc-admin \ No newline at end of file + namespace: adhoc-admin diff --git a/components/configs/cluster/adhoc-admin/base/kustomization.yaml b/components/cluster-configs/adhoc-admin/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/adhoc-admin/base/kustomization.yaml rename to components/cluster-configs/adhoc-admin/base/kustomization.yaml diff --git a/components/configs/cluster/adhoc-admin/base/namespace.yaml b/components/cluster-configs/adhoc-admin/base/namespace.yaml similarity index 100% rename from components/configs/cluster/adhoc-admin/base/namespace.yaml rename to components/cluster-configs/adhoc-admin/base/namespace.yaml diff --git a/components/configs/cluster/adhoc-admin/components/adhoc-terminal/adhoc-pod.yaml b/components/cluster-configs/adhoc-admin/components/adhoc-terminal/adhoc-pod.yaml similarity index 100% rename from components/configs/cluster/adhoc-admin/components/adhoc-terminal/adhoc-pod.yaml rename to components/cluster-configs/adhoc-admin/components/adhoc-terminal/adhoc-pod.yaml diff --git a/components/configs/cluster/adhoc-admin/components/adhoc-terminal/kustomization.yaml b/components/cluster-configs/adhoc-admin/components/adhoc-terminal/kustomization.yaml similarity index 100% rename from components/configs/cluster/adhoc-admin/components/adhoc-terminal/kustomization.yaml rename to components/cluster-configs/adhoc-admin/components/adhoc-terminal/kustomization.yaml diff --git a/components/configs/cluster/adhoc-admin/components/rhpds/job.yaml b/components/cluster-configs/adhoc-admin/components/rhpds/job.yaml similarity index 100% rename from components/configs/cluster/adhoc-admin/components/rhpds/job.yaml rename to components/cluster-configs/adhoc-admin/components/rhpds/job.yaml diff --git a/components/configs/cluster/adhoc-admin/components/rhpds/kustomization.yaml b/components/cluster-configs/adhoc-admin/components/rhpds/kustomization.yaml similarity index 100% rename from components/configs/cluster/adhoc-admin/components/rhpds/kustomization.yaml rename to components/cluster-configs/adhoc-admin/components/rhpds/kustomization.yaml diff --git a/components/configs/cluster/adhoc-admin/overlays/default/kustomization.yaml b/components/cluster-configs/adhoc-admin/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/cluster/adhoc-admin/overlays/default/kustomization.yaml rename to components/cluster-configs/adhoc-admin/overlays/default/kustomization.yaml diff --git a/components/configs/cluster/autoscale/base/autoscaling.yaml b/components/cluster-configs/autoscale/base/autoscaling.yaml similarity index 100% rename from components/configs/cluster/autoscale/base/autoscaling.yaml rename to components/cluster-configs/autoscale/base/autoscaling.yaml diff --git a/components/configs/cluster/autoscale/base/job.sh b/components/cluster-configs/autoscale/base/job.sh similarity index 100% rename from components/configs/cluster/autoscale/base/job.sh rename to components/cluster-configs/autoscale/base/job.sh diff --git a/components/configs/cluster/autoscale/base/job.yaml b/components/cluster-configs/autoscale/base/job.yaml similarity index 100% rename from components/configs/cluster/autoscale/base/job.yaml rename to components/cluster-configs/autoscale/base/job.yaml diff --git a/components/configs/cluster/autoscale/base/kustomization.yaml b/components/cluster-configs/autoscale/base/kustomization.yaml similarity index 87% rename from components/configs/cluster/autoscale/base/kustomization.yaml rename to components/cluster-configs/autoscale/base/kustomization.yaml index 55cb3b9e..4dc137ec 100644 --- a/components/configs/cluster/autoscale/base/kustomization.yaml +++ b/components/cluster-configs/autoscale/base/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - autoscale: config +labels: +- includeSelectors: false + pairs: + autoscale: config namespace: openshift-machine-api diff --git a/components/configs/kustomized/kafka/overlays/default/kustomization.yaml b/components/cluster-configs/autoscale/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/kafka/overlays/default/kustomization.yaml rename to components/cluster-configs/autoscale/overlays/default/kustomization.yaml diff --git a/components/configs/cluster/autoscale/overlays/gpus-accelerator-label/kustomization.yaml b/components/cluster-configs/autoscale/overlays/gpus-accelerator-label/kustomization.yaml similarity index 100% rename from components/configs/cluster/autoscale/overlays/gpus-accelerator-label/kustomization.yaml rename to components/cluster-configs/autoscale/overlays/gpus-accelerator-label/kustomization.yaml diff --git a/components/configs/cluster/autoscale/overlays/gpus/kustomization.yaml b/components/cluster-configs/autoscale/overlays/gpus/kustomization.yaml similarity index 100% rename from components/configs/cluster/autoscale/overlays/gpus/kustomization.yaml rename to components/cluster-configs/autoscale/overlays/gpus/kustomization.yaml diff --git a/components/configs/cluster/autoscale/overlays/workshop-50/kustomization.yaml b/components/cluster-configs/autoscale/overlays/workshop-50/kustomization.yaml similarity index 100% rename from components/configs/cluster/autoscale/overlays/workshop-50/kustomization.yaml rename to components/cluster-configs/autoscale/overlays/workshop-50/kustomization.yaml diff --git a/components/configs/cluster/baremetal/base/example-bmc-secret.yaml b/components/cluster-configs/baremetal/base/example-bmc-secret.yaml similarity index 100% rename from components/configs/cluster/baremetal/base/example-bmc-secret.yaml rename to components/cluster-configs/baremetal/base/example-bmc-secret.yaml diff --git a/components/configs/cluster/baremetal/base/example-bmh.yaml b/components/cluster-configs/baremetal/base/example-bmh.yaml similarity index 100% rename from components/configs/cluster/baremetal/base/example-bmh.yaml rename to components/cluster-configs/baremetal/base/example-bmh.yaml diff --git a/components/configs/cluster/baremetal/base/kustomization.yaml b/components/cluster-configs/baremetal/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/baremetal/base/kustomization.yaml rename to components/cluster-configs/baremetal/base/kustomization.yaml diff --git a/components/configs/kustomized/pgadmin4/overlays/default/kustomization.yaml b/components/cluster-configs/baremetal/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/pgadmin4/overlays/default/kustomization.yaml rename to components/cluster-configs/baremetal/overlays/default/kustomization.yaml diff --git a/components/cluster-configs/cluster-certs/base/kustomization.yaml b/components/cluster-configs/cluster-certs/base/kustomization.yaml new file mode 100644 index 00000000..9a9dc63b --- /dev/null +++ b/components/cluster-configs/cluster-certs/base/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../operators/openshift-cert-manager-operator/examples/letsencrypt-route53-issuer + - ../../../operators/openshift-cert-manager-operator/examples/openshift-api-certificate + - ../../../operators/openshift-cert-manager-operator/examples/openshift-wildcard-certificate diff --git a/components/configs/cluster/cluster-certs/overlays/letsencrypt/kustomization.yaml b/components/cluster-configs/cluster-certs/overlays/letsencrypt/kustomization.yaml similarity index 100% rename from components/configs/cluster/cluster-certs/overlays/letsencrypt/kustomization.yaml rename to components/cluster-configs/cluster-certs/overlays/letsencrypt/kustomization.yaml diff --git a/components/configs/cluster/cluster-certs/overlays/letsencrypt/letsencrypt-aws-sealed-secret.yaml b/components/cluster-configs/cluster-certs/overlays/letsencrypt/letsencrypt-aws-sealed-secret.yaml similarity index 100% rename from components/configs/cluster/cluster-certs/overlays/letsencrypt/letsencrypt-aws-sealed-secret.yaml rename to components/cluster-configs/cluster-certs/overlays/letsencrypt/letsencrypt-aws-sealed-secret.yaml diff --git a/components/configs/cluster/cluster-certs/overlays/todo/kustomization.yaml b/components/cluster-configs/cluster-certs/overlays/todo/kustomization.yaml similarity index 100% rename from components/configs/cluster/cluster-certs/overlays/todo/kustomization.yaml rename to components/cluster-configs/cluster-certs/overlays/todo/kustomization.yaml diff --git a/components/configs/cluster/console-config/base/README.md b/components/cluster-configs/console-config/base/README.md similarity index 83% rename from components/configs/cluster/console-config/base/README.md rename to components/cluster-configs/console-config/base/README.md index 6070e020..e7d55d9b 100644 --- a/components/configs/cluster/console-config/base/README.md +++ b/components/cluster-configs/console-config/base/README.md @@ -6,12 +6,12 @@ Custom 404, 503 error ``` -oc apply -f components/configs/console/base/error-pages-custom-cm.yaml +oc apply -f components/cluster-configs/console/base/error-pages-custom-cm.yaml oc patch -n openshift-ingress-operator ingresscontroller/default --patch '{"spec":{"httpErrorCodePages":{"name":"error-pages-custom"}}}' --type=merge ``` ``` -# oc apply -f components/configs/console/base/error-pages-normal-cm.yaml +# oc apply -f components/cluster-configs/console/base/error-pages-normal-cm.yaml # oc patch -n openshift-ingress-operator ingresscontroller/default --patch '{"spec":{"httpErrorCodePages":{"name":"error-pages-normal"}}}' --type=merge oc patch -n openshift-ingress-operator ingresscontroller/default --patch '{"spec":{"httpErrorCodePages":{"name":""}}}' --type=merge ``` diff --git a/components/configs/cluster/console-config/base/banner-cluster.yaml b/components/cluster-configs/console-config/base/banner-cluster.yaml similarity index 91% rename from components/configs/cluster/console-config/base/banner-cluster.yaml rename to components/cluster-configs/console-config/base/banner-cluster.yaml index 8b6eab19..29c60e5f 100644 --- a/components/configs/cluster/console-config/base/banner-cluster.yaml +++ b/components/cluster-configs/console-config/base/banner-cluster.yaml @@ -8,4 +8,4 @@ spec: location: BannerBottom # https://htmlcolorcodes.com/color-picker color: '#FFF' - backgroundColor: '#0066FF' \ No newline at end of file + backgroundColor: '#0066FF' diff --git a/components/configs/cluster/console-config/base/banner-data.yaml b/components/cluster-configs/console-config/base/banner-data.yaml similarity index 100% rename from components/configs/cluster/console-config/base/banner-data.yaml rename to components/cluster-configs/console-config/base/banner-data.yaml diff --git a/components/configs/cluster/console-config/base/error-page-404.http b/components/cluster-configs/console-config/base/error-page-404.http similarity index 100% rename from components/configs/cluster/console-config/base/error-page-404.http rename to components/cluster-configs/console-config/base/error-page-404.http diff --git a/components/configs/cluster/console-config/base/error-page-503.http b/components/cluster-configs/console-config/base/error-page-503.http similarity index 100% rename from components/configs/cluster/console-config/base/error-page-503.http rename to components/cluster-configs/console-config/base/error-page-503.http diff --git a/components/configs/cluster/console-config/base/error-pages-custom-cm.yaml b/components/cluster-configs/console-config/base/error-pages-custom-cm.yaml similarity index 100% rename from components/configs/cluster/console-config/base/error-pages-custom-cm.yaml rename to components/cluster-configs/console-config/base/error-pages-custom-cm.yaml diff --git a/components/configs/cluster/console-config/base/error-pages-normal-cm.yaml b/components/cluster-configs/console-config/base/error-pages-normal-cm.yaml similarity index 100% rename from components/configs/cluster/console-config/base/error-pages-normal-cm.yaml rename to components/cluster-configs/console-config/base/error-pages-normal-cm.yaml diff --git a/components/configs/cluster/console-config/base/ingresscontroller-cr.yaml b/components/cluster-configs/console-config/base/ingresscontroller-cr.yaml similarity index 100% rename from components/configs/cluster/console-config/base/ingresscontroller-cr.yaml rename to components/cluster-configs/console-config/base/ingresscontroller-cr.yaml diff --git a/components/configs/cluster/console-config/base/kustomization.yaml b/components/cluster-configs/console-config/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/console-config/base/kustomization.yaml rename to components/cluster-configs/console-config/base/kustomization.yaml diff --git a/components/configs/cluster/console-config/base/link-github.yaml b/components/cluster-configs/console-config/base/link-github.yaml similarity index 100% rename from components/configs/cluster/console-config/base/link-github.yaml rename to components/cluster-configs/console-config/base/link-github.yaml diff --git a/components/configs/cluster/console-config/base/link-quay.yaml b/components/cluster-configs/console-config/base/link-quay.yaml similarity index 77% rename from components/configs/cluster/console-config/base/link-quay.yaml rename to components/cluster-configs/console-config/base/link-quay.yaml index 3ab4ddfd..f9b68882 100644 --- a/components/configs/cluster/console-config/base/link-quay.yaml +++ b/components/cluster-configs/console-config/base/link-quay.yaml @@ -8,4 +8,4 @@ spec: text: Quay applicationMenu: section: Tools - imageURL: https://quay.io/static/img/quay_favicon.png \ No newline at end of file + imageURL: https://quay.io/static/img/quay_favicon.png diff --git a/components/configs/cluster/console-config/overlays/argocd/kustomization.yaml b/components/cluster-configs/console-config/overlays/argocd/kustomization.yaml similarity index 100% rename from components/configs/cluster/console-config/overlays/argocd/kustomization.yaml rename to components/cluster-configs/console-config/overlays/argocd/kustomization.yaml diff --git a/components/configs/cluster/console-config/overlays/default/kustomization.yaml b/components/cluster-configs/console-config/overlays/default/kustomization.yaml similarity index 98% rename from components/configs/cluster/console-config/overlays/default/kustomization.yaml rename to components/cluster-configs/console-config/overlays/default/kustomization.yaml index 45abd1e7..d123dcf2 100644 --- a/components/configs/cluster/console-config/overlays/default/kustomization.yaml +++ b/components/cluster-configs/console-config/overlays/default/kustomization.yaml @@ -15,4 +15,4 @@ patches: patch: |- - op: replace path: /spec/text - value: 'This cluster was deployed via the AI GitOps catalog' \ No newline at end of file + value: 'This cluster was deployed via the AI GitOps catalog' diff --git a/components/configs/cluster/console-samples/kustomization.yaml b/components/cluster-configs/console-samples/kustomization.yaml similarity index 100% rename from components/configs/cluster/console-samples/kustomization.yaml rename to components/cluster-configs/console-samples/kustomization.yaml diff --git a/components/configs/cluster/console-samples/sample-build-config-dockerfile.yaml b/components/cluster-configs/console-samples/sample-build-config-dockerfile.yaml similarity index 100% rename from components/configs/cluster/console-samples/sample-build-config-dockerfile.yaml rename to components/cluster-configs/console-samples/sample-build-config-dockerfile.yaml diff --git a/components/configs/cluster/console-samples/sample-custom-s2i-quickstart.yaml b/components/cluster-configs/console-samples/sample-custom-s2i-quickstart.yaml similarity index 100% rename from components/configs/cluster/console-samples/sample-custom-s2i-quickstart.yaml rename to components/cluster-configs/console-samples/sample-custom-s2i-quickstart.yaml diff --git a/components/configs/cluster/etcd-backup/base/etcd-backup-cj.yaml.orig b/components/cluster-configs/etcd-backup/base/etcd-backup-cj.yaml.orig similarity index 100% rename from components/configs/cluster/etcd-backup/base/etcd-backup-cj.yaml.orig rename to components/cluster-configs/etcd-backup/base/etcd-backup-cj.yaml.orig diff --git a/components/configs/cluster/etcd-backup/base/job.sh b/components/cluster-configs/etcd-backup/base/job.sh similarity index 100% rename from components/configs/cluster/etcd-backup/base/job.sh rename to components/cluster-configs/etcd-backup/base/job.sh diff --git a/components/configs/cluster/etcd-backup/base/job.yaml b/components/cluster-configs/etcd-backup/base/job.yaml similarity index 100% rename from components/configs/cluster/etcd-backup/base/job.yaml rename to components/cluster-configs/etcd-backup/base/job.yaml diff --git a/components/configs/cluster/etcd-backup/base/kustomization.yaml b/components/cluster-configs/etcd-backup/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/etcd-backup/base/kustomization.yaml rename to components/cluster-configs/etcd-backup/base/kustomization.yaml diff --git a/components/configs/kustomized/virt-demo/overlays/default/kustomization.yaml b/components/cluster-configs/etcd-backup/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/kustomized/virt-demo/overlays/default/kustomization.yaml rename to components/cluster-configs/etcd-backup/overlays/default/kustomization.yaml diff --git a/components/configs/cluster/etcd-backup/overlays/persistent/kustomization.yaml b/components/cluster-configs/etcd-backup/overlays/persistent/kustomization.yaml similarity index 100% rename from components/configs/cluster/etcd-backup/overlays/persistent/kustomization.yaml rename to components/cluster-configs/etcd-backup/overlays/persistent/kustomization.yaml diff --git a/components/configs/cluster/etcd-backup/overlays/persistent/pvc.yaml b/components/cluster-configs/etcd-backup/overlays/persistent/pvc.yaml similarity index 100% rename from components/configs/cluster/etcd-backup/overlays/persistent/pvc.yaml rename to components/cluster-configs/etcd-backup/overlays/persistent/pvc.yaml diff --git a/components/configs/cluster/login/base/README.md b/components/cluster-configs/login/base/README.md similarity index 96% rename from components/configs/cluster/login/base/README.md rename to components/cluster-configs/login/base/README.md index 33e6b4bb..e77ed2ef 100644 --- a/components/configs/cluster/login/base/README.md +++ b/components/cluster-configs/login/base/README.md @@ -31,7 +31,7 @@ spec: Dump current configuration ``` -pushd components/configs/login/base +pushd components/cluster-configs/login/base oc exec deployment/oauth-openshift -- cat /var/config/system/secrets/v4-0-config-system-ocp-branding-template/login.html > login.html oc exec deployment/oauth-openshift -- cat /var/config/system/secrets/v4-0-config-system-ocp-branding-template/errors.html > errors.html oc exec deployment/oauth-openshift -- cat /var/config/system/secrets/v4-0-config-system-ocp-branding-template/providers.html > providers.html @@ -41,7 +41,7 @@ popd Apply custom login template ``` -pushd components/configs/login/base +pushd components/cluster-configs/login/base oc -n openshift-config \ delete secret login-custom diff --git a/components/configs/cluster/login/base/cluster-oauth.yaml b/components/cluster-configs/login/base/cluster-oauth.yaml similarity index 100% rename from components/configs/cluster/login/base/cluster-oauth.yaml rename to components/cluster-configs/login/base/cluster-oauth.yaml diff --git a/components/configs/cluster/login/base/errors.html b/components/cluster-configs/login/base/errors.html similarity index 100% rename from components/configs/cluster/login/base/errors.html rename to components/cluster-configs/login/base/errors.html diff --git a/components/configs/cluster/login/base/kustomization.yaml b/components/cluster-configs/login/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/login/base/kustomization.yaml rename to components/cluster-configs/login/base/kustomization.yaml diff --git a/components/configs/cluster/login/base/login.html b/components/cluster-configs/login/base/login.html similarity index 100% rename from components/configs/cluster/login/base/login.html rename to components/cluster-configs/login/base/login.html diff --git a/components/configs/cluster/login/base/providers.html b/components/cluster-configs/login/base/providers.html similarity index 100% rename from components/configs/cluster/login/base/providers.html rename to components/cluster-configs/login/base/providers.html diff --git a/components/configs/cluster/login/overlays/default/kustomization.yaml b/components/cluster-configs/login/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/cluster/login/overlays/default/kustomization.yaml rename to components/cluster-configs/login/overlays/default/kustomization.yaml diff --git a/components/configs/cluster/login/overlays/digital-rain/digital-rain-secret.yaml b/components/cluster-configs/login/overlays/digital-rain/digital-rain-secret.yaml similarity index 99% rename from components/configs/cluster/login/overlays/digital-rain/digital-rain-secret.yaml rename to components/cluster-configs/login/overlays/digital-rain/digital-rain-secret.yaml index cc727387..9d9060b2 100644 --- a/components/configs/cluster/login/overlays/digital-rain/digital-rain-secret.yaml +++ b/components/cluster-configs/login/overlays/digital-rain/digital-rain-secret.yaml @@ -419,4 +419,4 @@ stringData: }) - \ No newline at end of file + diff --git a/components/configs/cluster/login/overlays/digital-rain/kustomization.yaml b/components/cluster-configs/login/overlays/digital-rain/kustomization.yaml similarity index 100% rename from components/configs/cluster/login/overlays/digital-rain/kustomization.yaml rename to components/cluster-configs/login/overlays/digital-rain/kustomization.yaml diff --git a/components/configs/cluster/login/overlays/github/github-client-sealed-secret.yaml b/components/cluster-configs/login/overlays/github/github-client-sealed-secret.yaml similarity index 100% rename from components/configs/cluster/login/overlays/github/github-client-sealed-secret.yaml rename to components/cluster-configs/login/overlays/github/github-client-sealed-secret.yaml diff --git a/components/configs/cluster/login/overlays/github/kustomization.yaml b/components/cluster-configs/login/overlays/github/kustomization.yaml similarity index 95% rename from components/configs/cluster/login/overlays/github/kustomization.yaml rename to components/cluster-configs/login/overlays/github/kustomization.yaml index 6ac6e98b..7f729ee8 100644 --- a/components/configs/cluster/login/overlays/github/kustomization.yaml +++ b/components/cluster-configs/login/overlays/github/kustomization.yaml @@ -16,4 +16,4 @@ patches: group: config.openshift.io kind: OAuth name: cluster - version: v1 \ No newline at end of file + version: v1 diff --git a/components/configs/cluster/login/overlays/github/patch-idp.yaml b/components/cluster-configs/login/overlays/github/patch-idp.yaml similarity index 100% rename from components/configs/cluster/login/overlays/github/patch-idp.yaml rename to components/cluster-configs/login/overlays/github/patch-idp.yaml diff --git a/components/configs/cluster/login/overlays/htpasswd/htpasswd-secret.yaml b/components/cluster-configs/login/overlays/htpasswd/htpasswd-secret.yaml similarity index 100% rename from components/configs/cluster/login/overlays/htpasswd/htpasswd-secret.yaml rename to components/cluster-configs/login/overlays/htpasswd/htpasswd-secret.yaml diff --git a/components/configs/cluster/login/overlays/htpasswd/job.sh b/components/cluster-configs/login/overlays/htpasswd/job.sh similarity index 100% rename from components/configs/cluster/login/overlays/htpasswd/job.sh rename to components/cluster-configs/login/overlays/htpasswd/job.sh diff --git a/components/configs/cluster/login/overlays/htpasswd/job.yaml b/components/cluster-configs/login/overlays/htpasswd/job.yaml similarity index 100% rename from components/configs/cluster/login/overlays/htpasswd/job.yaml rename to components/cluster-configs/login/overlays/htpasswd/job.yaml diff --git a/components/configs/cluster/login/overlays/htpasswd/kustomization.yaml b/components/cluster-configs/login/overlays/htpasswd/kustomization.yaml similarity index 96% rename from components/configs/cluster/login/overlays/htpasswd/kustomization.yaml rename to components/cluster-configs/login/overlays/htpasswd/kustomization.yaml index ad34ec00..3ac09050 100644 --- a/components/configs/cluster/login/overlays/htpasswd/kustomization.yaml +++ b/components/cluster-configs/login/overlays/htpasswd/kustomization.yaml @@ -28,4 +28,4 @@ patches: group: config.openshift.io kind: OAuth name: cluster - version: v1 \ No newline at end of file + version: v1 diff --git a/components/configs/cluster/login/overlays/htpasswd/patch-idp.yaml b/components/cluster-configs/login/overlays/htpasswd/patch-idp.yaml similarity index 100% rename from components/configs/cluster/login/overlays/htpasswd/patch-idp.yaml rename to components/cluster-configs/login/overlays/htpasswd/patch-idp.yaml diff --git a/components/configs/cluster/login/overlays/rhdp/htpasswd-secret-ss-job.yaml b/components/cluster-configs/login/overlays/rhdp/htpasswd-secret-ss-job.yaml similarity index 100% rename from components/configs/cluster/login/overlays/rhdp/htpasswd-secret-ss-job.yaml rename to components/cluster-configs/login/overlays/rhdp/htpasswd-secret-ss-job.yaml diff --git a/components/configs/cluster/login/overlays/rhdp/htpasswd-secret-ss.yaml b/components/cluster-configs/login/overlays/rhdp/htpasswd-secret-ss.yaml similarity index 100% rename from components/configs/cluster/login/overlays/rhdp/htpasswd-secret-ss.yaml rename to components/cluster-configs/login/overlays/rhdp/htpasswd-secret-ss.yaml diff --git a/components/configs/cluster/login/overlays/rhdp/job.sh b/components/cluster-configs/login/overlays/rhdp/job.sh similarity index 100% rename from components/configs/cluster/login/overlays/rhdp/job.sh rename to components/cluster-configs/login/overlays/rhdp/job.sh diff --git a/components/configs/cluster/login/overlays/rhdp/job.yaml b/components/cluster-configs/login/overlays/rhdp/job.yaml similarity index 100% rename from components/configs/cluster/login/overlays/rhdp/job.yaml rename to components/cluster-configs/login/overlays/rhdp/job.yaml diff --git a/components/configs/cluster/login/overlays/rhdp/kustomization.yaml b/components/cluster-configs/login/overlays/rhdp/kustomization.yaml similarity index 96% rename from components/configs/cluster/login/overlays/rhdp/kustomization.yaml rename to components/cluster-configs/login/overlays/rhdp/kustomization.yaml index acbe0810..94b23b14 100644 --- a/components/configs/cluster/login/overlays/rhdp/kustomization.yaml +++ b/components/cluster-configs/login/overlays/rhdp/kustomization.yaml @@ -19,4 +19,4 @@ patches: group: config.openshift.io kind: OAuth name: cluster - version: v1 \ No newline at end of file + version: v1 diff --git a/components/configs/cluster/login/overlays/rhdp/patch-idp.yaml b/components/cluster-configs/login/overlays/rhdp/patch-idp.yaml similarity index 100% rename from components/configs/cluster/login/overlays/rhdp/patch-idp.yaml rename to components/cluster-configs/login/overlays/rhdp/patch-idp.yaml diff --git a/components/configs/cluster/login/overlays/testing/github-client-sealed-secret.yaml b/components/cluster-configs/login/overlays/testing/github-client-sealed-secret.yaml similarity index 100% rename from components/configs/cluster/login/overlays/testing/github-client-sealed-secret.yaml rename to components/cluster-configs/login/overlays/testing/github-client-sealed-secret.yaml diff --git a/components/configs/cluster/login/overlays/testing/htpasswd-fix-user-job.yaml b/components/cluster-configs/login/overlays/testing/htpasswd-fix-user-job.yaml similarity index 100% rename from components/configs/cluster/login/overlays/testing/htpasswd-fix-user-job.yaml rename to components/cluster-configs/login/overlays/testing/htpasswd-fix-user-job.yaml diff --git a/components/configs/cluster/login/overlays/testing/htpasswd-secret-ss-job.yaml b/components/cluster-configs/login/overlays/testing/htpasswd-secret-ss-job.yaml similarity index 100% rename from components/configs/cluster/login/overlays/testing/htpasswd-secret-ss-job.yaml rename to components/cluster-configs/login/overlays/testing/htpasswd-secret-ss-job.yaml diff --git a/components/configs/cluster/login/overlays/testing/htpasswd-secret-ss.yaml b/components/cluster-configs/login/overlays/testing/htpasswd-secret-ss.yaml similarity index 100% rename from components/configs/cluster/login/overlays/testing/htpasswd-secret-ss.yaml rename to components/cluster-configs/login/overlays/testing/htpasswd-secret-ss.yaml diff --git a/components/configs/cluster/login/overlays/testing/kustomization.yaml b/components/cluster-configs/login/overlays/testing/kustomization.yaml similarity index 100% rename from components/configs/cluster/login/overlays/testing/kustomization.yaml rename to components/cluster-configs/login/overlays/testing/kustomization.yaml diff --git a/components/configs/cluster/login/overlays/testing/login-custom-secret.yaml b/components/cluster-configs/login/overlays/testing/login-custom-secret.yaml similarity index 100% rename from components/configs/cluster/login/overlays/testing/login-custom-secret.yaml rename to components/cluster-configs/login/overlays/testing/login-custom-secret.yaml diff --git a/components/configs/cluster/login/overlays/testing/patch-idp.yaml b/components/cluster-configs/login/overlays/testing/patch-idp.yaml similarity index 100% rename from components/configs/cluster/login/overlays/testing/patch-idp.yaml rename to components/cluster-configs/login/overlays/testing/patch-idp.yaml diff --git a/components/configs/cluster/login/overlays/testing/v4-0-config-user-template-login.yaml b/components/cluster-configs/login/overlays/testing/v4-0-config-user-template-login.yaml similarity index 100% rename from components/configs/cluster/login/overlays/testing/v4-0-config-user-template-login.yaml rename to components/cluster-configs/login/overlays/testing/v4-0-config-user-template-login.yaml diff --git a/components/configs/cluster/machine-config/base/99-master-ssh-machineconfig.yaml b/components/cluster-configs/machine-config/base/99-master-ssh-machineconfig.yaml similarity index 100% rename from components/configs/cluster/machine-config/base/99-master-ssh-machineconfig.yaml rename to components/cluster-configs/machine-config/base/99-master-ssh-machineconfig.yaml diff --git a/components/configs/cluster/machine-config/base/99-worker-ssh-machineconfig.yaml b/components/cluster-configs/machine-config/base/99-worker-ssh-machineconfig.yaml similarity index 100% rename from components/configs/cluster/machine-config/base/99-worker-ssh-machineconfig.yaml rename to components/cluster-configs/machine-config/base/99-worker-ssh-machineconfig.yaml diff --git a/components/configs/cluster/machine-config/base/kustomization.yaml b/components/cluster-configs/machine-config/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/machine-config/base/kustomization.yaml rename to components/cluster-configs/machine-config/base/kustomization.yaml diff --git a/components/configs/cluster/machine-config/dump/hugepages-1g/hugepages-1g-mcp.yml b/components/cluster-configs/machine-config/dump/hugepages-1g/hugepages-1g-mcp.yml similarity index 100% rename from components/configs/cluster/machine-config/dump/hugepages-1g/hugepages-1g-mcp.yml rename to components/cluster-configs/machine-config/dump/hugepages-1g/hugepages-1g-mcp.yml diff --git a/components/configs/cluster/machine-config/dump/hugepages-1g/hugepages-1g-ms.yml b/components/cluster-configs/machine-config/dump/hugepages-1g/hugepages-1g-ms.yml similarity index 100% rename from components/configs/cluster/machine-config/dump/hugepages-1g/hugepages-1g-ms.yml rename to components/cluster-configs/machine-config/dump/hugepages-1g/hugepages-1g-ms.yml diff --git a/components/configs/cluster/machine-config/dump/hugepages-1g/hugepages-1g-tuned-boottime.yml b/components/cluster-configs/machine-config/dump/hugepages-1g/hugepages-1g-tuned-boottime.yml similarity index 100% rename from components/configs/cluster/machine-config/dump/hugepages-1g/hugepages-1g-tuned-boottime.yml rename to components/cluster-configs/machine-config/dump/hugepages-1g/hugepages-1g-tuned-boottime.yml diff --git a/components/configs/cluster/machine-config/dump/hugepages-2m/hugepages-2m-mc-50.yml b/components/cluster-configs/machine-config/dump/hugepages-2m/hugepages-2m-mc-50.yml similarity index 100% rename from components/configs/cluster/machine-config/dump/hugepages-2m/hugepages-2m-mc-50.yml rename to components/cluster-configs/machine-config/dump/hugepages-2m/hugepages-2m-mc-50.yml diff --git a/components/configs/cluster/machine-config/dump/hugepages-2m/hugepages-2m-mcp.yml b/components/cluster-configs/machine-config/dump/hugepages-2m/hugepages-2m-mcp.yml similarity index 100% rename from components/configs/cluster/machine-config/dump/hugepages-2m/hugepages-2m-mcp.yml rename to components/cluster-configs/machine-config/dump/hugepages-2m/hugepages-2m-mcp.yml diff --git a/components/configs/cluster/machine-config/dump/hugepages-2m/hugepages-2m-ms.yml b/components/cluster-configs/machine-config/dump/hugepages-2m/hugepages-2m-ms.yml similarity index 100% rename from components/configs/cluster/machine-config/dump/hugepages-2m/hugepages-2m-ms.yml rename to components/cluster-configs/machine-config/dump/hugepages-2m/hugepages-2m-ms.yml diff --git a/components/configs/cluster/machine-config/dump/hugepages-2m/hugepages-2m-tuned-boottime.yml b/components/cluster-configs/machine-config/dump/hugepages-2m/hugepages-2m-tuned-boottime.yml similarity index 100% rename from components/configs/cluster/machine-config/dump/hugepages-2m/hugepages-2m-tuned-boottime.yml rename to components/cluster-configs/machine-config/dump/hugepages-2m/hugepages-2m-tuned-boottime.yml diff --git a/components/configs/cluster/machine-config/overlays/default/exclude-ssh-master.yaml b/components/cluster-configs/machine-config/overlays/default/exclude-ssh-master.yaml similarity index 100% rename from components/configs/cluster/machine-config/overlays/default/exclude-ssh-master.yaml rename to components/cluster-configs/machine-config/overlays/default/exclude-ssh-master.yaml diff --git a/components/configs/cluster/machine-config/overlays/default/exclude-ssh-worker.yaml b/components/cluster-configs/machine-config/overlays/default/exclude-ssh-worker.yaml similarity index 100% rename from components/configs/cluster/machine-config/overlays/default/exclude-ssh-worker.yaml rename to components/cluster-configs/machine-config/overlays/default/exclude-ssh-worker.yaml diff --git a/components/configs/cluster/machine-config/overlays/default/kustomization.yaml b/components/cluster-configs/machine-config/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/cluster/machine-config/overlays/default/kustomization.yaml rename to components/cluster-configs/machine-config/overlays/default/kustomization.yaml diff --git a/components/configs/cluster/machine-config/overlays/ssh-example/kustomization.yaml b/components/cluster-configs/machine-config/overlays/ssh-example/kustomization.yaml similarity index 100% rename from components/configs/cluster/machine-config/overlays/ssh-example/kustomization.yaml rename to components/cluster-configs/machine-config/overlays/ssh-example/kustomization.yaml diff --git a/components/configs/cluster/machine-config/overlays/ssh-example/patch-ssh.yaml b/components/cluster-configs/machine-config/overlays/ssh-example/patch-ssh.yaml similarity index 100% rename from components/configs/cluster/machine-config/overlays/ssh-example/patch-ssh.yaml rename to components/cluster-configs/machine-config/overlays/ssh-example/patch-ssh.yaml diff --git a/components/configs/cluster/namespace-cleanup/base/job.sh b/components/cluster-configs/namespace-cleanup/base/job.sh similarity index 100% rename from components/configs/cluster/namespace-cleanup/base/job.sh rename to components/cluster-configs/namespace-cleanup/base/job.sh diff --git a/components/configs/cluster/namespace-cleanup/base/job.yaml b/components/cluster-configs/namespace-cleanup/base/job.yaml similarity index 100% rename from components/configs/cluster/namespace-cleanup/base/job.yaml rename to components/cluster-configs/namespace-cleanup/base/job.yaml diff --git a/components/configs/cluster/namespace-cleanup/base/kustomization.yaml b/components/cluster-configs/namespace-cleanup/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/namespace-cleanup/base/kustomization.yaml rename to components/cluster-configs/namespace-cleanup/base/kustomization.yaml diff --git a/components/configs/cluster/namespace-cleanup/overlays/sandbox/kustomization.yaml b/components/cluster-configs/namespace-cleanup/overlays/sandbox/kustomization.yaml similarity index 93% rename from components/configs/cluster/namespace-cleanup/overlays/sandbox/kustomization.yaml rename to components/cluster-configs/namespace-cleanup/overlays/sandbox/kustomization.yaml index 3e31e151..69b99e4c 100644 --- a/components/configs/cluster/namespace-cleanup/overlays/sandbox/kustomization.yaml +++ b/components/cluster-configs/namespace-cleanup/overlays/sandbox/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - cleanup: sandbox +labels: +- includeSelectors: false + pairs: + cleanup: sandbox resources: - ../../base diff --git a/components/configs/cluster/namespaces/base/cluster-config-project.yaml b/components/cluster-configs/namespaces/base/cluster-config-project.yaml similarity index 92% rename from components/configs/cluster/namespaces/base/cluster-config-project.yaml rename to components/cluster-configs/namespaces/base/cluster-config-project.yaml index f41de2b0..1649ecc0 100644 --- a/components/configs/cluster/namespaces/base/cluster-config-project.yaml +++ b/components/cluster-configs/namespaces/base/cluster-config-project.yaml @@ -9,4 +9,4 @@ spec: If you want to change this situation look at: https://github.com/redhat-na-ssa/demo-ai-gitops-catalog projectRequestTemplate: {} - # name: project-request \ No newline at end of file + # name: project-request diff --git a/components/configs/cluster/namespaces/base/kustomization.yaml b/components/cluster-configs/namespaces/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/namespaces/base/kustomization.yaml rename to components/cluster-configs/namespaces/base/kustomization.yaml diff --git a/components/configs/cluster/namespaces/base/project-request-template.yaml b/components/cluster-configs/namespaces/base/project-request-template.yaml similarity index 100% rename from components/configs/cluster/namespaces/base/project-request-template.yaml rename to components/cluster-configs/namespaces/base/project-request-template.yaml diff --git a/components/configs/cluster/namespaces/instance/codekow/admin-rolebinding.yaml b/components/cluster-configs/namespaces/instance/codekow/admin-rolebinding.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/codekow/admin-rolebinding.yaml rename to components/cluster-configs/namespaces/instance/codekow/admin-rolebinding.yaml diff --git a/components/configs/cluster/namespaces/instance/codekow/kustomization.yaml b/components/cluster-configs/namespaces/instance/codekow/kustomization.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/codekow/kustomization.yaml rename to components/cluster-configs/namespaces/instance/codekow/kustomization.yaml diff --git a/components/configs/cluster/namespaces/instance/codekow/namespace.yaml b/components/cluster-configs/namespaces/instance/codekow/namespace.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/codekow/namespace.yaml rename to components/cluster-configs/namespaces/instance/codekow/namespace.yaml diff --git a/components/configs/cluster/namespaces/instance/registry/kustomization.yaml b/components/cluster-configs/namespaces/instance/registry/kustomization.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/registry/kustomization.yaml rename to components/cluster-configs/namespaces/instance/registry/kustomization.yaml diff --git a/components/configs/cluster/namespaces/instance/registry/namespace.yaml b/components/cluster-configs/namespaces/instance/registry/namespace.yaml similarity index 78% rename from components/configs/cluster/namespaces/instance/registry/namespace.yaml rename to components/cluster-configs/namespaces/instance/registry/namespace.yaml index 54280ce5..c3b86bdd 100644 --- a/components/configs/cluster/namespaces/instance/registry/namespace.yaml +++ b/components/cluster-configs/namespaces/instance/registry/namespace.yaml @@ -7,4 +7,4 @@ metadata: A container registry openshift.io/display-name: Registry labels: - argocd.argoproj.io/managed-by: cluster-config \ No newline at end of file + argocd.argoproj.io/managed-by: cluster-config diff --git a/components/configs/cluster/namespaces/instance/registry/rolebinding-edit.yaml b/components/cluster-configs/namespaces/instance/registry/rolebinding-edit.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/registry/rolebinding-edit.yaml rename to components/cluster-configs/namespaces/instance/registry/rolebinding-edit.yaml diff --git a/components/configs/cluster/namespaces/instance/registry/rolebinding-puller.yaml b/components/cluster-configs/namespaces/instance/registry/rolebinding-puller.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/registry/rolebinding-puller.yaml rename to components/cluster-configs/namespaces/instance/registry/rolebinding-puller.yaml diff --git a/components/configs/cluster/namespaces/instance/registry/rolebinding-pusher.yaml b/components/cluster-configs/namespaces/instance/registry/rolebinding-pusher.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/registry/rolebinding-pusher.yaml rename to components/cluster-configs/namespaces/instance/registry/rolebinding-pusher.yaml diff --git a/components/configs/cluster/namespaces/instance/registry/rolebinding-viewer.yaml b/components/cluster-configs/namespaces/instance/registry/rolebinding-viewer.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/registry/rolebinding-viewer.yaml rename to components/cluster-configs/namespaces/instance/registry/rolebinding-viewer.yaml diff --git a/components/configs/cluster/namespaces/instance/registry/sa-puller.yaml b/components/cluster-configs/namespaces/instance/registry/sa-puller.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/registry/sa-puller.yaml rename to components/cluster-configs/namespaces/instance/registry/sa-puller.yaml diff --git a/components/configs/cluster/namespaces/instance/registry/sa-pusher.yaml b/components/cluster-configs/namespaces/instance/registry/sa-pusher.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/registry/sa-pusher.yaml rename to components/cluster-configs/namespaces/instance/registry/sa-pusher.yaml diff --git a/components/configs/cluster/namespaces/instance/sandbox/kustomization.yaml b/components/cluster-configs/namespaces/instance/sandbox/kustomization.yaml similarity index 85% rename from components/configs/cluster/namespaces/instance/sandbox/kustomization.yaml rename to components/cluster-configs/namespaces/instance/sandbox/kustomization.yaml index 79156305..5b3dc3cf 100644 --- a/components/configs/cluster/namespaces/instance/sandbox/kustomization.yaml +++ b/components/cluster-configs/namespaces/instance/sandbox/kustomization.yaml @@ -7,4 +7,4 @@ resources: - limit-range.yaml - namespace.yaml - quota.yaml - - rolebinding-edit.yaml \ No newline at end of file + - rolebinding-edit.yaml diff --git a/components/configs/cluster/namespaces/instance/sandbox/limit-range.yaml b/components/cluster-configs/namespaces/instance/sandbox/limit-range.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/sandbox/limit-range.yaml rename to components/cluster-configs/namespaces/instance/sandbox/limit-range.yaml diff --git a/components/configs/cluster/namespaces/instance/sandbox/namespace.yaml b/components/cluster-configs/namespaces/instance/sandbox/namespace.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/sandbox/namespace.yaml rename to components/cluster-configs/namespaces/instance/sandbox/namespace.yaml diff --git a/components/configs/cluster/namespaces/instance/sandbox/quota.yaml b/components/cluster-configs/namespaces/instance/sandbox/quota.yaml similarity index 94% rename from components/configs/cluster/namespaces/instance/sandbox/quota.yaml rename to components/cluster-configs/namespaces/instance/sandbox/quota.yaml index 4be3860c..e5aa625e 100644 --- a/components/configs/cluster/namespaces/instance/sandbox/quota.yaml +++ b/components/cluster-configs/namespaces/instance/sandbox/quota.yaml @@ -28,4 +28,4 @@ spec: hard: count/sealedsecrets.bitnami.com: '0' count/cronjobs.batch: '4' - count/daemonsets.apps: '0' \ No newline at end of file + count/daemonsets.apps: '0' diff --git a/components/configs/cluster/namespaces/instance/sandbox/rolebinding-edit.yaml b/components/cluster-configs/namespaces/instance/sandbox/rolebinding-edit.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/sandbox/rolebinding-edit.yaml rename to components/cluster-configs/namespaces/instance/sandbox/rolebinding-edit.yaml diff --git a/components/configs/cluster/namespaces/instance/template/group-admin.yaml b/components/cluster-configs/namespaces/instance/template/group-admin.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/template/group-admin.yaml rename to components/cluster-configs/namespaces/instance/template/group-admin.yaml diff --git a/components/configs/cluster/namespaces/instance/template/kustomization.yaml b/components/cluster-configs/namespaces/instance/template/kustomization.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/template/kustomization.yaml rename to components/cluster-configs/namespaces/instance/template/kustomization.yaml diff --git a/components/configs/cluster/namespaces/instance/template/limit-range.yaml b/components/cluster-configs/namespaces/instance/template/limit-range.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/template/limit-range.yaml rename to components/cluster-configs/namespaces/instance/template/limit-range.yaml diff --git a/components/configs/cluster/namespaces/instance/template/namespace.yaml b/components/cluster-configs/namespaces/instance/template/namespace.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/template/namespace.yaml rename to components/cluster-configs/namespaces/instance/template/namespace.yaml diff --git a/components/configs/cluster/namespaces/instance/template/quota.yaml b/components/cluster-configs/namespaces/instance/template/quota.yaml similarity index 91% rename from components/configs/cluster/namespaces/instance/template/quota.yaml rename to components/cluster-configs/namespaces/instance/template/quota.yaml index f46aaba9..857958a3 100644 --- a/components/configs/cluster/namespaces/instance/template/quota.yaml +++ b/components/cluster-configs/namespaces/instance/template/quota.yaml @@ -18,4 +18,4 @@ metadata: spec: hard: requests.storage: 20Gi - persistentvolumeclaims: '40' \ No newline at end of file + persistentvolumeclaims: '40' diff --git a/components/configs/cluster/namespaces/instance/template/rolebinding-edit.yaml b/components/cluster-configs/namespaces/instance/template/rolebinding-edit.yaml similarity index 100% rename from components/configs/cluster/namespaces/instance/template/rolebinding-edit.yaml rename to components/cluster-configs/namespaces/instance/template/rolebinding-edit.yaml diff --git a/components/configs/cluster/namespaces/overlays/default-limited/kustomization.yaml b/components/cluster-configs/namespaces/overlays/default-limited/kustomization.yaml similarity index 100% rename from components/configs/cluster/namespaces/overlays/default-limited/kustomization.yaml rename to components/cluster-configs/namespaces/overlays/default-limited/kustomization.yaml diff --git a/components/configs/cluster/namespaces/overlays/default/kustomization.yaml b/components/cluster-configs/namespaces/overlays/default/kustomization.yaml similarity index 89% rename from components/configs/cluster/namespaces/overlays/default/kustomization.yaml rename to components/cluster-configs/namespaces/overlays/default/kustomization.yaml index 967278a9..8f26eb01 100644 --- a/components/configs/cluster/namespaces/overlays/default/kustomization.yaml +++ b/components/cluster-configs/namespaces/overlays/default/kustomization.yaml @@ -1,9 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - namespaces: default - resources: - ../../base - ../../instance/sandbox diff --git a/components/configs/cluster/namespaces/overlays/team/kustomization.yaml b/components/cluster-configs/namespaces/overlays/team/kustomization.yaml similarity index 100% rename from components/configs/cluster/namespaces/overlays/team/kustomization.yaml rename to components/cluster-configs/namespaces/overlays/team/kustomization.yaml diff --git a/components/configs/cluster/rbac/base/default-self-provisioner-crb.yaml b/components/cluster-configs/rbac/base/default-self-provisioner-crb.yaml similarity index 100% rename from components/configs/cluster/rbac/base/default-self-provisioner-crb.yaml rename to components/cluster-configs/rbac/base/default-self-provisioner-crb.yaml diff --git a/components/configs/cluster/rbac/base/kustomization.yaml b/components/cluster-configs/rbac/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/rbac/base/kustomization.yaml rename to components/cluster-configs/rbac/base/kustomization.yaml diff --git a/components/configs/cluster/rbac/overlays/custom/cluster-admins-group.yaml b/components/cluster-configs/rbac/overlays/custom/cluster-admins-group.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/custom/cluster-admins-group.yaml rename to components/cluster-configs/rbac/overlays/custom/cluster-admins-group.yaml diff --git a/components/configs/cluster/rbac/overlays/custom/cluster-admins-rolebinding.yaml b/components/cluster-configs/rbac/overlays/custom/cluster-admins-rolebinding.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/custom/cluster-admins-rolebinding.yaml rename to components/cluster-configs/rbac/overlays/custom/cluster-admins-rolebinding.yaml diff --git a/components/configs/cluster/rbac/overlays/custom/cluster-readers-group.yaml b/components/cluster-configs/rbac/overlays/custom/cluster-readers-group.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/custom/cluster-readers-group.yaml rename to components/cluster-configs/rbac/overlays/custom/cluster-readers-group.yaml diff --git a/components/configs/cluster/rbac/overlays/custom/cluster-readers-rolebinding.yaml b/components/cluster-configs/rbac/overlays/custom/cluster-readers-rolebinding.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/custom/cluster-readers-rolebinding.yaml rename to components/cluster-configs/rbac/overlays/custom/cluster-readers-rolebinding.yaml diff --git a/components/configs/cluster/rbac/overlays/custom/kustomization.yaml b/components/cluster-configs/rbac/overlays/custom/kustomization.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/custom/kustomization.yaml rename to components/cluster-configs/rbac/overlays/custom/kustomization.yaml diff --git a/components/operators/servicemeshoperator/instance/overlays/default/kustomization.yaml b/components/cluster-configs/rbac/overlays/default/kustomization.yaml similarity index 100% rename from components/operators/servicemeshoperator/instance/overlays/default/kustomization.yaml rename to components/cluster-configs/rbac/overlays/default/kustomization.yaml diff --git a/components/configs/cluster/rbac/overlays/manual-user-config/exclude-cluster-admin-group.yaml b/components/cluster-configs/rbac/overlays/manual-user-config/exclude-cluster-admin-group.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/manual-user-config/exclude-cluster-admin-group.yaml rename to components/cluster-configs/rbac/overlays/manual-user-config/exclude-cluster-admin-group.yaml diff --git a/components/configs/cluster/rbac/overlays/manual-user-config/exclude-cluster-reader-group.yaml b/components/cluster-configs/rbac/overlays/manual-user-config/exclude-cluster-reader-group.yaml similarity index 74% rename from components/configs/cluster/rbac/overlays/manual-user-config/exclude-cluster-reader-group.yaml rename to components/cluster-configs/rbac/overlays/manual-user-config/exclude-cluster-reader-group.yaml index b3af1a14..9026b9b0 100644 --- a/components/configs/cluster/rbac/overlays/manual-user-config/exclude-cluster-reader-group.yaml +++ b/components/cluster-configs/rbac/overlays/manual-user-config/exclude-cluster-reader-group.yaml @@ -2,4 +2,4 @@ $patch: delete kind: Group apiVersion: user.openshift.io/v1 metadata: - name: cluster-readers \ No newline at end of file + name: cluster-readers diff --git a/components/configs/cluster/rbac/overlays/manual-user-config/kustomization.yaml b/components/cluster-configs/rbac/overlays/manual-user-config/kustomization.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/manual-user-config/kustomization.yaml rename to components/cluster-configs/rbac/overlays/manual-user-config/kustomization.yaml diff --git a/components/configs/cluster/rbac/overlays/no-self-provisioner/exclude-self-provisioner.yaml b/components/cluster-configs/rbac/overlays/no-self-provisioner/exclude-self-provisioner.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/no-self-provisioner/exclude-self-provisioner.yaml rename to components/cluster-configs/rbac/overlays/no-self-provisioner/exclude-self-provisioner.yaml diff --git a/components/configs/cluster/rbac/overlays/no-self-provisioner/kustomization.yaml b/components/cluster-configs/rbac/overlays/no-self-provisioner/kustomization.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/no-self-provisioner/kustomization.yaml rename to components/cluster-configs/rbac/overlays/no-self-provisioner/kustomization.yaml diff --git a/components/configs/cluster/rbac/overlays/no-self-provisioner/self-provisioner.yaml b/components/cluster-configs/rbac/overlays/no-self-provisioner/self-provisioner.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/no-self-provisioner/self-provisioner.yaml rename to components/cluster-configs/rbac/overlays/no-self-provisioner/self-provisioner.yaml diff --git a/components/configs/cluster/rbac/overlays/restore-defaults/default-cluster-admins-crb.yaml b/components/cluster-configs/rbac/overlays/restore-defaults/default-cluster-admins-crb.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/restore-defaults/default-cluster-admins-crb.yaml rename to components/cluster-configs/rbac/overlays/restore-defaults/default-cluster-admins-crb.yaml diff --git a/components/configs/cluster/rbac/overlays/restore-defaults/default-self-provisioner-crb.yaml b/components/cluster-configs/rbac/overlays/restore-defaults/default-self-provisioner-crb.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/restore-defaults/default-self-provisioner-crb.yaml rename to components/cluster-configs/rbac/overlays/restore-defaults/default-self-provisioner-crb.yaml diff --git a/components/configs/cluster/rbac/overlays/restore-defaults/kustomization.yaml b/components/cluster-configs/rbac/overlays/restore-defaults/kustomization.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/restore-defaults/kustomization.yaml rename to components/cluster-configs/rbac/overlays/restore-defaults/kustomization.yaml diff --git a/components/configs/cluster/rbac/overlays/workshop/kustomization.yaml b/components/cluster-configs/rbac/overlays/workshop/kustomization.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/workshop/kustomization.yaml rename to components/cluster-configs/rbac/overlays/workshop/kustomization.yaml diff --git a/components/configs/cluster/rbac/overlays/workshop/workshop-admins-group.yaml b/components/cluster-configs/rbac/overlays/workshop/workshop-admins-group.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/workshop/workshop-admins-group.yaml rename to components/cluster-configs/rbac/overlays/workshop/workshop-admins-group.yaml diff --git a/components/configs/cluster/rbac/overlays/workshop/workshop-users-group.yaml b/components/cluster-configs/rbac/overlays/workshop/workshop-users-group.yaml similarity index 100% rename from components/configs/cluster/rbac/overlays/workshop/workshop-users-group.yaml rename to components/cluster-configs/rbac/overlays/workshop/workshop-users-group.yaml diff --git a/components/configs/cluster/registry/base/imageregistry-config.yaml b/components/cluster-configs/registry/base/imageregistry-config.yaml similarity index 100% rename from components/configs/cluster/registry/base/imageregistry-config.yaml rename to components/cluster-configs/registry/base/imageregistry-config.yaml diff --git a/components/configs/cluster/registry/base/kustomization.yaml b/components/cluster-configs/registry/base/kustomization.yaml similarity index 100% rename from components/configs/cluster/registry/base/kustomization.yaml rename to components/cluster-configs/registry/base/kustomization.yaml diff --git a/components/configs/cluster/registry/overlays/default/kustomization.yaml b/components/cluster-configs/registry/overlays/default/kustomization.yaml similarity index 83% rename from components/configs/cluster/registry/overlays/default/kustomization.yaml rename to components/cluster-configs/registry/overlays/default/kustomization.yaml index 681848f0..774a422d 100644 --- a/components/configs/cluster/registry/overlays/default/kustomization.yaml +++ b/components/cluster-configs/registry/overlays/default/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base \ No newline at end of file + - ../../base diff --git a/components/configs/cluster/registry/overlays/empty-dir/kustomization.yaml b/components/cluster-configs/registry/overlays/empty-dir/kustomization.yaml similarity index 91% rename from components/configs/cluster/registry/overlays/empty-dir/kustomization.yaml rename to components/cluster-configs/registry/overlays/empty-dir/kustomization.yaml index d6e25d69..766aa835 100644 --- a/components/configs/cluster/registry/overlays/empty-dir/kustomization.yaml +++ b/components/cluster-configs/registry/overlays/empty-dir/kustomization.yaml @@ -15,4 +15,4 @@ patches: managementState: Managed replicas: 1 storage: - emptyDir: {} \ No newline at end of file + emptyDir: {} diff --git a/components/configs/cluster/registry/overlays/pvc/kustomization.yaml b/components/cluster-configs/registry/overlays/pvc/kustomization.yaml similarity index 100% rename from components/configs/cluster/registry/overlays/pvc/kustomization.yaml rename to components/cluster-configs/registry/overlays/pvc/kustomization.yaml diff --git a/components/configs/cluster/cluster-certs/base/kustomization.yaml b/components/configs/cluster/cluster-certs/base/kustomization.yaml deleted file mode 100644 index de177bbf..00000000 --- a/components/configs/cluster/cluster-certs/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../../../operators/openshift-cert-manager-operator/examples/letsencrypt-route53-issuer - - ../../../../operators/openshift-cert-manager-operator/examples/openshift-api-certificate - - ../../../../operators/openshift-cert-manager-operator/examples/openshift-wildcard-certificate \ No newline at end of file diff --git a/components/configs/kustomized/label-studio/base/kustomization.yaml b/components/configs/kustomized/label-studio/base/kustomization.yaml deleted file mode 100644 index 12e4c50e..00000000 --- a/components/configs/kustomized/label-studio/base/kustomization.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -commonLabels: - app: label-studio - # app.kubernetes.io/component: label-studio - # app.kubernetes.io/instance: label-studio - app.kubernetes.io/name: label-studio - app.kubernetes.io/part-of: label-studio - -resources: -# - bc-patch.yaml -- bc-s2i.yaml -- db-deploy.yaml -- db-pvc.yaml -- db-secret.yaml -- db-svc.yaml -# - deploy-patch.yaml -- deploy.yaml -- is.yaml -- pvc.yaml -- route.yaml -- svc.yaml diff --git a/components/containers/oc-mirror/Containerfile b/components/containers/oc-mirror/Containerfile index 2cdd230e..43723603 100644 --- a/components/containers/oc-mirror/Containerfile +++ b/components/containers/oc-mirror/Containerfile @@ -27,6 +27,7 @@ RUN curl -sL "${OC4_URL}" | \ echo "source /etc/bash_completion.d/oc-mirror" >> /etc/skel/.bashrc # setup: user +# hadolint ignore=SC2028 RUN \ sed -i '/^export PS1=.*/d' /etc/skel/.bashrc && \ echo "export PS1='\W \`git branch --show-current 2>/dev/null | sed -r -e \"s@^(.+)@\(\1\) @\"\`$ '" >> /etc/skel/.bashrc && \ diff --git a/components/containers/udi-base/ubi9/Dockerfile b/components/containers/udi-base/ubi9/Dockerfile index eccc8013..6bbb7646 100644 --- a/components/containers/udi-base/ubi9/Dockerfile +++ b/components/containers/udi-base/ubi9/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.3-labs -ARG IMAGE_NAME=registry.access.redhat.com/ubi9/ubi +ARG IMAGE_NAME=registry.access.redhat.com/ubi9/ubi:9.4 FROM ${IMAGE_NAME} # cherry picked from below @@ -43,6 +43,7 @@ RUN curl -sL "${OC4_URL}" | \ COPY --chown=0:0 entrypoint.sh / # setup: user +# hadolint ignore=SC2028 RUN \ # setup $PS1 prompt sed -i '/^export PS1=.*/d' /etc/skel/.bashrc && \ diff --git a/components/operators/authorino-operator/README.md b/components/operators/authorino-operator/README.md index 5d83fb37..549dec02 100644 --- a/components/operators/authorino-operator/README.md +++ b/components/operators/authorino-operator/README.md @@ -6,8 +6,7 @@ Do not use the `base` directory directly, as you will need to patch the `channel The current *overlays* available are for the following channels: -* [managed-services](operator/overlays/alpha) -* [stable](operator/overlays/stable) +* [managed-services](operator/overlays/managed-services) ## Usage diff --git a/components/operators/devspaces/instance/base/kustomization.yaml b/components/operators/devspaces/instance/base/kustomization.yaml index 178fdc23..86cd4752 100644 --- a/components/operators/devspaces/instance/base/kustomization.yaml +++ b/components/operators/devspaces/instance/base/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - component: devspaces +labels: +- includeSelectors: false + pairs: + component: devspaces namespace: devspaces diff --git a/components/operators/elasticsearch-operator/elasticsearch-operator b/components/operators/elasticsearch-operator/elasticsearch-operator new file mode 120000 index 00000000..8bf90ed4 --- /dev/null +++ b/components/operators/elasticsearch-operator/elasticsearch-operator @@ -0,0 +1 @@ +elasticsearch-operator \ No newline at end of file diff --git a/components/operators/gpu-operator-certified/instance/components/README.md b/components/operators/gpu-operator-certified/instance/components/README.md index ec48eda6..a0d16ac5 100644 --- a/components/operators/gpu-operator-certified/instance/components/README.md +++ b/components/operators/gpu-operator-certified/instance/components/README.md @@ -24,6 +24,5 @@ resources: - ../../base components: - - ../../components/console-plugin - ../../components/monitoring-dashboard ``` diff --git a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/job.yaml b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/job.yaml index 818e7e56..5261c355 100644 --- a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/job.yaml +++ b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/job.yaml @@ -55,8 +55,8 @@ metadata: generateName: job-aws-gpu-machineset- name: job-aws-gpu-machineset namespace: nvidia-gpu-operator - annotations: - argocd.argoproj.io/hook: Sync + # annotations: + # argocd.argoproj.io/hook: Sync # argocd.argoproj.io/hook-delete-policy: HookSucceeded spec: template: @@ -66,6 +66,8 @@ spec: # image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest image: registry.redhat.io/openshift4/ose-cli env: + - name: INSTANCE_TYPE + value: "g4dn.4xlarge" - name: NAMESPACE valueFrom: fieldRef: diff --git a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/kustomization.yaml b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/kustomization.yaml index 270c7cd2..5924b6e4 100644 --- a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/kustomization.yaml +++ b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/kustomization.yaml @@ -13,4 +13,4 @@ configMapGenerator: files: - job.sh - ocp.sh - # - https://raw.githubusercontent.com/redhat-na-ssa/demo-ai-gitops-catalog/main/scripts/library/ocp.sh \ No newline at end of file + # - https://raw.githubusercontent.com/redhat-na-ssa/demo-ai-gitops-catalog/main/scripts/library/ocp.sh diff --git a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/ocp.sh b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/ocp.sh index 5a2be57c..3dd3aa5b 100644 --- a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/ocp.sh +++ b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/ocp.sh @@ -1,6 +1,19 @@ #!/bin/bash # shellcheck disable=SC2120 +# See https://github.com/redhat-na-ssa/demo-ai-gitops-catalog +# FUNCTIONS=' +# ocp_aws_cluster +# ocp_aws_create_gpu_machineset +# ocp_aws_clone_worker_machineset +# ocp_create_machineset_autoscale' + +# for function in $FUNCTIONS +# do +# extract_function $function scripts/library/ocp.sh >> tmp +# echo >> tmp +# done + ocp_aws_cluster(){ TARGET_NS=kube-system OBJ=secret/aws-creds @@ -22,7 +35,7 @@ ocp_aws_create_gpu_machineset(){ INSTANCE_TYPE=${1:-g4dn.4xlarge} - ocp_aws_clone_machineset "${INSTANCE_TYPE}" + ocp_aws_clone_worker_machineset "${INSTANCE_TYPE}" MACHINE_SET_TYPE=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${INSTANCE_TYPE%.*}" | head -n1) @@ -57,28 +70,38 @@ ocp_aws_create_gpu_machineset(){ --type=merge --patch '{"spec":{"template":{"spec":{"providerSpec":{"value":{"instanceType":"'"${INSTANCE_TYPE}"'"}}}}}}' } -ocp_aws_clone_machineset(){ +ocp_aws_clone_worker_machineset(){ [ -z "${1}" ] && \ echo " - usage: ocp_aws_create_gpu_machineset < instance type, default g4dn.4xlarge > + usage: ocp_aws_clone_worker_machineset < instance type, default g4dn.4xlarge > < machine set name > " INSTANCE_TYPE=${1:-g4dn.4xlarge} - MACHINE_SET=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep worker | head -n1) + SHORT_NAME=${2:-${INSTANCE_TYPE%.*}} + + MACHINE_SET_NAME=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${SHORT_NAME}" | head -n1) + MACHINE_SET_WORKER=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep worker | head -n1) # check for an existing instance machine set - if oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep -q "${INSTANCE_TYPE%.*}"; then - echo "Exists: machineset - ${INSTANCE_TYPE}" + if [ -n "${MACHINE_SET_NAME}" ]; then + echo "Exists: machineset - ${MACHINE_SET_NAME}" else - echo "Creating: machineset - ${INSTANCE_TYPE}" + echo "Creating: machineset - ${SHORT_NAME}" oc -n openshift-machine-api \ - get "${MACHINE_SET}" -o yaml | \ + get "${MACHINE_SET_WORKER}" -o yaml | \ sed '/machine/ s/-worker/-'"${INSTANCE_TYPE}"'/g - /name/ s/-worker/-'"${INSTANCE_TYPE%.*}"'/g + /^ name:/ s/cluster-.*/'"${SHORT_NAME}"'/g + /name/ s/-worker/-'"${SHORT_NAME}"'/g s/instanceType.*/instanceType: '"${INSTANCE_TYPE}"'/ + /cluster-api-autoscaler/d s/replicas.*/replicas: 0/' | \ oc apply -f - fi + + # cosmetic pretty + oc -n openshift-machine-api \ + patch "${MACHINE_SET_NAME}" \ + --type=merge --patch '{"spec":{"template":{"spec":{"metadata":{"labels":{"node-role.kubernetes.io/'"${SHORT_NAME}"'":""}}}}}}' } ocp_create_machineset_autoscale(){ diff --git a/components/operators/gpu-operator-certified/operator/components/console-plugin-helm/console-plugin-job.sh b/components/operators/gpu-operator-certified/operator/components/console-plugin-helm/console-plugin-job.sh index f46cf183..271c0588 100755 --- a/components/operators/gpu-operator-certified/operator/components/console-plugin-helm/console-plugin-job.sh +++ b/components/operators/gpu-operator-certified/operator/components/console-plugin-helm/console-plugin-job.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash enable_console_plugin(){ [ -z "${PLUGIN_NAME}" ] && return 1 diff --git a/components/operators/gpu-operator-certified/operator/components/console-plugin/configmap.yaml b/components/operators/gpu-operator-certified/operator/components/console-plugin/configmap.yaml index ba2f9f03..1afa1c0a 100644 --- a/components/operators/gpu-operator-certified/operator/components/console-plugin/configmap.yaml +++ b/components/operators/gpu-operator-certified/operator/components/console-plugin/configmap.yaml @@ -5,9 +5,6 @@ kind: ConfigMap metadata: name: console-plugin-nvidia-gpu namespace: nvidia-gpu-operator - annotations: - meta.helm.sh/release-name: console-plugin-nvidia-gpu - meta.helm.sh/release-namespace: nvidia-gpu-operator labels: helm.sh/chart: console-plugin-nvidia-gpu-0.2.4 app.kubernetes.io/name: console-plugin-nvidia-gpu diff --git a/components/operators/gpu-operator-certified/operator/components/console-plugin/console-plugin-job.sh b/components/operators/gpu-operator-certified/operator/components/console-plugin/console-plugin-job.sh index f46cf183..271c0588 100755 --- a/components/operators/gpu-operator-certified/operator/components/console-plugin/console-plugin-job.sh +++ b/components/operators/gpu-operator-certified/operator/components/console-plugin/console-plugin-job.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash enable_console_plugin(){ [ -z "${PLUGIN_NAME}" ] && return 1 diff --git a/components/operators/gpu-operator-certified/operator/components/console-plugin/consoleplugin.yaml b/components/operators/gpu-operator-certified/operator/components/console-plugin/consoleplugin.yaml index f4382b97..0a3e8e29 100644 --- a/components/operators/gpu-operator-certified/operator/components/console-plugin/consoleplugin.yaml +++ b/components/operators/gpu-operator-certified/operator/components/console-plugin/consoleplugin.yaml @@ -5,9 +5,6 @@ kind: ConsolePlugin metadata: name: console-plugin-nvidia-gpu namespace: nvidia-gpu-operator - annotations: - meta.helm.sh/release-name: console-plugin-nvidia-gpu - meta.helm.sh/release-namespace: nvidia-gpu-operator labels: helm.sh/chart: console-plugin-nvidia-gpu-0.2.4 app.kubernetes.io/name: console-plugin-nvidia-gpu diff --git a/components/operators/gpu-operator-certified/operator/components/console-plugin/deployment.yaml b/components/operators/gpu-operator-certified/operator/components/console-plugin/deployment.yaml index 8b832d5f..6c59278f 100644 --- a/components/operators/gpu-operator-certified/operator/components/console-plugin/deployment.yaml +++ b/components/operators/gpu-operator-certified/operator/components/console-plugin/deployment.yaml @@ -5,9 +5,6 @@ kind: Deployment metadata: name: console-plugin-nvidia-gpu namespace: nvidia-gpu-operator - annotations: - meta.helm.sh/release-name: console-plugin-nvidia-gpu - meta.helm.sh/release-namespace: nvidia-gpu-operator labels: helm.sh/chart: console-plugin-nvidia-gpu-0.2.4 app.kubernetes.io/name: console-plugin-nvidia-gpu @@ -30,28 +27,28 @@ spec: securityContext: runAsNonRoot: true containers: - - name: console-plugin-nvidia-gpu - image: "quay.io/edge-infrastructure/console-plugin-nvidia-gpu:latest" - imagePullPolicy: Always - securityContext: - allowPrivilegeEscalation: false - ports: - - containerPort: 9443 - protocol: TCP - volumeMounts: - - name: plugin-serving-cert - readOnly: true - mountPath: /var/serving-cert - resources: {} + - name: console-plugin-nvidia-gpu + image: "quay.io/edge-infrastructure/console-plugin-nvidia-gpu:latest" + imagePullPolicy: Always + securityContext: + allowPrivilegeEscalation: false + ports: + - containerPort: 9443 + protocol: TCP + volumeMounts: + - name: plugin-serving-cert + readOnly: true + mountPath: /var/serving-cert + resources: {} volumes: - - name: plugin-serving-cert - secret: - secretName: plugin-serving-cert - defaultMode: 420 - - name: nginx-conf - configMap: - name: nginx-conf - defaultMode: 420 + - name: plugin-serving-cert + secret: + secretName: plugin-serving-cert + defaultMode: 420 + - name: nginx-conf + configMap: + name: nginx-conf + defaultMode: 420 restartPolicy: Always dnsPolicy: ClusterFirst strategy: diff --git a/components/operators/gpu-operator-certified/operator/components/console-plugin/service.yaml b/components/operators/gpu-operator-certified/operator/components/console-plugin/service.yaml index 4f36c546..dd32e37f 100644 --- a/components/operators/gpu-operator-certified/operator/components/console-plugin/service.yaml +++ b/components/operators/gpu-operator-certified/operator/components/console-plugin/service.yaml @@ -5,10 +5,6 @@ kind: Service metadata: name: console-plugin-nvidia-gpu namespace: nvidia-gpu-operator - annotations: - meta.helm.sh/release-name: console-plugin-nvidia-gpu - meta.helm.sh/release-namespace: nvidia-gpu-operator - service.alpha.openshift.io/serving-cert-secret-name: plugin-serving-cert labels: helm.sh/chart: console-plugin-nvidia-gpu-0.2.4 app.kubernetes.io/name: console-plugin-nvidia-gpu @@ -17,6 +13,8 @@ metadata: app.kubernetes.io/component: console-plugin-nvidia-gpu app.kubernetes.io/instance: console-plugin-nvidia-gpu app.kubernetes.io/part-of: console-plugin-nvidia-gpu + annotations: + service.alpha.openshift.io/serving-cert-secret-name: plugin-serving-cert spec: ports: - name: 9443-tcp diff --git a/components/operators/jaeger b/components/operators/jaeger new file mode 120000 index 00000000..dc7a5a54 --- /dev/null +++ b/components/operators/jaeger @@ -0,0 +1 @@ +jaeger-product \ No newline at end of file diff --git a/components/operators/kiali b/components/operators/kiali new file mode 120000 index 00000000..ebd88726 --- /dev/null +++ b/components/operators/kiali @@ -0,0 +1 @@ +kiali-ossm \ No newline at end of file diff --git a/components/operators/nfd/instance/base/node-feature-discovery.yaml b/components/operators/nfd/instance/base/node-feature-discovery.yaml index 91477712..a4cb0d80 100644 --- a/components/operators/nfd/instance/base/node-feature-discovery.yaml +++ b/components/operators/nfd/instance/base/node-feature-discovery.yaml @@ -125,4 +125,4 @@ spec: # - pciId: # vendor: ["15b3"] # device: ["1014", "1017"] - # loadedKMod : ["vendor_kmod1", "vendor_kmod2"] \ No newline at end of file + # loadedKMod : ["vendor_kmod1", "vendor_kmod2"] diff --git a/components/operators/odf-operator/aggregate/overlays/aws-node-labeler/kustomization.yaml b/components/operators/odf-operator/aggregate/overlays/aws-node-labeler/kustomization.yaml index e4e3d4e3..eb558e83 100644 --- a/components/operators/odf-operator/aggregate/overlays/aws-node-labeler/kustomization.yaml +++ b/components/operators/odf-operator/aggregate/overlays/aws-node-labeler/kustomization.yaml @@ -7,4 +7,6 @@ commonAnnotations: resources: - ../../../operator/overlays/stable-4.14 - ../../../instance/overlays/aws - - ../../../config-helpers/node-labeler/overlays/default + +components: + - ../../../components/node-labeler diff --git a/components/operators/odf-operator/aggregate/overlays/local-node-labeler/kustomization.yaml b/components/operators/odf-operator/aggregate/overlays/local-node-labeler/kustomization.yaml index c820775e..8a2e05e7 100644 --- a/components/operators/odf-operator/aggregate/overlays/local-node-labeler/kustomization.yaml +++ b/components/operators/odf-operator/aggregate/overlays/local-node-labeler/kustomization.yaml @@ -4,4 +4,6 @@ kind: Kustomization resources: - ../../../operator/overlays/stable-4.14 - ../../../instance/overlays/local-storage - - ../../../config-helpers/node-labeler/overlays/default + +components: + - ../../../components/node-labeler diff --git a/components/operators/odf-operator/aggregate/overlays/vsphere-node-labeler/kustomization.yaml b/components/operators/odf-operator/aggregate/overlays/vsphere-node-labeler/kustomization.yaml index 2ba6b6c4..b15ef2e2 100644 --- a/components/operators/odf-operator/aggregate/overlays/vsphere-node-labeler/kustomization.yaml +++ b/components/operators/odf-operator/aggregate/overlays/vsphere-node-labeler/kustomization.yaml @@ -4,4 +4,6 @@ kind: Kustomization resources: - ../../../operator/overlays/stable-4.14 - ../../../instance/overlays/vsphere - - ../../../config-helpers/node-labeler/overlays/default + +components: + - ../../../components/node-labeler diff --git a/components/operators/odf-operator/config-helpers/README.md b/components/operators/odf-operator/components/README.md similarity index 100% rename from components/operators/odf-operator/config-helpers/README.md rename to components/operators/odf-operator/components/README.md diff --git a/components/operators/odf-operator/components/aws-odf-machineset/job.sh b/components/operators/odf-operator/components/aws-odf-machineset/job.sh new file mode 100755 index 00000000..02b38bca --- /dev/null +++ b/components/operators/odf-operator/components/aws-odf-machineset/job.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# shellcheck disable=SC1091 + +. /scripts/ocp.sh + +INSTANCE_TYPE=${INSTANCE_TYPE:-m6a.2xlarge} + +ocp_aws_cluster || exit 0 +ocp_aws_create_odf_machineset "${INSTANCE_TYPE}" diff --git a/components/operators/odf-operator/components/aws-odf-machineset/job.yaml b/components/operators/odf-operator/components/aws-odf-machineset/job.yaml new file mode 100644 index 00000000..83d73222 --- /dev/null +++ b/components/operators/odf-operator/components/aws-odf-machineset/job.yaml @@ -0,0 +1,85 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: job-aws-odf-machineset +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: job-aws-odf-machineset +rules: +- apiGroups: + - machine.openshift.io + resources: + - machinesets + verbs: + - '*' +- apiGroups: + - autoscaling.openshift.io + resources: + - machineautoscalers + verbs: + - '*' +- apiGroups: + - '' + resources: + - secrets + resourceNames: + - aws-creds + verbs: + - get + - list +# - nonResourceURLs: +# - '*' +# verbs: +# - '*' +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: job-aws-odf-machineset +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: job-aws-odf-machineset +subjects: + - kind: ServiceAccount + name: job-aws-odf-machineset + namespace: openshift-machine-api +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: job-aws-odf-machineset + annotations: + argocd.argoproj.io/hook: Sync + # argocd.argoproj.io/hook-delete-policy: HookSucceeded +spec: + template: + spec: + containers: + - name: job-aws-odf-machineset + # image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest + image: registry.redhat.io/openshift4/ose-cli + env: + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + command: + - /bin/bash + - -c + - /scripts/job.sh + volumeMounts: + - name: scripts + mountPath: /scripts + volumes: + - name: scripts + configMap: + name: job-aws-odf-machineset + defaultMode: 0755 + restartPolicy: Never + terminationGracePeriodSeconds: 30 + serviceAccount: job-aws-odf-machineset + serviceAccountName: job-aws-odf-machineset diff --git a/components/operators/odf-operator/components/aws-odf-machineset/kustomization.yaml b/components/operators/odf-operator/components/aws-odf-machineset/kustomization.yaml new file mode 100644 index 00000000..3b1bacee --- /dev/null +++ b/components/operators/odf-operator/components/aws-odf-machineset/kustomization.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - job.yaml + +generatorOptions: + disableNameSuffixHash: true + +configMapGenerator: + - name: job-aws-odf-machineset + namespace: openshift-machine-api + files: + - job.sh + - ocp.sh + # - https://raw.githubusercontent.com/redhat-na-ssa/demo-ai-gitops-catalog/main/scripts/library/ocp.sh diff --git a/components/operators/odf-operator/components/aws-odf-machineset/ocp.sh b/components/operators/odf-operator/components/aws-odf-machineset/ocp.sh new file mode 100644 index 00000000..1187af82 --- /dev/null +++ b/components/operators/odf-operator/components/aws-odf-machineset/ocp.sh @@ -0,0 +1,94 @@ +#!/bin/bash +# shellcheck disable=SC2120 + +ocp_aws_cluster(){ + TARGET_NS=kube-system + OBJ=secret/aws-creds + echo "Checking if ${OBJ} exists in ${TARGET_NS} namespace" + oc -n "${TARGET_NS}" get "${OBJ}" -o name > /dev/null 2>&1 || return 1 + echo "AWS cluster detected" +} + +ocp_aws_clone_worker_machineset(){ + [ -z "${1}" ] && \ + echo " + usage: ocp_aws_clone_worker_machineset < instance type, default g4dn.4xlarge > < machine set name > + " + + INSTANCE_TYPE=${1:-g4dn.4xlarge} + SHORT_NAME=${2:-${INSTANCE_TYPE%.*}} + + MACHINE_SET_NAME=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${SHORT_NAME}" | head -n1) + MACHINE_SET_WORKER=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep worker | head -n1) + + # check for an existing instance machine set + if [ -n "${MACHINE_SET_NAME}" ]; then + echo "Exists: machineset - ${MACHINE_SET_NAME}" + else + echo "Creating: machineset - ${SHORT_NAME}" + oc -n openshift-machine-api \ + get "${MACHINE_SET_WORKER}" -o yaml | \ + sed '/machine/ s/-worker/-'"${INSTANCE_TYPE}"'/g + /^ name:/ s/cluster-.*/'"${SHORT_NAME}"'/g + /name/ s/-worker/-'"${SHORT_NAME}"'/g + s/instanceType.*/instanceType: '"${INSTANCE_TYPE}"'/ + /cluster-api-autoscaler/d + s/replicas.*/replicas: 0/' | \ + oc apply -f - + fi + + # cosmetic pretty + oc -n openshift-machine-api \ + patch "${MACHINE_SET_NAME}" \ + --type=merge --patch '{"spec":{"template":{"spec":{"metadata":{"labels":{"node-role.kubernetes.io/'"${SHORT_NAME}"'":""}}}}}}' +} + +ocp_aws_create_odf_machineset(){ + INSTANCE_TYPE=${1:-m6a.2xlarge} + SHORT_NAME=${2:-odf-infra} + + ocp_aws_clone_worker_machineset "${INSTANCE_TYPE}" "${SHORT_NAME}" + + MACHINE_SET_NAME=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${SHORT_NAME}" | head -n1) + + echo "Patching: ${MACHINE_SET_NAME}" + +cat << YAML > /tmp/patch.yaml +spec: + replicas: 3 + template: + spec: + taints: + - key: node.ocs.openshift.io/storage + value: 'true' + effect: NoSchedule + metadata: + labels: + cluster.ocs.openshift.io/openshift-storage: '' + node-role.kubernetes.io/infra: '' + providerSpec: + value: + blockDevices: + - ebs: + encrypted: true + iops: 0 + kmsKey: + arn: '' + volumeSize: 100 + volumeType: gp3 + # - deviceName: /dev/xvdb + # ebs: + # encrypted: true + # iops: 0 + # kmsKey: + # arn: '' + # volumeSize: 1000 + # volumeType: gp3 +YAML + + # patch storage + oc -n openshift-machine-api \ + patch "${MACHINE_SET_NAME}" \ + --type=merge --patch "$(cat /tmp/patch.yaml)" + +} diff --git a/components/operators/odf-operator/config-helpers/node-labeler/base/job.yaml b/components/operators/odf-operator/components/node-labeler/job.yaml similarity index 100% rename from components/operators/odf-operator/config-helpers/node-labeler/base/job.yaml rename to components/operators/odf-operator/components/node-labeler/job.yaml diff --git a/components/operators/odf-operator/components/node-labeler/kustomization.yaml b/components/operators/odf-operator/components/node-labeler/kustomization.yaml new file mode 100644 index 00000000..3e851923 --- /dev/null +++ b/components/operators/odf-operator/components/node-labeler/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +namespace: openshift-storage + +resources: + - job.yaml diff --git a/components/operators/odf-operator/config-helpers/node-labeler/base/kustomization.yaml b/components/operators/odf-operator/config-helpers/node-labeler/base/kustomization.yaml deleted file mode 100644 index 37d015ba..00000000 --- a/components/operators/odf-operator/config-helpers/node-labeler/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: openshift-storage - -resources: - - job.yaml diff --git a/components/operators/odf-operator/instance/overlays/aws/storagecluster.yaml b/components/operators/odf-operator/instance/overlays/aws/storagecluster.yaml index 1228b5ba..5088ae06 100644 --- a/components/operators/odf-operator/instance/overlays/aws/storagecluster.yaml +++ b/components/operators/odf-operator/instance/overlays/aws/storagecluster.yaml @@ -27,11 +27,11 @@ spec: - ReadWriteOnce resources: requests: - storage: 2Ti - storageClassName: gp2 + storage: 1Ti + storageClassName: gp3-csi volumeMode: Block status: {} - name: ocs-deviceset-gp2 + name: ocs-deviceset-gp3-csi placement: {} portable: true preparePlacement: {} diff --git a/components/operators/openshift-ai b/components/operators/openshift-ai new file mode 120000 index 00000000..2a28d2cd --- /dev/null +++ b/components/operators/openshift-ai @@ -0,0 +1 @@ +rhods-operator \ No newline at end of file diff --git a/components/operators/openshift-elasticsearch b/components/operators/openshift-elasticsearch new file mode 120000 index 00000000..8bf90ed4 --- /dev/null +++ b/components/operators/openshift-elasticsearch @@ -0,0 +1 @@ +elasticsearch-operator \ No newline at end of file diff --git a/components/operators/openshift-gitops b/components/operators/openshift-gitops new file mode 120000 index 00000000..ff681d4a --- /dev/null +++ b/components/operators/openshift-gitops @@ -0,0 +1 @@ +openshift-gitops-operator \ No newline at end of file diff --git a/components/operators/openshift-gitops-operator/INFO.md b/components/operators/openshift-gitops-operator/INFO.md index 37fe137c..6239d3f5 100644 --- a/components/operators/openshift-gitops-operator/INFO.md +++ b/components/operators/openshift-gitops-operator/INFO.md @@ -3,6 +3,7 @@ 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 @@ -12,13 +13,16 @@ 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.2.14 + +* Argo CD v2.1.16 * 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 sufficient 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 +apiVersion: argoproj.io/v1beta1 kind: ArgoCD metadata: name: argocd diff --git a/components/operators/openshift-gitops-operator/README.md b/components/operators/openshift-gitops-operator/README.md index aae65b46..b59ef35c 100644 --- a/components/operators/openshift-gitops-operator/README.md +++ b/components/operators/openshift-gitops-operator/README.md @@ -6,8 +6,6 @@ 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) @@ -15,9 +13,10 @@ The current *overlays* available are for the following channels: * [gitops-1.7](operator/overlays/gitops-1.7) * [gitops-1.8](operator/overlays/gitops-1.8) * [gitops-1.9](operator/overlays/gitops-1.9) +* [gitops-1.10](operator/overlays/gitops-1.10) +* [gitops-1.11](operator/overlays/gitops-1.11) * [latest](operator/overlays/latest) * [preview](operator/overlays/preview) -* [stable](operator/overlays/stable) ## Usage diff --git a/components/configs/cluster/baremetal/overlays/default/kustomization.yaml b/components/operators/openshift-gitops-operator/aggregate/overlays/rhdp/kustomization.yaml similarity index 50% rename from components/configs/cluster/baremetal/overlays/default/kustomization.yaml rename to components/operators/openshift-gitops-operator/aggregate/overlays/rhdp/kustomization.yaml index 681848f0..83eab950 100644 --- a/components/configs/cluster/baremetal/overlays/default/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/aggregate/overlays/rhdp/kustomization.yaml @@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base \ No newline at end of file + - ../../../instance/overlays/rhdp + - ../../../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 deleted file mode 100644 index 7f6fd841..00000000 --- a/components/operators/openshift-gitops-operator/instance/base/argocd-ssh-known-hosts-cm.yaml +++ /dev/null @@ -1,18 +0,0 @@ -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/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/base/kustomization.yaml index bfafa60b..5d305dc3 100644 --- a/components/operators/openshift-gitops-operator/instance/base/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/instance/base/kustomization.yaml @@ -4,17 +4,5 @@ kind: Kustomization namespace: openshift-gitops resources: -- argocd-ssh-known-hosts-cm.yaml -- cluster-role-binding.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 + - namespace.yaml + - openshift-gitops.yaml diff --git a/components/operators/openshift-gitops-operator/instance/base/openshift-gitops-cr.yaml b/components/operators/openshift-gitops-operator/instance/base/openshift-gitops-cr.yaml deleted file mode 100644 index 9c10c78c..00000000 --- a/components/operators/openshift-gitops-operator/instance/base/openshift-gitops-cr.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: openshift-gitops -spec: - server: - autoscale: - enabled: false - grpc: - ingress: - enabled: false - ingress: - enabled: false - route: - enabled: true - tls: - termination: reencrypt - service: - type: '' - grafana: - enabled: false - ingress: - enabled: false - route: - enabled: false - monitoring: - enabled: false - notifications: - enabled: false - prometheus: - enabled: false - ingress: - enabled: false - route: - enabled: false - initialSSHKnownHosts: {} - sso: - dex: - openShiftOAuth: true - rbac: - defaultPolicy: '' - policy: |- - g, system:cluster-admins, role:admin - scopes: '[groups]' - repo: {} - resourceExclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - TaskRun - - PipelineRun - resourceTrackingMethod: annotation - ha: - enabled: false - tls: - ca: {} - redis: {} - controller: - processors: {} - resources: - limits: - cpu: '2' - memory: 4G - requests: - cpu: 250m - memory: 1Gi - sharding: {} diff --git a/components/operators/openshift-gitops-operator/instance/base/openshift-gitops.yaml b/components/operators/openshift-gitops-operator/instance/base/openshift-gitops.yaml new file mode 100644 index 00000000..fc05fbcb --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/base/openshift-gitops.yaml @@ -0,0 +1,118 @@ +apiVersion: argoproj.io/v1beta1 +kind: ArgoCD +metadata: + name: openshift-gitops +spec: + resourceHealthChecks: [] + server: + autoscale: + enabled: false + grpc: + ingress: + enabled: false + ingress: + enabled: false + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 125m + memory: 128Mi + route: + enabled: true + service: + type: '' + grafana: + enabled: false + ingress: + enabled: false + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 250m + memory: 128Mi + route: + enabled: false + monitoring: + enabled: false + notifications: + enabled: false + prometheus: + enabled: false + ingress: + enabled: false + route: + enabled: false + sso: + dex: + openShiftOAuth: true + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 250m + memory: 128Mi + provider: dex + applicationSet: + resources: + limits: + cpu: '2' + memory: 1Gi + requests: + cpu: 250m + memory: 512Mi + webhookServer: + ingress: + enabled: false + route: + enabled: false + rbac: + policy: | + g, system:cluster-admins, role:admin + g, cluster-admins, role:admin + scopes: '[groups]' + repo: + resources: + limits: + cpu: '1' + memory: 1Gi + requests: + cpu: 250m + memory: 256Mi + resourceExclusions: | + - apiGroups: + - tekton.dev + clusters: + - '*' + kinds: + - TaskRun + - PipelineRun + ha: + enabled: false + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 250m + memory: 128Mi + redis: + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 250m + memory: 128Mi + controller: + resources: + limits: + cpu: '2' + memory: 2Gi + requests: + cpu: 250m + memory: 1Gi diff --git a/components/operators/openshift-gitops-operator/instance/components/README.md b/components/operators/openshift-gitops-operator/instance/components/README.md new file mode 100644 index 00000000..14608c3b --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/README.md @@ -0,0 +1,42 @@ +# OpenShift Gitops Components + +The included components are intended to be common patching patterns used on top of the default OpenShift Gitops instance to configure additional features of ArgoCD. Components are composable patches that can be added at the overlays layer on top of a base. + +This repo currently contains the following components: + +* [annotation-resource-tracking](annotation-resource-tracking) +* [application-controller-cluster-admin](application-controller-cluster-admin) +* [disable-pipelinerun-resourceexclusion](disable-pipelinerun-resourceexclusion) +* [edge-termination](edge-termination) +* [enable-notifications](enable-notifications) +* [gitops-admins](gitops-admins) +* [health-check-odf](health-check-odf) +* [health-check-olm](health-check-olm) +* [health-check-openshift-ai](health-check-openshift-ai) +* [health-check-openshift-builds](health-check-openshift-builds) +* [kustomize-build-enable-helm](kustomize-build-enable-helm) + +## Usage + +Components can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +```sh +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/annotation-resource-tracking + - ../../components/application-controller-cluster-admin + - ../../components/disable-pipelinerun-resourceexclusion + - ../../components/edge-termination + - ../../components/enable-notifications + - ../../components/gitops-admins + - ../../components/health-check-odf + - ../../components/health-check-olm + - ../../components/health-check-openshift-ai + - ../../components/health-check-openshift-builds + - ../../components/kustomize-build-enable-helm +``` diff --git a/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/README.md b/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/README.md new file mode 100644 index 00000000..6b7d4e3e --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/README.md @@ -0,0 +1,21 @@ +# annotation-resource-tracking + +## Purpose +This component is designed to enable ArgoCD's annotation based resource tracking method, instead of the default label based tracking method. + +To learn more about the different resource tracking methods, consult the documentation [here](https://argo-cd.readthedocs.io/en/stable/user-guide/resource_tracking/#additional-tracking-methods-via-an-annotation). + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/annotation-resource-tracking +``` \ No newline at end of file diff --git a/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/kustomization.yaml new file mode 100644 index 00000000..b4824beb --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-resource-tracking.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/patch-resource-tracking.yaml b/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/patch-resource-tracking.yaml new file mode 100644 index 00000000..cda7ea20 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/annotation-resource-tracking/patch-resource-tracking.yaml @@ -0,0 +1,6 @@ +apiVersion: argoproj.io/v1beta1 +kind: ArgoCD +metadata: + name: openshift-gitops +spec: + resourceTrackingMethod: annotation diff --git a/components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/README.md b/components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/README.md new file mode 100644 index 00000000..f11c5496 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/README.md @@ -0,0 +1,21 @@ +# application-controller-cluster-admin + +## Purpose +This component is designed to enable the cluster-admin role for the openshift-gitops application-controller service account. This pattern is generally recommended for demo, development, or sandbox environments and is not recommended for production clusters. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/application-controller-cluster-admin +``` + +Note: This component will only function with the default `openshift-gitops` instance of ArgoCD and cannot be applied to namespace scoped instances of ArgoCD outside of the primary instance. diff --git a/components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/kustomization.yaml new file mode 100644 index 00000000..301ebe9e --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: +- rolebinding.yaml diff --git a/components/operators/openshift-gitops-operator/instance/base/cluster-role-binding.yaml b/components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/rolebinding.yaml similarity index 70% rename from components/operators/openshift-gitops-operator/instance/base/cluster-role-binding.yaml rename to components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/rolebinding.yaml index 62a6071d..0b1aefd7 100644 --- a/components/operators/openshift-gitops-operator/instance/base/cluster-role-binding.yaml +++ b/components/operators/openshift-gitops-operator/instance/components/application-controller-cluster-admin/rolebinding.yaml @@ -1,10 +1,7 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - annotations: - kludge: 'true' - todo: 'improve cluster security' - name: argocd-application-controller-cluster-admin + name: openshift-gitops-application-controller-cluster-admin subjects: - kind: ServiceAccount name: openshift-gitops-argocd-application-controller diff --git a/components/operators/openshift-gitops-operator/instance/components/disable-pipelinerun-resourceexclusion/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/disable-pipelinerun-resourceexclusion/kustomization.yaml new file mode 100644 index 00000000..fa3bf07f --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/disable-pipelinerun-resourceexclusion/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-resourceexclusion.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/disable-pipelinerun-resourceexclusion/patch-resourceexclusion.yaml b/components/operators/openshift-gitops-operator/instance/components/disable-pipelinerun-resourceexclusion/patch-resourceexclusion.yaml new file mode 100644 index 00000000..31984bcc --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/disable-pipelinerun-resourceexclusion/patch-resourceexclusion.yaml @@ -0,0 +1,12 @@ +apiVersion: argoproj.io/v1beta1 +kind: ArgoCD +metadata: + name: openshift-gitops +spec: + resourceExclusions: | + - apiGroups: + - tekton.dev + clusters: + - '*' + kinds: + - TaskRun diff --git a/components/operators/openshift-gitops-operator/instance/components/edge-termination/README.md b/components/operators/openshift-gitops-operator/instance/components/edge-termination/README.md new file mode 100644 index 00000000..72e50518 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/edge-termination/README.md @@ -0,0 +1,19 @@ +# edge-termination + +## Purpose +This component is designed to enable Edge Termination on the ArgoCD route, and resolving the "Insecure Route" message created by ArgoCD's self-signed certificate. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/edge-termination +``` \ No newline at end of file diff --git a/components/operators/openshift-gitops-operator/instance/components/edge-termination/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/edge-termination/kustomization.yaml new file mode 100644 index 00000000..630597db --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/edge-termination/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-edge-termination.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/edge-termination/patch-edge-termination.yaml b/components/operators/openshift-gitops-operator/instance/components/edge-termination/patch-edge-termination.yaml new file mode 100644 index 00000000..cfccad07 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/edge-termination/patch-edge-termination.yaml @@ -0,0 +1,12 @@ +apiVersion: argoproj.io/v1beta1 +kind: ArgoCD +metadata: + name: openshift-gitops +spec: + server: + insecure: true + route: + enabled: true + tls: + termination: edge + insecureEdgeTerminationPolicy: Redirect diff --git a/components/operators/openshift-gitops-operator/instance/components/enable-notifications/README.md b/components/operators/openshift-gitops-operator/instance/components/enable-notifications/README.md new file mode 100644 index 00000000..3086b839 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/enable-notifications/README.md @@ -0,0 +1,19 @@ +# enable-notifications + +## Purpose +This component is designed to enable notifications for ArgoCD events. For more information on this feature, refer to the ArgoCD Notifications [docs](https://argocd-notifications.readthedocs.io/en/stable/). + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/enable-notifications +``` \ No newline at end of file diff --git a/components/operators/openshift-gitops-operator/instance/components/enable-notifications/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/enable-notifications/kustomization.yaml new file mode 100644 index 00000000..d81e2a85 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/enable-notifications/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-enable-notifications.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/enable-notifications/patch-enable-notifications.yaml b/components/operators/openshift-gitops-operator/instance/components/enable-notifications/patch-enable-notifications.yaml new file mode 100644 index 00000000..fca579c4 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/enable-notifications/patch-enable-notifications.yaml @@ -0,0 +1,7 @@ +apiVersion: argoproj.io/v1beta1 +kind: ArgoCD +metadata: + name: openshift-gitops +spec: + notifications: + enabled: true diff --git a/components/operators/openshift-gitops-operator/instance/components/gitops-admins/README.md b/components/operators/openshift-gitops-operator/instance/components/gitops-admins/README.md new file mode 100644 index 00000000..591d7744 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/gitops-admins/README.md @@ -0,0 +1,34 @@ +# gitops-admins + +## Purpose +This component creates an empty gitops-admins group and configures the appropriate permissions in ArgoCD to grant that group admin permissions to ArgoCD. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/gitops-admins + +patches: + - path: gitops-admins-group.yaml +``` + +In addition, to adding the component, you will need to patch the gitops-admins group with a list of users to be added to the group: + +``` +kind: Group +apiVersion: user.openshift.io/v1 +metadata: + name: gitops-admins +users: + - admin + - opentlc-mgr +``` diff --git a/components/operators/openshift-gitops-operator/instance/components/gitops-admins/gitops-admins-group.yaml b/components/operators/openshift-gitops-operator/instance/components/gitops-admins/gitops-admins-group.yaml new file mode 100644 index 00000000..d1743f54 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/gitops-admins/gitops-admins-group.yaml @@ -0,0 +1,5 @@ +kind: Group +apiVersion: user.openshift.io/v1 +metadata: + name: gitops-admins +users: [] # add users to this list via overlay diff --git a/components/operators/openshift-gitops-operator/instance/components/gitops-admins/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/gitops-admins/kustomization.yaml new file mode 100644 index 00000000..10940f65 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/gitops-admins/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: +- gitops-admins-group.yaml + +patches: + - path: patch-rbac.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/gitops-admins/patch-rbac.yaml b/components/operators/openshift-gitops-operator/instance/components/gitops-admins/patch-rbac.yaml new file mode 100644 index 00000000..df8b3c8e --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/gitops-admins/patch-rbac.yaml @@ -0,0 +1,9 @@ +apiVersion: argoproj.io/v1beta1 +kind: ArgoCD +metadata: + name: openshift-gitops +spec: + rbac: + policy: |- + g, system:cluster-admins, role:admin + g, gitops-admins, role:admin diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-odf/README.md b/components/operators/openshift-gitops-operator/instance/components/health-check-odf/README.md new file mode 100644 index 00000000..a25cb287 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-odf/README.md @@ -0,0 +1,19 @@ +# health-check-build + +## Purpose +This component is designed to enable custom health checks for OpenShift build objects including `builds` and `imagestreams`. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/health-check-openshift-builds +``` diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-odf/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-odf/kustomization.yaml new file mode 100644 index 00000000..fab43fbf --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-odf/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-storagesystem-health-check.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-odf/patch-storagesystem-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-odf/patch-storagesystem-health-check.yaml new file mode 100644 index 00000000..5a02ff05 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-odf/patch-storagesystem-health-check.yaml @@ -0,0 +1,30 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: odf.openshift.io + kind: StorageSystem + check: | + health_status = {} + if obj.status ~= nil then + if obj.status.conditions ~= nil then + msg = "" + for i, condition in pairs(obj.status.conditions) do + msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. "\n" + + if condition.type == "Available" and condition.status == "True" then + health_status.status = "Healthy" + elseif condition.type == "Progressing" and condition.status == "True" then + health_status.status = "Progressing" + 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 + return health_status + end + end + health_status.status = "Progressing" + health_status.message = "The StorageSystem is progressing" + return health_status diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-olm/README.md b/components/operators/openshift-gitops-operator/instance/components/health-check-olm/README.md new file mode 100644 index 00000000..4d207a9d --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-olm/README.md @@ -0,0 +1,19 @@ +# health-check-olm + +## Purpose +This component is designed to enable custom health checks for OLM objects including `subscriptions` and `installPlans`. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/health-check-olm +``` diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-olm/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-olm/kustomization.yaml new file mode 100644 index 00000000..7cd62c54 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-olm/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-installplan-health-check.yaml + target: + kind: ArgoCD + - path: patch-subscription-health-check.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-olm/patch-installplan-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-olm/patch-installplan-health-check.yaml new file mode 100644 index 00000000..045a52bd --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-olm/patch-installplan-health-check.yaml @@ -0,0 +1,19 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: operators.coreos.com + kind: InstallPlan + check: | + hs = {} + if obj.status ~= nil then + if obj.status.phase ~= nil then + if obj.status.phase == "Complete" then + hs.status = "Healthy" + hs.message = obj.status.phase + return hs + end + end + end + hs.status = "Progressing" + hs.message = "Waiting for InstallPlan to complete" + return hs diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-olm/patch-subscription-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-olm/patch-subscription-health-check.yaml new file mode 100644 index 00000000..a77a3433 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-olm/patch-subscription-health-check.yaml @@ -0,0 +1,40 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: operators.coreos.com + kind: Subscription + check: | + health_status = {} + if obj.status ~= nil then + if obj.status.conditions ~= nil then + numDegraded = 0 + numPending = 0 + msg = "" + for i, condition in pairs(obj.status.conditions) do + msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. "\n" + if condition.type == "InstallPlanPending" and condition.status == "True" then + numPending = numPending + 1 + elseif (condition.type == "InstallPlanMissing" and condition.reason ~= "ReferencedInstallPlanNotFound") then + numDegraded = numDegraded + 1 + elseif (condition.type == "CatalogSourcesUnhealthy" or condition.type == "InstallPlanFailed" or condition.type == "ResolutionFailed") and condition.status == "True" then + numDegraded = numDegraded + 1 + end + end + if numDegraded == 0 and numPending == 0 then + health_status.status = "Healthy" + health_status.message = msg + return health_status + elseif numPending > 0 and numDegraded == 0 then + health_status.status = "Progressing" + health_status.message = "An install plan for a subscription is pending installation" + return health_status + else + health_status.status = "Degraded" + health_status.message = msg + return health_status + end + end + end + health_status.status = "Progressing" + health_status.message = "An install plan for a subscription is pending installation" + return health_status diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/README.md b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/README.md new file mode 100644 index 00000000..a25cb287 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/README.md @@ -0,0 +1,19 @@ +# health-check-build + +## Purpose +This component is designed to enable custom health checks for OpenShift build objects including `builds` and `imagestreams`. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/health-check-openshift-builds +``` diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/kustomization.yaml new file mode 100644 index 00000000..57367b15 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/kustomization.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-datasciencecluster-health-check.yaml + target: + kind: ArgoCD + - path: patch-datasciencepipelineapplication-health-check.yaml + target: + kind: ArgoCD + - path: patch-notebook-health-check.yaml + target: + kind: ArgoCD + - path: patch-inferenceservice-health-check.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-datasciencecluster-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-datasciencecluster-health-check.yaml new file mode 100644 index 00000000..0f96dc32 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-datasciencecluster-health-check.yaml @@ -0,0 +1,56 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: datasciencecluster.opendatahub.io + kind: DataScienceCluster + check: | + health_status = {} + if obj.status ~= nil then + if obj.status.conditions ~= nil then + msg = "" + componentsDegraded = 0 + available = false + progressing = false + degraded = false + for i, condition in pairs(obj.status.conditions) do + + if condition.type == "Available" and condition.status == "True" then + available = true + elseif condition.type == "Progressing" then + if condition.status == "True" then + progressing = true + msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. " | " .. condition.reason .. " | " .. condition.message .. "\n" + end + elseif condition.type == "Degraded" then + if condition.status == "True" then + degraded = true + msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. " | " .. condition.reason .. " | " .. condition.message .. "\n" + end + elseif condition.status == "False" then + componentsDegraded = componentsDegraded + 1 + msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. " | " .. condition.reason .. " | " .. condition.message .. "\n" + end + + end + + if available == true and componentsDegraded == 0 then + health_status.status = "Healthy" + elseif progressing == true then + health_status.status = "Progressing" + elseif degraded == true or componentsDegraded > 0 then + health_status.status = "Degraded" + else + health_status.status = "Degraded" + end + + health_status.message = msg + else + health_status.status = "Progressing" + health_status.message = "DataScienceCluster is creating..." + end + else + health_status.status = "Progressing" + health_status.message = "DataScienceCluster is creating..." + end + + return health_status diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-datasciencepipelineapplication-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-datasciencepipelineapplication-health-check.yaml new file mode 100644 index 00000000..e8ad1371 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-datasciencepipelineapplication-health-check.yaml @@ -0,0 +1,42 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: datasciencepipelinesapplications.opendatahub.io + kind: DataSciencePipelinesApplication + check: | + health_status = {} + if obj.status ~= nil then + if obj.status.conditions ~= nil then + msg = "" + progressing = false + degraded = false + for i, condition in pairs(obj.status.conditions) do + + if condition.status == "False" then + progressing = true + msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. " | " .. condition.reason .. " | " .. condition.message .. "\n" + end + + end + + if progressing == false and degraded == false then + health_status.status = "Healthy" + elseif progressing == true then + health_status.status = "Progressing" + elseif degraded == false then + -- there is no condition that can help to distinguish between a degraded and progressing object + -- for now, we will just always keep the object as progressing and never set it to degraded + health_status.status = "Degraded" + end + + health_status.message = msg + else + health_status.status = "Progressing" + health_status.message = "DataSciencePipelineApplication is creating..." + end + else + health_status.status = "Progressing" + health_status.message = "DataSciencePipelineApplication is creating..." + end + + return health_status diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-inferenceservice-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-inferenceservice-health-check.yaml new file mode 100644 index 00000000..17d9cfac --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-inferenceservice-health-check.yaml @@ -0,0 +1,66 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: serving.kserve.io + kind: InferenceService + check: | + local health_status = {} + + health_status.status = "Progressing" + health_status.message = "Waiting for InferenceService to report status..." + + if obj.status ~= nil then + + local progressing = false + local degraded = false + local status_false = 0 + local status_unknown = 0 + local msg = "" + + if obj.status.modelStatus ~= nil then + if obj.status.modelStatus.transitionStatus ~= "UpToDate" then + if obj.status.modelStatus.transitionStatus == "InProgress" then + progressing = true + else + degraded = true + end + msg = msg .. "0: transitionStatus | " .. obj.status.modelStatus.transitionStatus .. "\n" + end + end + + if obj.status.conditions ~= nil then + for i, condition in pairs(obj.status.conditions) do + + if condition.status == "Unknown" then + status_unknown = status_unknown + 1 + elseif condition.status == "False" then + status_false = status_false + 1 + end + + if condition.status ~= "True" then + msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status + if condition.reason ~= nil and condition.reason ~= "" then + msg = msg .. " | " .. condition.reason + end + if condition.message ~= nil and condition.message ~= "" then + msg = msg .. " | " .. condition.message + end + msg = msg .. "\n" + end + + end + + if progressing == false and degraded == false and status_unknown == 0 and status_false == 0 then + health_status.status = "Healthy" + msg = "InferenceService is healthy." + elseif degraded == false and status_unknown > 0 then + health_status.status = "Progressing" + else + health_status.status = "Degraded" + end + + health_status.message = msg + end + end + + return health_status diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-notebook-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-notebook-health-check.yaml new file mode 100644 index 00000000..3051e8c5 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-ai/patch-notebook-health-check.yaml @@ -0,0 +1,42 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: kubeflow.org + kind: Notebook + check: | + health_status = {} + if obj.status ~= nil then + if obj.status.conditions ~= nil then + msg = "" + progressing = false + degraded = false + for i, condition in pairs(obj.status.conditions) do + + if condition.status == "False" then + progressing = true + msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. " | " .. condition.reason .. " | " .. condition.message .. "\n" + end + + end + + if progressing == false and degraded == false then + health_status.status = "Healthy" + elseif progressing == true then + health_status.status = "Progressing" + elseif degraded == false then + -- there is no condition that can help to distinguish between a degraded and progressing object + -- for now, we will just always keep the object as progressing and never set it to degraded + health_status.status = "Degraded" + end + + health_status.message = msg + else + health_status.status = "Progressing" + health_status.message = "Notebook is creating..." + end + else + health_status.status = "Progressing" + health_status.message = "Notebook is creating..." + end + + return health_status diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/README.md b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/README.md new file mode 100644 index 00000000..a25cb287 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/README.md @@ -0,0 +1,19 @@ +# health-check-build + +## Purpose +This component is designed to enable custom health checks for OpenShift build objects including `builds` and `imagestreams`. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/health-check-openshift-builds +``` diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/kustomization.yaml new file mode 100644 index 00000000..1dedb31d --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-build-health-check.yaml + target: + kind: ArgoCD + # - path: patch-imagestream-health-check.yaml + # target: + # kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/patch-build-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/patch-build-health-check.yaml new file mode 100644 index 00000000..4f3ba139 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/patch-build-health-check.yaml @@ -0,0 +1,19 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: build.openshift.io + kind: Build + check: | + hs = {} + if obj.status ~= nil then + if obj.status.phase ~= nil then + if obj.status.phase == "Complete" then + hs.status = "Healthy" + hs.message = obj.status.phase + return hs + end + end + end + hs.status = "Progressing" + hs.message = "Waiting for Build to complete" + return hs diff --git a/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/patch-imagestream-health-check.yaml b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/patch-imagestream-health-check.yaml new file mode 100644 index 00000000..7c15a2e3 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/health-check-openshift-builds/patch-imagestream-health-check.yaml @@ -0,0 +1,32 @@ +- op: add + path: /spec/resourceHealthChecks/- + value: + group: image.openshift.io + kind: ImageStream + check: | + hs = {} + hs.status = "Progressing" + hs.message = "" + if obj.status ~= nil then + if obj.status.tags ~= nil then + numTags = 0 + for _ , item in pairs(obj.status.tags) do + numTags = numTags + 1 + numItems = 0 + if item.tags ~= nil then + for _ , item in pairs(item.tags) do + numItems = numItems + 1 + end + if numItems == 0 then + return hs + end + end + end + if numTags > 0 then + hs.status = "Healthy" + hs.message = "ImageStream has tags resolved" + return hs + end + end + end + return hs diff --git a/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/README.md b/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/README.md new file mode 100644 index 00000000..a7bda6ce --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/README.md @@ -0,0 +1,21 @@ +# kustomize-build-enable-helm + +## Purpose +This component is designed to turn on the `--enable-helm` feature of `kustomize build` in ArgoCD to support helm charts inside of a kustomization.yaml file. + +To learn more about the `--enable-helm` feature, refer to the ArgoCD docs [here](https://argo-cd.readthedocs.io/en/stable/user-guide/kustomize/#kustomizing-helm-charts) or the kustomize [examples](https://github.com/kubernetes-sigs/kustomize/blob/master/examples/chart.md). + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/kustomize-build-enable-helm +``` diff --git a/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/kustomization.yaml new file mode 100644 index 00000000..d28b4c41 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-enable-helm.yaml + target: + kind: ArgoCD diff --git a/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/patch-enable-helm.yaml b/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/patch-enable-helm.yaml new file mode 100644 index 00000000..0a9256f8 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/components/kustomize-build-enable-helm/patch-enable-helm.yaml @@ -0,0 +1,6 @@ +apiVersion: argoproj.io/v1beta1 +kind: ArgoCD +metadata: + name: openshift-gitops +spec: + kustomizeBuildOptions: "--enable-helm" diff --git a/components/operators/openshift-gitops-operator/instance/base/gitops-admin-group.yaml b/components/operators/openshift-gitops-operator/instance/overlays/default/gitops-admins-group.yaml similarity index 73% rename from components/operators/openshift-gitops-operator/instance/base/gitops-admin-group.yaml rename to components/operators/openshift-gitops-operator/instance/overlays/default/gitops-admins-group.yaml index bd227fd9..7136208a 100644 --- a/components/operators/openshift-gitops-operator/instance/base/gitops-admin-group.yaml +++ b/components/operators/openshift-gitops-operator/instance/overlays/default/gitops-admins-group.yaml @@ -2,4 +2,4 @@ kind: Group apiVersion: user.openshift.io/v1 metadata: name: gitops-admins -users: [] +users: [] # add users here 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 c06b43b0..25c0b503 100644 --- a/components/operators/openshift-gitops-operator/instance/overlays/default/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/instance/overlays/default/kustomization.yaml @@ -6,24 +6,10 @@ namespace: openshift-gitops resources: - ../../base -patches: - - 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 +components: + - ../../components/annotation-resource-tracking + - ../../components/edge-termination + - ../../components/enable-notifications + - ../../components/gitops-admins + - ../../components/health-check-olm + - ../../components/health-check-openshift-builds 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 deleted file mode 100644 index a6d90642..00000000 --- a/components/operators/openshift-gitops-operator/instance/overlays/default/patch-resource-customizations.yaml +++ /dev/null @@ -1,63 +0,0 @@ -- op: replace - path: /spec/resourceCustomizations - value: | - operators.coreos.com/Subscription: - health.lua: | - health_status = {} - if obj.status ~= nil then - if obj.status.conditions ~= nil then - numDegraded = 0 - numPending = 0 - msg = "" - for i, condition in pairs(obj.status.conditions) do - msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. "\n" - if condition.type == "InstallPlanPending" and condition.status == "True" then - numPending = numPending + 1 - elseif (condition.type == "CatalogSourcesUnhealthy" or condition.type == "InstallPlanMissing" or condition.type == "InstallPlanFailed" or condition.type == "ResolutionFailed") and condition.status == "True" then - numDegraded = numDegraded + 1 - end - end - if numDegraded == 0 and numPending == 0 then - health_status.status = "Healthy" - health_status.message = msg - return health_status - elseif numPending > 0 and numDegraded == 0 then - health_status.status = "Progressing" - health_status.message = "An install plan for a subscription is pending installation" - return health_status - else - health_status.status = "Degraded" - health_status.message = msg - return health_status - end - end - end - health_status.status = "Progressing" - health_status.message = "An install plan for a subscription is pending installation" - return health_status - odf.openshift.io/StorageSystem: - health.lua: | - health_status = {} - if obj.status ~= nil then - if obj.status.conditions ~= nil then - msg = "" - for i, condition in pairs(obj.status.conditions) do - msg = msg .. i .. ": " .. condition.type .. " | " .. condition.status .. "\n" - - if condition.type == "Available" and condition.status == "True" then - health_status.status = "Healthy" - elseif condition.type == "Progressing" and condition.status == "True" then - health_status.status = "Progressing" - 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 - return health_status - end - end - health_status.status = "Progressing" - health_status.message = "The StorageSystem is progressing" - return health_status diff --git a/components/operators/openshift-gitops-operator/instance/overlays/rhdp/gitops-admins-group.yaml b/components/operators/openshift-gitops-operator/instance/overlays/rhdp/gitops-admins-group.yaml new file mode 100644 index 00000000..586e0ecd --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/overlays/rhdp/gitops-admins-group.yaml @@ -0,0 +1,7 @@ +kind: Group +apiVersion: user.openshift.io/v1 +metadata: + name: gitops-admins +users: + - admin + - opentlc-mgr diff --git a/components/operators/openshift-gitops-operator/instance/overlays/rhdp/kustomization.yaml b/components/operators/openshift-gitops-operator/instance/overlays/rhdp/kustomization.yaml new file mode 100644 index 00000000..4737cbc2 --- /dev/null +++ b/components/operators/openshift-gitops-operator/instance/overlays/rhdp/kustomization.yaml @@ -0,0 +1,23 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: openshift-gitops + +resources: + - ../../base + +components: + - ../../components/annotation-resource-tracking + - ../../components/application-controller-cluster-admin + - ../../components/disable-pipelinerun-resourceexclusion + - ../../components/edge-termination + - ../../components/enable-notifications + - ../../components/gitops-admins + - ../../components/health-check-odf + - ../../components/health-check-olm + - ../../components/health-check-openshift-ai + - ../../components/health-check-openshift-builds + - ../../components/kustomize-build-enable-helm + +patches: +- path: gitops-admins-group.yaml diff --git a/components/operators/openshift-gitops-operator/operator/base/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/base/kustomization.yaml index 1e66bd5f..a5698d5b 100644 --- a/components/operators/openshift-gitops-operator/operator/base/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/base/kustomization.yaml @@ -5,3 +5,6 @@ resources: - namespace.yaml - operator-group.yaml - subscription.yaml + +components: + - ../components/enable-console-plugin diff --git a/components/operators/openshift-gitops-operator/operator/base/namespace.yaml b/components/operators/openshift-gitops-operator/operator/base/namespace.yaml index 5509025c..1f06c33a 100644 --- a/components/operators/openshift-gitops-operator/operator/base/namespace.yaml +++ b/components/operators/openshift-gitops-operator/operator/base/namespace.yaml @@ -1,8 +1,8 @@ apiVersion: v1 kind: Namespace metadata: + name: openshift-gitops-operator annotations: - openshift.io/display-name: Red Hat OpenShift GitOps + openshift.io/display-name: "OpenShift GitOps Operator" labels: openshift.io/cluster-monitoring: 'true' - name: 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 b3de71e2..2b23cc85 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-gitops-operator + namespace: openshift-operators spec: channel: patch-me-see-overlays-dir installPlanApproval: Automatic diff --git a/components/operators/openshift-gitops-operator/operator/components/README.md b/components/operators/openshift-gitops-operator/operator/components/README.md new file mode 100644 index 00000000..522ed806 --- /dev/null +++ b/components/operators/openshift-gitops-operator/operator/components/README.md @@ -0,0 +1,21 @@ +# OpenShift GitOps Components + +The included components are intended to be common patching patterns used on top of the default OpenShift Gitops operator to configure additional features of the operator. Components are composable patches that can be added at the overlays layer on top of a base or overlay + +This repo currently contains the following components: + +* [enable-console-plugin](enable-console-plugin) + +## Usage + +Components can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +```sh +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../base + +components: + - ../../components/enable-console-plugin +``` diff --git a/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/README.md b/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/README.md new file mode 100644 index 00000000..0edb84db --- /dev/null +++ b/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/README.md @@ -0,0 +1,18 @@ +# enable-console-plugin + +## Purpose + +This component is designed to enable the OpenShift GitOps Console Plugin. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +```sh +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../base +components: + - ../../components/enable-console-plugin +``` diff --git a/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.sh b/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/console-plugin-job.sh similarity index 98% rename from components/operators/openshift-gitops-operator/instance/base/console-plugin-job.sh rename to components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/console-plugin-job.sh index f46cf183..271c0588 100755 --- a/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.sh +++ b/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/console-plugin-job.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash enable_console_plugin(){ [ -z "${PLUGIN_NAME}" ] && return 1 diff --git a/components/operators/openshift-gitops-operator/instance/base/console-plugin-job.yaml b/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/console-plugin-job.yaml similarity index 100% rename from components/operators/openshift-gitops-operator/instance/base/console-plugin-job.yaml rename to components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/console-plugin-job.yaml diff --git a/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/kustomization.yaml new file mode 100644 index 00000000..365b6d75 --- /dev/null +++ b/components/operators/openshift-gitops-operator/operator/components/enable-console-plugin/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +namespace: openshift-gitops-operator + +resources: +- console-plugin-job.yaml + +generatorOptions: + disableNameSuffixHash: true + +configMapGenerator: + - name: job-gitops-console-plugin + files: + - console-plugin-job.sh diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml index b84bcd2c..bbf6ea99 100644 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml @@ -8,4 +8,4 @@ patches: - target: kind: Subscription name: openshift-gitops-operator - path: patch-channel.yaml + path: patch-subscription.yaml diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-subscription.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-subscription.yaml new file mode 100644 index 00000000..d9cf8d9b --- /dev/null +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-subscription.yaml @@ -0,0 +1,6 @@ +- op: replace + path: /spec/channel + value: gitops-1.11 +- op: replace + path: /metadata/namespace + value: openshift-gitops-operator diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.3/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.12/kustomization.yaml similarity index 83% rename from components/operators/openshift-gitops-operator/operator/overlays/gitops-1.3/kustomization.yaml rename to components/operators/openshift-gitops-operator/operator/overlays/gitops-1.12/kustomization.yaml index b84bcd2c..bbf6ea99 100644 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.3/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.12/kustomization.yaml @@ -8,4 +8,4 @@ patches: - target: kind: Subscription name: openshift-gitops-operator - path: patch-channel.yaml + path: patch-subscription.yaml diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.12/patch-subscription.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.12/patch-subscription.yaml new file mode 100644 index 00000000..f13a480f --- /dev/null +++ b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.12/patch-subscription.yaml @@ -0,0 +1,6 @@ +- op: replace + path: /spec/channel + value: gitops-1.12 +- op: replace + path: /metadata/namespace + value: openshift-gitops-operator diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.4/patch-channel.yaml b/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.4/patch-channel.yaml deleted file mode 100644 index 44c488ae..00000000 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.4/patch-channel.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/channel - value: gitops-1.4 diff --git a/components/operators/openshift-gitops-operator/operator/overlays/latest/README.md b/components/operators/openshift-gitops-operator/operator/overlays/latest/README.md deleted file mode 100644 index 81551493..00000000 --- a/components/operators/openshift-gitops-operator/operator/overlays/latest/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *latest* channel version of the OpenShift GitOps Operator. This channel tracks the latest stable release of OpenShift GitOps. diff --git a/components/operators/openshift-gitops-operator/operator/overlays/latest/kustomization.yaml b/components/operators/openshift-gitops-operator/operator/overlays/latest/kustomization.yaml index b84bcd2c..bbf6ea99 100644 --- a/components/operators/openshift-gitops-operator/operator/overlays/latest/kustomization.yaml +++ b/components/operators/openshift-gitops-operator/operator/overlays/latest/kustomization.yaml @@ -8,4 +8,4 @@ patches: - target: kind: Subscription name: openshift-gitops-operator - path: patch-channel.yaml + path: patch-subscription.yaml diff --git a/components/operators/openshift-gitops-operator/operator/overlays/latest/patch-subscription.yaml b/components/operators/openshift-gitops-operator/operator/overlays/latest/patch-subscription.yaml new file mode 100644 index 00000000..3a144ebd --- /dev/null +++ b/components/operators/openshift-gitops-operator/operator/overlays/latest/patch-subscription.yaml @@ -0,0 +1,6 @@ +- op: replace + path: /spec/channel + value: latest +- op: replace + path: /metadata/namespace + value: openshift-gitops-operator diff --git a/components/operators/openshift-local-storage b/components/operators/openshift-local-storage new file mode 120000 index 00000000..11e3fb87 --- /dev/null +++ b/components/operators/openshift-local-storage @@ -0,0 +1 @@ +local-storage \ No newline at end of file diff --git a/components/operators/openshift-local-storage/examples/local-volume-discovery.yaml b/components/operators/openshift-local-storage/examples/local-volume-discovery.yaml deleted file mode 100644 index 941fe1e3..00000000 --- a/components/operators/openshift-local-storage/examples/local-volume-discovery.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: local.storage.openshift.io/v1alpha1 -kind: LocalVolumeDiscovery -metadata: - name: auto-discover-devices - namespace: openshift-local-storage -spec: - nodeSelector: - nodeSelectorTerms: - - matchExpressions: - - key: cluster.ocs.openshift.io/openshift-storage - operator: In - values: - - '' - tolerations: - - effect: NoSchedule - key: node.ocs.openshift.io/storage - operator: Equal - value: 'true' diff --git a/components/operators/openshift-local-storage/examples/local-volume-set.yaml b/components/operators/openshift-local-storage/examples/local-volume-set.yaml deleted file mode 100644 index c82f26be..00000000 --- a/components/operators/openshift-local-storage/examples/local-volume-set.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: local.storage.openshift.io/v1alpha1 -kind: LocalVolumeSet -metadata: - name: autodetect-local -spec: - nodeSelector: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/hostname - operator: In - values: - - worker-0 - - worker-1 - storageClassName: local-disks - volumeMode: Filesystem - fsType: xfs - deviceInclusionSpec: - deviceTypes: - - disk - - part - minSize: 10G diff --git a/components/operators/openshift-local-storage/examples/local-volume.yaml b/components/operators/openshift-local-storage/examples/local-volume.yaml deleted file mode 100644 index 2ceec597..00000000 --- a/components/operators/openshift-local-storage/examples/local-volume.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: "local.storage.openshift.io/v1" -kind: "LocalVolume" -metadata: - name: "local-disks" - namespace: "openshift-local-storage" -spec: - nodeSelector: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/hostname - operator: In - values: - - ip-10-0-140-183 - - ip-10-0-158-139 - - ip-10-0-164-33 - storageClassDevices: - - storageClassName: "local-sc" - volumeMode: Filesystem - fsType: xfs - devicePaths: - - /path/to/device diff --git a/components/operators/openshift-local-storage/operator/base/kustomization.yaml b/components/operators/openshift-local-storage/operator/base/kustomization.yaml deleted file mode 100644 index 1e66bd5f..00000000 --- a/components/operators/openshift-local-storage/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-local-storage/operator/base/namespace.yaml b/components/operators/openshift-local-storage/operator/base/namespace.yaml deleted file mode 100644 index 2bd39d1f..00000000 --- a/components/operators/openshift-local-storage/operator/base/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - annotations: - openshift.io/display-name: Red Hat Local Storage Operator - labels: - openshift.io/cluster-monitoring: 'true' - name: openshift-local-storage diff --git a/components/operators/openshift-local-storage/operator/base/operator-group.yaml b/components/operators/openshift-local-storage/operator/base/operator-group.yaml deleted file mode 100644 index f89cdf43..00000000 --- a/components/operators/openshift-local-storage/operator/base/operator-group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: local-storage-operator - namespace: openshift-local-storage -spec: - targetNamespaces: - - openshift-local-storage diff --git a/components/operators/openshift-local-storage/operator/base/subscription.yaml b/components/operators/openshift-local-storage/operator/base/subscription.yaml deleted file mode 100644 index e3061915..00000000 --- a/components/operators/openshift-local-storage/operator/base/subscription.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: local-storage-operator - namespace: openshift-local-storage -spec: - channel: patch-me-see-overlays-dir - installPlanApproval: Automatic - name: local-storage-operator - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/components/operators/openshift-local-storage/operator/overlays/stable/README.md b/components/operators/openshift-local-storage/operator/overlays/stable/README.md deleted file mode 100644 index 0d1597fb..00000000 --- a/components/operators/openshift-local-storage/operator/overlays/stable/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs the *stable* channel version of the OpenShift Local Storage Operator diff --git a/components/operators/openshift-pipelines b/components/operators/openshift-pipelines new file mode 120000 index 00000000..287a5b09 --- /dev/null +++ b/components/operators/openshift-pipelines @@ -0,0 +1 @@ +openshift-pipelines-operator-rh \ No newline at end of file diff --git a/components/operators/openshift-pipelines-operator-rh/operator/base/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/base/kustomization.yaml index c9bc6d74..a390d723 100644 --- a/components/operators/openshift-pipelines-operator-rh/operator/base/kustomization.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/base/kustomization.yaml @@ -1,17 +1,11 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: openshift-operators resources: - - console-plugin-job.yaml - - console-plugin.yaml - subscription.yaml -generatorOptions: - disableNameSuffixHash: true - -configMapGenerator: - - name: job-tekton-console-plugin - files: - - console-plugin-job.sh +components: + - ../components/enable-console-plugin diff --git a/components/operators/openshift-pipelines-operator-rh/operator/components/README.md b/components/operators/openshift-pipelines-operator-rh/operator/components/README.md new file mode 100644 index 00000000..476e3b59 --- /dev/null +++ b/components/operators/openshift-pipelines-operator-rh/operator/components/README.md @@ -0,0 +1,22 @@ +# OpenShift Pipelines Components + +The included components are intended to be common patching patterns used on top of the default OpenShift Pipelines operator to configure additional features of the operator. Components are composable patches that can be added at the overlays layer on top of a base or overlay + +This repo currently contains the following components: + +* [enable-console-plugin](enable-console-plugin) + +## Usage + +Components can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/enable-console-plugin +``` diff --git a/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/README.md b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/README.md new file mode 100644 index 00000000..d2be1553 --- /dev/null +++ b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/README.md @@ -0,0 +1,20 @@ +# enable-console-plugin + +## Purpose + +This component is designed to enable the OpenShift Pipelines Console Plugin. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/enable-console-plugin +``` diff --git a/components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin-job.sh b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin-job.sh similarity index 98% rename from components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin-job.sh rename to components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin-job.sh index f46cf183..271c0588 100755 --- a/components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin-job.sh +++ b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin-job.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash enable_console_plugin(){ [ -z "${PLUGIN_NAME}" ] && return 1 diff --git a/components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin-job.yaml b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin-job.yaml similarity index 74% rename from components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin-job.yaml rename to components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin-job.yaml index c6c46554..e27d66ac 100644 --- a/components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin-job.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin-job.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: job-tekton-console-plugin + name: job-pipelines-console-plugin --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: job-tekton-console-plugin + name: job-pipelines-console-plugin rules: - apiGroups: - operator.openshift.io @@ -22,19 +22,19 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: job-tekton-console-plugin + name: job-pipelines-console-plugin subjects: - kind: ServiceAccount - name: job-tekton-console-plugin + name: job-pipelines-console-plugin roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: job-tekton-console-plugin + name: job-pipelines-console-plugin --- apiVersion: batch/v1 kind: Job metadata: - name: job-tekton-console-plugin + name: job-pipelines-console-plugin annotations: argocd.argoproj.io/sync-wave: "10" spec: @@ -56,9 +56,9 @@ spec: volumes: - name: scripts configMap: - name: job-tekton-console-plugin + name: job-pipelines-console-plugin defaultMode: 0755 restartPolicy: Never - serviceAccount: job-tekton-console-plugin - serviceAccountName: job-tekton-console-plugin + serviceAccount: job-pipelines-console-plugin + serviceAccountName: job-pipelines-console-plugin backoffLimit: 4 diff --git a/components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin.yaml b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin.yaml similarity index 85% rename from components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin.yaml rename to components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin.yaml index 1b7fab9e..748e7656 100644 --- a/components/operators/openshift-pipelines-operator-rh/operator/base/console-plugin.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/console-plugin.yaml @@ -2,8 +2,6 @@ apiVersion: console.openshift.io/v1 kind: ConsolePlugin metadata: name: pipelines-console-plugin - labels: - app.kubernetes.io/part-of: tekton-config spec: backend: service: diff --git a/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/kustomization.yaml new file mode 100644 index 00000000..dde914f5 --- /dev/null +++ b/components/operators/openshift-pipelines-operator-rh/operator/components/enable-console-plugin/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - console-plugin-job.yaml + - console-plugin.yaml + +generatorOptions: + disableNameSuffixHash: true + +configMapGenerator: + - name: job-pipelines-console-plugin + files: + - console-plugin-job.sh diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/latest/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/latest/kustomization.yaml index a61bd32f..38285d10 100644 --- a/components/operators/openshift-pipelines-operator-rh/operator/overlays/latest/kustomization.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/latest/kustomization.yaml @@ -1,11 +1,15 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../base - patches: - - target: + - path: patch-channel.yaml + target: + group: operators.coreos.com kind: Subscription - name: openshift-pipelines-operator-rh - path: patch-channel.yaml + name: openshift-pipelines-operator + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.10/README.md b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.10/README.md new file mode 100644 index 00000000..23023e67 --- /dev/null +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.10/README.md @@ -0,0 +1 @@ +Installs the *pipelines-1.10* channel of the Pipeline Operator which tracks the 1.10.X version. \ No newline at end of file diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.10/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.10/kustomization.yaml index a61bd32f..38285d10 100644 --- a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.10/kustomization.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.10/kustomization.yaml @@ -1,11 +1,15 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../base - patches: - - target: + - path: patch-channel.yaml + target: + group: operators.coreos.com kind: Subscription - name: openshift-pipelines-operator-rh - path: patch-channel.yaml + name: openshift-pipelines-operator + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.7/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.7/kustomization.yaml index a61bd32f..38285d10 100644 --- a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.7/kustomization.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.7/kustomization.yaml @@ -1,11 +1,15 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../base - patches: - - target: + - path: patch-channel.yaml + target: + group: operators.coreos.com kind: Subscription - name: openshift-pipelines-operator-rh - path: patch-channel.yaml + name: openshift-pipelines-operator + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.8/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.8/kustomization.yaml index a61bd32f..38285d10 100644 --- a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.8/kustomization.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.8/kustomization.yaml @@ -1,11 +1,15 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../base - patches: - - target: + - path: patch-channel.yaml + target: + group: operators.coreos.com kind: Subscription - name: openshift-pipelines-operator-rh - path: patch-channel.yaml + name: openshift-pipelines-operator + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.9/README.md b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.9/README.md new file mode 100644 index 00000000..f6d683ca --- /dev/null +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.9/README.md @@ -0,0 +1 @@ +Installs the *pipelines-1.9* channel of the Pipeline Operator which tracks the 1.9.X version. \ No newline at end of file diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.9/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.9/kustomization.yaml index a61bd32f..38285d10 100644 --- a/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.9/kustomization.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/pipelines-1.9/kustomization.yaml @@ -1,11 +1,15 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../base - patches: - - target: + - path: patch-channel.yaml + target: + group: operators.coreos.com kind: Subscription - name: openshift-pipelines-operator-rh - path: patch-channel.yaml + name: openshift-pipelines-operator + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/README.md b/components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/README.md new file mode 100644 index 00000000..52a07cbb --- /dev/null +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/README.md @@ -0,0 +1,3 @@ +Installs the *preview* channel version of the Pipeline Operator + +**Version: 1.3.1** \ No newline at end of file diff --git a/components/operators/openshift-local-storage/operator/overlays/stable/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/kustomization.yaml similarity index 54% rename from components/operators/openshift-local-storage/operator/overlays/stable/kustomization.yaml rename to components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/kustomization.yaml index 6a37afa2..38285d10 100644 --- a/components/operators/openshift-local-storage/operator/overlays/stable/kustomization.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/kustomization.yaml @@ -1,16 +1,15 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: openshift-local-storage resources: - ../../base - patches: - - target: + - path: patch-channel.yaml + target: group: operators.coreos.com - version: v1alpha1 kind: Subscription - name: local-storage-operator - namespace: openshift-local-storage - path: patch-channel.yaml + name: openshift-pipelines-operator + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/openshift-local-storage/operator/overlays/stable/patch-channel.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/patch-channel.yaml similarity index 67% rename from components/operators/openshift-local-storage/operator/overlays/stable/patch-channel.yaml rename to components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/patch-channel.yaml index 6642eb17..be4e5a15 100644 --- a/components/operators/openshift-local-storage/operator/overlays/stable/patch-channel.yaml +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/preview/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: stable + value: preview diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/stable/README.md b/components/operators/openshift-pipelines-operator-rh/operator/overlays/stable/README.md new file mode 100644 index 00000000..528a5282 --- /dev/null +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/stable/README.md @@ -0,0 +1,4 @@ +Installs the *stable* channel version of the Pipeline Operator, note this channel has been deprecated in favor of the *latest* channel so please use that overlay instead going forward. + + + diff --git a/components/operators/openshift-pipelines-operator-rh/operator/overlays/stable/kustomization.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/stable/kustomization.yaml new file mode 100644 index 00000000..38285d10 --- /dev/null +++ b/components/operators/openshift-pipelines-operator-rh/operator/overlays/stable/kustomization.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + + +resources: + - ../../base +patches: + - path: patch-channel.yaml + target: + group: operators.coreos.com + kind: Subscription + name: openshift-pipelines-operator + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/openshift-gitops-operator/operator/overlays/stable/patch-channel.yaml b/components/operators/openshift-pipelines-operator-rh/operator/overlays/stable/patch-channel.yaml similarity index 100% rename from components/operators/openshift-gitops-operator/operator/overlays/stable/patch-channel.yaml rename to components/operators/openshift-pipelines-operator-rh/operator/overlays/stable/patch-channel.yaml diff --git a/components/operators/openshift-serverless b/components/operators/openshift-serverless new file mode 120000 index 00000000..69150e99 --- /dev/null +++ b/components/operators/openshift-serverless @@ -0,0 +1 @@ +serverless-operator \ No newline at end of file diff --git a/components/operators/openshift-servicemesh b/components/operators/openshift-servicemesh new file mode 120000 index 00000000..70f38930 --- /dev/null +++ b/components/operators/openshift-servicemesh @@ -0,0 +1 @@ +servicemeshoperator \ No newline at end of file diff --git a/components/operators/redhat-oadp-operator/instance/base/dpa.yaml b/components/operators/redhat-oadp-operator/instance/base/dpa.yaml index a56245f5..2d86812a 100644 --- a/components/operators/redhat-oadp-operator/instance/base/dpa.yaml +++ b/components/operators/redhat-oadp-operator/instance/base/dpa.yaml @@ -30,4 +30,4 @@ spec: provider: aws config: region: us-west-2 - profile: "volumeSnapshot" \ No newline at end of file + profile: "volumeSnapshot" diff --git a/components/operators/redhat-oadp-operator/instance/base/secret.yaml b/components/operators/redhat-oadp-operator/instance/base/secret.yaml index 2d6a6b46..eb6c8947 100644 --- a/components/operators/redhat-oadp-operator/instance/base/secret.yaml +++ b/components/operators/redhat-oadp-operator/instance/base/secret.yaml @@ -16,4 +16,4 @@ stringData: [volumeSnapshot] aws_access_key_id=${AWS_ACCESS_KEY_ID} - aws_secret_access_key=${AWS_SECRET_ACCESS_KEY} \ No newline at end of file + aws_secret_access_key=${AWS_SECRET_ACCESS_KEY} diff --git a/components/operators/rhods-operator/INFO.md b/components/operators/rhods-operator/INFO.md index 530cd3c9..03aa8245 100644 --- a/components/operators/rhods-operator/INFO.md +++ b/components/operators/rhods-operator/INFO.md @@ -10,15 +10,13 @@ But beyond the individual features, one of the key aspects of this platform is i Finally, thanks to the operator-driven deployment and updates, the administrative load of the platform is very light, leaving everyone more time to focus on the work that makes a difference. - ### Components * Dashboard * Curated Workbench Images (incl CUDA, PyTorch, Tensorflow, code-server) * Ability to add Custom Images * Ability to leverage accelerators (such as NVIDIA GPU) -* Data Science Pipelines. (including Elyra notebook interface, and based on standard OpenShift Pipelines) +* Data Science Pipelines (including Elyra notebook interface) * Model Serving using ModelMesh and Kserve. * Ability to use other runtimes for serving * Model Monitoring -* Distributed workloads (KubeRay, CodeFlare) -* XAI explanations of predictive models (TrustyAI) +* Distributed workloads (KubeRay, CodeFlare, Kueue) diff --git a/components/operators/rhods-operator/README.md b/components/operators/rhods-operator/README.md index 32931981..a386fc33 100644 --- a/components/operators/rhods-operator/README.md +++ b/components/operators/rhods-operator/README.md @@ -9,8 +9,11 @@ The current *overlays* available are for the following channels: * [alpha](operator/overlays/alpha) * [beta](operator/overlays/beta) * [embedded](operator/overlays/embedded) +* [eus-2.8](operator/overlays/eus-2.8) * [fast](operator/overlays/fast) * [stable](operator/overlays/stable) +* [stable-2.10](operator/overlays/stable-2.10) +* [stable-2.8](operator/overlays/stable-2.8) ## Usage diff --git a/components/operators/rhods-operator/aggregate/overlays/eus-2.8-nvidia-gpu/kustomization.yaml b/components/operators/rhods-operator/aggregate/overlays/eus-2.8-nvidia-gpu/kustomization.yaml new file mode 100644 index 00000000..4b4e0c19 --- /dev/null +++ b/components/operators/rhods-operator/aggregate/overlays/eus-2.8-nvidia-gpu/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +commonAnnotations: + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + +resources: + - ../../../operator/overlays/eus-2.8 + - ../../../instance/overlays/eus-2.8-nvidia-gpu diff --git a/components/operators/rhods-operator/aggregate/overlays/eus-2.8/kustomization.yaml b/components/operators/rhods-operator/aggregate/overlays/eus-2.8/kustomization.yaml new file mode 100644 index 00000000..220cd95c --- /dev/null +++ b/components/operators/rhods-operator/aggregate/overlays/eus-2.8/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +commonAnnotations: + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + +resources: + - ../../../operator/overlays/eus-2.8 + - ../../../instance/overlays/eus-2.8 diff --git a/components/operators/rhods-operator/aggregate/overlays/fast-nvidia-gpu/kustomization.yaml b/components/operators/rhods-operator/aggregate/overlays/fast-nvidia-gpu/kustomization.yaml new file mode 100644 index 00000000..3eab34b7 --- /dev/null +++ b/components/operators/rhods-operator/aggregate/overlays/fast-nvidia-gpu/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +commonAnnotations: + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + +resources: + - ../../../operator/overlays/fast + - ../../../instance/overlays/fast-nvidia-gpu diff --git a/components/operators/openshift-gitops-operator/aggregate/overlays/default/kustomization.yaml b/components/operators/rhods-operator/aggregate/overlays/fast/kustomization.yaml similarity index 68% rename from components/operators/openshift-gitops-operator/aggregate/overlays/default/kustomization.yaml rename to components/operators/rhods-operator/aggregate/overlays/fast/kustomization.yaml index b0b198fe..44084bd5 100644 --- a/components/operators/openshift-gitops-operator/aggregate/overlays/default/kustomization.yaml +++ b/components/operators/rhods-operator/aggregate/overlays/fast/kustomization.yaml @@ -5,5 +5,5 @@ commonAnnotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true resources: - - ../../../instance/overlays/default - - ../../../operator/overlays/latest + - ../../../operator/overlays/fast + - ../../../instance/overlays/fast diff --git a/components/operators/rhods-operator/instance/base/datasciencecluster.yaml b/components/operators/rhods-operator/instance/base/datasciencecluster.yaml new file mode 100644 index 00000000..8aa95b45 --- /dev/null +++ b/components/operators/rhods-operator/instance/base/datasciencecluster.yaml @@ -0,0 +1,30 @@ +kind: DataScienceCluster +apiVersion: datasciencecluster.opendatahub.io/v1 +metadata: + name: default-dsc +spec: + components: + codeflare: + managementState: Removed + kserve: + managementState: Removed + serving: + ingressGateway: + certificate: + type: SelfSigned + managementState: Managed + name: knative-serving + trustyai: + managementState: Removed + ray: + managementState: Removed + kueue: + managementState: Removed + workbenches: + managementState: Removed + dashboard: + managementState: Managed + modelmeshserving: + managementState: Removed + datasciencepipelines: + managementState: Removed diff --git a/components/operators/rhods-operator/instance/base/dsc-init.yaml b/components/operators/rhods-operator/instance/base/dsc-init.yaml new file mode 100644 index 00000000..acafb9f3 --- /dev/null +++ b/components/operators/rhods-operator/instance/base/dsc-init.yaml @@ -0,0 +1,18 @@ +apiVersion: dscinitialization.opendatahub.io/v1 +kind: DSCInitialization +metadata: + name: default-dsci +spec: + applicationsNamespace: redhat-ods-applications + monitoring: + managementState: Managed + namespace: redhat-ods-monitoring + serviceMesh: + controlPlane: + metricsCollection: Istio + name: data-science-smcp + namespace: istio-system + managementState: Removed + trustedCABundle: + customCABundle: '' + managementState: Managed diff --git a/components/operators/rhods-operator/instance/base/kustomization.yaml b/components/operators/rhods-operator/instance/base/kustomization.yaml index 89925402..3c0adbdc 100644 --- a/components/operators/rhods-operator/instance/base/kustomization.yaml +++ b/components/operators/rhods-operator/instance/base/kustomization.yaml @@ -1,5 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: redhat-ods-applications + resources: - - profile-nvidia.yaml + - datasciencecluster.yaml + # - dsc-init.yaml + - namespace.yaml + - odhdashboardconfig.yaml diff --git a/components/operators/rhods-operator/instance/base/namespace.yaml b/components/operators/rhods-operator/instance/base/namespace.yaml new file mode 100644 index 00000000..4a55b505 --- /dev/null +++ b/components/operators/rhods-operator/instance/base/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: redhat-ods-applications diff --git a/components/operators/rhods-operator/instance/base/odhdashboardconfig.yaml b/components/operators/rhods-operator/instance/base/odhdashboardconfig.yaml new file mode 100644 index 00000000..80bccb6b --- /dev/null +++ b/components/operators/rhods-operator/instance/base/odhdashboardconfig.yaml @@ -0,0 +1,6 @@ +apiVersion: opendatahub.io/v1alpha +kind: OdhDashboardConfig +metadata: + annotations: + argocd.argoproj.io/sync-options: ServerSideApply=true + name: odh-dashboard-config diff --git a/components/operators/rhods-operator/instance/components/auth-with-authorino/README.md b/components/operators/rhods-operator/instance/components/auth-with-authorino/README.md new file mode 100644 index 00000000..da6b964d --- /dev/null +++ b/components/operators/rhods-operator/instance/components/auth-with-authorino/README.md @@ -0,0 +1,21 @@ +# components-distributed-compute + +## Purpose +This component is designed help configure the the authentication endpoint for RHOAI with KServe using Authorino with ServiceMesh + +The Authorino auth is available in RHOAI 2.9 and later. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/auth-with-authorino +``` diff --git a/components/operators/rhods-operator/instance/components/auth-with-authorino/kustomization.yaml b/components/operators/rhods-operator/instance/components/auth-with-authorino/kustomization.yaml new file mode 100644 index 00000000..4650bf94 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/auth-with-authorino/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-dsc-init.yaml + target: + kind: DSCInitialization diff --git a/components/operators/rhods-operator/instance/components/auth-with-authorino/patch-dsc-init.yaml b/components/operators/rhods-operator/instance/components/auth-with-authorino/patch-dsc-init.yaml new file mode 100644 index 00000000..226c18a0 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/auth-with-authorino/patch-dsc-init.yaml @@ -0,0 +1,9 @@ +apiVersion: dscinitialization.opendatahub.io/v1 +kind: DSCInitialization +metadata: + name: default-dsci +spec: + serviceMesh: + auth: + audiences: + - 'https://kubernetes.default.svc' diff --git a/components/operators/rhods-operator/instance/components/components-distributed-compute/README.md b/components/operators/rhods-operator/instance/components/components-distributed-compute/README.md new file mode 100644 index 00000000..aa4b66c0 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-distributed-compute/README.md @@ -0,0 +1,24 @@ +# components-distributed-compute + +## Purpose +This component is designed help configure the distributed compute specific components including the following items: + +CodeFlare +Ray + +The Distributed Compute Components are Generally Available as of RHOAI 2.9. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/components-distributed-compute +``` diff --git a/components/operators/rhods-operator/instance/components/components-distributed-compute/kustomization.yaml b/components/operators/rhods-operator/instance/components/components-distributed-compute/kustomization.yaml new file mode 100644 index 00000000..f5a4caf2 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-distributed-compute/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-datasciencecluster.yaml + target: + kind: DataScienceCluster diff --git a/components/operators/rhods-operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml b/components/operators/rhods-operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml new file mode 100644 index 00000000..1720e07f --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml @@ -0,0 +1,12 @@ +kind: DataScienceCluster +apiVersion: datasciencecluster.opendatahub.io/v1 +metadata: + name: default +spec: + components: + codeflare: + managementState: Managed + kueue: + managementState: Managed + ray: + managementState: Managed diff --git a/components/operators/rhods-operator/instance/components/components-serving/README.md b/components/operators/rhods-operator/instance/components/components-serving/README.md new file mode 100644 index 00000000..f3b6ae59 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-serving/README.md @@ -0,0 +1,22 @@ +# components-serving + +## Purpose +This component is designed help configure the serving specific components including the following items: + +KServe +ModelMesh + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/components-serving +``` diff --git a/components/operators/rhods-operator/instance/components/components-serving/kustomization.yaml b/components/operators/rhods-operator/instance/components/components-serving/kustomization.yaml new file mode 100644 index 00000000..067c655b --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-serving/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-datasciencecluster.yaml + target: + kind: DataScienceCluster + - path: patch-dsc-init.yaml + target: + kind: DSCInitialization + +components: + - ../wait-for-servicemesh diff --git a/components/operators/rhods-operator/instance/components/components-serving/patch-datasciencecluster.yaml b/components/operators/rhods-operator/instance/components/components-serving/patch-datasciencecluster.yaml new file mode 100644 index 00000000..0b645df7 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-serving/patch-datasciencecluster.yaml @@ -0,0 +1,16 @@ +kind: DataScienceCluster +apiVersion: datasciencecluster.opendatahub.io/v1 +metadata: + name: default +spec: + components: + kserve: + managementState: Managed + serving: + ingressGateway: + certificate: + type: SelfSigned + managementState: Managed + name: knative-serving + modelmeshserving: + managementState: Managed diff --git a/components/operators/rhods-operator/instance/components/components-serving/patch-dsc-init.yaml b/components/operators/rhods-operator/instance/components/components-serving/patch-dsc-init.yaml new file mode 100644 index 00000000..be62bb1c --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-serving/patch-dsc-init.yaml @@ -0,0 +1,11 @@ +apiVersion: dscinitialization.opendatahub.io/v1 +kind: DSCInitialization +metadata: + name: default-dsci +spec: + serviceMesh: + controlPlane: + metricsCollection: Istio + name: data-science-smcp + namespace: istio-system + managementState: Managed diff --git a/components/operators/rhods-operator/instance/components/components-training/README.md b/components/operators/rhods-operator/instance/components/components-training/README.md new file mode 100644 index 00000000..3ae539d0 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-training/README.md @@ -0,0 +1,22 @@ +# components-training + +## Purpose +This component is designed help configure the training specific components including the following items: + +DataSciencePipelines +Workbenches + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/components-training +``` diff --git a/components/operators/rhods-operator/instance/components/components-training/kustomization.yaml b/components/operators/rhods-operator/instance/components/components-training/kustomization.yaml new file mode 100644 index 00000000..f5a4caf2 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-training/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-datasciencecluster.yaml + target: + kind: DataScienceCluster diff --git a/components/operators/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml b/components/operators/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml new file mode 100644 index 00000000..322183bf --- /dev/null +++ b/components/operators/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml @@ -0,0 +1,10 @@ +kind: DataScienceCluster +apiVersion: datasciencecluster.opendatahub.io/v1 +metadata: + name: default +spec: + components: + datasciencepipelines: + managementState: Managed + workbenches: + managementState: Managed diff --git a/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/README.md b/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/README.md new file mode 100644 index 00000000..110aff3c --- /dev/null +++ b/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/README.md @@ -0,0 +1,25 @@ +# default-notebook-pvc-size + +## Purpose +This component is designed help admins configure the default PVC size that users are presented with when creating new Workbenches. + + +For more information see the official docs for [Configuring Default PVC size](https://access.redhat.com/documentation/en-us/red_hat_openshift_ai_self-managed/2-latest/html/managing_resources/managing-cluster-resources_cluster-mgmt#configuring-the-default-pvc-size-for-your-cluster_cluster-mgmt) + + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/default-notebook-pvc-size +``` + +You can customize the PVC size by updating the [patch-rhoai-dashboard.yaml](./patch-rhoai-dashboard.yaml) file. diff --git a/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/kustomization.yaml b/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/kustomization.yaml new file mode 100644 index 00000000..e5836471 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +commonAnnotations: + argocd.argoproj.io/sync-options: ServerSideApply=true + +patches: + - path: patch-rhoai-dashboard.yaml + target: + kind: OdhDashboardConfig diff --git a/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/patch-rhoai-dashboard.yaml b/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/patch-rhoai-dashboard.yaml new file mode 100644 index 00000000..5a96b544 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/default-notebook-pvc-size/patch-rhoai-dashboard.yaml @@ -0,0 +1,7 @@ +apiVersion: opendatahub.io/v1alpha +kind: OdhDashboardConfig +metadata: + name: odh-dashboard-config +spec: + notebookController: + pvcSize: 20Gi diff --git a/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/README.md b/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/README.md new file mode 100644 index 00000000..a7303ac8 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/README.md @@ -0,0 +1,24 @@ +# fix-kubeadmin-cluster-admin + +## Purpose + +This component is designed to add kubeadmin as a Cluster Admin. Out of the box, the Dashboard does not recognize kubeadmin as an admin user and does not have access to the Settings page. + +For more information, see [this](https://github.com/opendatahub-io/odh-dashboard/issues/2006) upstream issue. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/idle-notebook-culling +``` + +You can customize the time notebooks can remain running while inactive by updating the [culler-config.yaml](./culler-config.yaml) file. diff --git a/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/kustomization.yaml b/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/kustomization.yaml new file mode 100644 index 00000000..aed1684e --- /dev/null +++ b/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - rolebinding.yaml diff --git a/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/rolebinding.yaml b/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/rolebinding.yaml new file mode 100644 index 00000000..ba03ebb5 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/rolebinding.yaml @@ -0,0 +1,12 @@ +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kludge-kubeadmin +subjects: + - kind: User + apiGroup: rbac.authorization.k8s.io + name: 'kube:admin' +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin diff --git a/components/operators/rhods-operator/instance/components/idle-notebook-culling/README.md b/components/operators/rhods-operator/instance/components/idle-notebook-culling/README.md new file mode 100644 index 00000000..210860c7 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/idle-notebook-culling/README.md @@ -0,0 +1,23 @@ +# idle-notebook-culling + +## Purpose +This component is designed help admins configure the default PVC size that users are presented with when creating new Workbenches. + +For more information see the official docs for [Stopping Idle Notebooks](https://access.redhat.com/documentation/en-us/red_hat_openshift_ai_self-managed/2-latest/html/managing_resources/managing-notebook-servers_notebook-mgmt#stopping-idle-notebooks_notebook-mgmt) + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/idle-notebook-culling +``` + +You can customize the time notebooks can remain running while inactive by updating the [culler-config.yaml](./culler-config.yaml) file. diff --git a/components/operators/rhods-operator/instance/components/idle-notebook-culling/culler-config.yaml b/components/operators/rhods-operator/instance/components/idle-notebook-culling/culler-config.yaml new file mode 100644 index 00000000..7230380d --- /dev/null +++ b/components/operators/rhods-operator/instance/components/idle-notebook-culling/culler-config.yaml @@ -0,0 +1,11 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: notebook-controller-culler-config + namespace: redhat-ods-applications + labels: + opendatahub.io/dashboard: 'true' +data: + CULL_IDLE_TIME: '24' + ENABLE_CULLING: 'true' + IDLENESS_CHECK_PERIOD: '1' diff --git a/components/operators/rhods-operator/instance/components/idle-notebook-culling/kustomization.yaml b/components/operators/rhods-operator/instance/components/idle-notebook-culling/kustomization.yaml new file mode 100644 index 00000000..e183bd78 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/idle-notebook-culling/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - culler-config.yaml diff --git a/components/operators/rhods-operator/instance/components/model-server-pod-sizes/README.md b/components/operators/rhods-operator/instance/components/model-server-pod-sizes/README.md new file mode 100644 index 00000000..8735fd39 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/model-server-pod-sizes/README.md @@ -0,0 +1,21 @@ +# model-server-pod-sizes + +## Purpose +This component is designed help admins configure the default sizes users can select from when creating a new Model Server. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/model-server-pod-sizes +``` + +You can customize the pod sizes by updating the [patch-rhoai-dashboard.yaml](./patch-rhoai-dashboard.yaml) file. diff --git a/components/operators/rhods-operator/instance/components/model-server-pod-sizes/kustomization.yaml b/components/operators/rhods-operator/instance/components/model-server-pod-sizes/kustomization.yaml new file mode 100644 index 00000000..e5836471 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/model-server-pod-sizes/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +commonAnnotations: + argocd.argoproj.io/sync-options: ServerSideApply=true + +patches: + - path: patch-rhoai-dashboard.yaml + target: + kind: OdhDashboardConfig diff --git a/components/operators/rhods-operator/instance/components/model-server-pod-sizes/patch-rhoai-dashboard.yaml b/components/operators/rhods-operator/instance/components/model-server-pod-sizes/patch-rhoai-dashboard.yaml new file mode 100644 index 00000000..ff8af3e7 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/model-server-pod-sizes/patch-rhoai-dashboard.yaml @@ -0,0 +1,30 @@ +apiVersion: opendatahub.io/v1alpha +kind: OdhDashboardConfig +metadata: + name: odh-dashboard-config +spec: + modelServerSizes: + - name: Small + resources: + limits: + cpu: '2' + memory: 8Gi + requests: + cpu: '1' + memory: 4Gi + - name: Medium + resources: + limits: + cpu: '8' + memory: 10Gi + requests: + cpu: '4' + memory: 8Gi + - name: Large + resources: + limits: + cpu: '10' + memory: 20Gi + requests: + cpu: '6' + memory: 16Gi diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes/README.md b/components/operators/rhods-operator/instance/components/notebook-pod-sizes/README.md new file mode 100644 index 00000000..d8130a9f --- /dev/null +++ b/components/operators/rhods-operator/instance/components/notebook-pod-sizes/README.md @@ -0,0 +1,21 @@ +# notebook-pod-sizes + +## Purpose +This component is designed help admins configure the default sizes users can select from when creating a new Workbenches. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/notebook-pod-sizes +``` + +You can customize the pod sizes by updating the [patch-rhoai-dashboard.yaml](./patch-rhoai-dashboard.yaml) file. diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes/kustomization.yaml b/components/operators/rhods-operator/instance/components/notebook-pod-sizes/kustomization.yaml new file mode 100644 index 00000000..e5836471 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/notebook-pod-sizes/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +commonAnnotations: + argocd.argoproj.io/sync-options: ServerSideApply=true + +patches: + - path: patch-rhoai-dashboard.yaml + target: + kind: OdhDashboardConfig diff --git a/components/operators/rhods-operator/instance/components/notebook-pod-sizes/patch-rhoai-dashboard.yaml b/components/operators/rhods-operator/instance/components/notebook-pod-sizes/patch-rhoai-dashboard.yaml new file mode 100644 index 00000000..914f00a6 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/notebook-pod-sizes/patch-rhoai-dashboard.yaml @@ -0,0 +1,38 @@ +apiVersion: opendatahub.io/v1alpha +kind: OdhDashboardConfig +metadata: + name: odh-dashboard-config +spec: + notebookSizes: + - name: Small + resources: + limits: + cpu: '2' + memory: 8Gi + requests: + cpu: '1' + memory: 8Gi + - name: Medium + resources: + limits: + cpu: '6' + memory: 24Gi + requests: + cpu: '3' + memory: 24Gi + - name: Large + resources: + limits: + cpu: '14' + memory: 56Gi + requests: + cpu: '7' + memory: 56Gi + - name: X Large + resources: + limits: + cpu: '30' + memory: 120Gi + requests: + cpu: '15' + memory: 120Gi diff --git a/components/operators/rhods-operator/instance/components/nvidia-gpu-accelerator-profile/README.md b/components/operators/rhods-operator/instance/components/nvidia-gpu-accelerator-profile/README.md new file mode 100644 index 00000000..c8dd970e --- /dev/null +++ b/components/operators/rhods-operator/instance/components/nvidia-gpu-accelerator-profile/README.md @@ -0,0 +1,23 @@ +# nvidia-gpu-accelerator-profile + +## Purpose +This component is designed help admins configure an accelerator profile with NVIDIA GPUs. + +For more information on accelerators, please see the [Working with accelerators](https://access.redhat.com/documentation/en-us/red_hat_openshift_ai_self-managed/2-latest/html/working_on_data_science_projects/working-with-accelerators_accelerators) documentation. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/nvidia-gpu-accelerator-profile +``` + +You can customize the pod sizes by updating the [patch-rhoai-dashboard.yaml](./patch-rhoai-dashboard.yaml) file. diff --git a/components/operators/rhods-operator/instance/components/nvidia-gpu-accelerator-profile/kustomization.yaml b/components/operators/rhods-operator/instance/components/nvidia-gpu-accelerator-profile/kustomization.yaml new file mode 100644 index 00000000..db65886e --- /dev/null +++ b/components/operators/rhods-operator/instance/components/nvidia-gpu-accelerator-profile/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - nvidia-profile.yaml diff --git a/components/operators/rhods-operator/instance/base/profile-nvidia.yaml b/components/operators/rhods-operator/instance/components/nvidia-gpu-accelerator-profile/nvidia-profile.yaml similarity index 100% rename from components/operators/rhods-operator/instance/base/profile-nvidia.yaml rename to components/operators/rhods-operator/instance/components/nvidia-gpu-accelerator-profile/nvidia-profile.yaml diff --git a/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/README.md b/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/README.md new file mode 100644 index 00000000..ef675ca4 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/README.md @@ -0,0 +1,21 @@ +# rhoai-dashboard-access + +## Purpose +This component is designed help admins configure the default access to the RHOAI Dashboard. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/rhoai-dashboard-access +``` + +You can customize the access by updating the [patch-rhoai-dashboard.yaml](./patch-rhoai-dashboard.yaml) file. diff --git a/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/kustomization.yaml b/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/kustomization.yaml new file mode 100644 index 00000000..e5836471 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +commonAnnotations: + argocd.argoproj.io/sync-options: ServerSideApply=true + +patches: + - path: patch-rhoai-dashboard.yaml + target: + kind: OdhDashboardConfig diff --git a/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/patch-rhoai-dashboard.yaml b/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/patch-rhoai-dashboard.yaml new file mode 100644 index 00000000..81509318 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/rhoai-dashboard-access/patch-rhoai-dashboard.yaml @@ -0,0 +1,8 @@ +apiVersion: opendatahub.io/v1alpha +kind: OdhDashboardConfig +metadata: + name: odh-dashboard-config +spec: + groupsConfig: + adminGroups: rhods-admins + allowedGroups: 'system:authenticated' diff --git a/components/operators/rhods-operator/instance/components/runtime-template-triton/README.md b/components/operators/rhods-operator/instance/components/runtime-template-triton/README.md new file mode 100644 index 00000000..d5e22ee0 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/runtime-template-triton/README.md @@ -0,0 +1,21 @@ +# runtime-template-triton + +## Purpose +This component is designed configure the Triton Serving Runtime Template. + +For more information on the Triton Serving Runtime, refer to the [Custom Runtime Triton](https://ai-on-openshift.io/odh-rhoai/custom-runtime-triton/) documentation. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/runtime-template-triton +``` diff --git a/components/operators/rhods-operator/instance/components/runtime-template-triton/kustomization.yaml b/components/operators/rhods-operator/instance/components/runtime-template-triton/kustomization.yaml new file mode 100644 index 00000000..91d33724 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/runtime-template-triton/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - triton-runtime-template.yaml diff --git a/components/operators/rhods-operator/instance/components/runtime-template-triton/triton-runtime-template.yaml b/components/operators/rhods-operator/instance/components/runtime-template-triton/triton-runtime-template.yaml new file mode 100644 index 00000000..72624e24 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/runtime-template-triton/triton-runtime-template.yaml @@ -0,0 +1,86 @@ +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + name: trition-serving-runtime + namespace: redhat-ods-applications + labels: + opendatahub.io/dashboard: 'true' + annotations: + opendatahub.io/apiProtocol: REST + opendatahub.io/modelServingSupport: '["multi"]' +objects: + - apiVersion: serving.kserve.io/v1alpha1 + kind: ServingRuntime + metadata: + name: triton-23.05 + labels: + name: triton-23.05 + annotations: + maxLoadingConcurrency: '2' + openshift.io/display-name: Triton runtime 23.05 + spec: + supportedModelFormats: + - name: keras + version: '2' + autoSelect: true + - name: onnx + version: '1' + autoSelect: true + - name: pytorch + version: '1' + autoSelect: true + - name: tensorflow + version: '1' + autoSelect: true + - name: tensorflow + version: '2' + autoSelect: true + - name: tensorrt + version: '7' + autoSelect: true + protocolVersions: + - grpc-v2 + multiModel: true + grpcEndpoint: 'port:8085' + grpcDataEndpoint: 'port:8001' + volumes: + - name: shm + emptyDir: + medium: Memory + sizeLimit: 2Gi + containers: + - name: triton + image: 'nvcr.io/nvidia/tritonserver:23.05-py3' + command: + - /bin/sh + args: + - '-c' + - 'mkdir -p /models/_triton_models; chmod 777 /models/_triton_models; exec tritonserver "--model-repository=/models/_triton_models" "--model-control-mode=explicit" "--strict-model-config=false" "--strict-readiness=false" "--allow-http=true" "--allow-sagemaker=false" ' + volumeMounts: + - name: shm + mountPath: /dev/shm + resources: + requests: + cpu: 500m + memory: 1Gi + limits: + cpu: '5' + memory: 1Gi + livenessProbe: + exec: + command: + - curl + - '--fail' + - '--silent' + - '--show-error' + - '--max-time' + - '9' + - 'http://localhost:8000/v2/health/live' + initialDelaySeconds: 5 + periodSeconds: 30 + timeoutSeconds: 10 + builtInAdapter: + serverType: triton + runtimeManagementPort: 8001 + memBufferBytes: 134217728 + modelLoadingTimeoutMillis: 90000 diff --git a/components/operators/rhods-operator/instance/components/wait-for-servicemesh/README.md b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/README.md new file mode 100644 index 00000000..a5ce0ae0 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/README.md @@ -0,0 +1,19 @@ +# wait-for-servicemesh + +## Purpose +This component is designed prevent OpenShift AI before the ServiceMesh resources have been successfully installed that are required for KServe. + +## Usage + +This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file: + +``` +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/wait-for-servicemesh +``` diff --git a/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.sh b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.sh new file mode 100755 index 00000000..639f2847 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.sh @@ -0,0 +1,27 @@ +#!/usr/bin/bash +set -e + +TIMEOUT_SECONDS=60 + +wait_for_service_mesh(){ + echo "Checking status of all service_mesh pre-reqs" + SERVICEMESH_RESOURCES=( + crd/kialis.kiali.io:condition=established \ + crd/jaegers.jaegertracing.io:condition=established \ + crd/elasticsearches.logging.openshift.io:condition=established \ + crd/knativeservings.operator.knative.dev:condition=established \ + crd/servicemeshcontrolplanes.maistra.io:condition=established \ + ) + + for crd in "${SERVICEMESH_RESOURCES[@]}" + do + RESOURCE=$(echo "$crd" | cut -d ":" -f 1) + CONDITION=$(echo "$crd" | cut -d ":" -f 2) + + echo "Waiting for ${RESOURCE} state to be ${CONDITION}..." + oc wait --for="${CONDITION}" "${RESOURCE}" --timeout="${TIMEOUT_SECONDS}s" + + done +} + +wait_for_service_mesh diff --git a/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.yaml b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.yaml new file mode 100644 index 00000000..c22b72a7 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/job.yaml @@ -0,0 +1,69 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: wait-for-servicemesh + namespace: redhat-ods-operator + annotations: + argocd.argoproj.io/hook: PreSync +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: wait-for-servicemesh + annotations: + argocd.argoproj.io/hook: PreSync +rules: + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - get + - list +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: wait-for-servicemesh + annotations: + argocd.argoproj.io/hook: PreSync +subjects: + - kind: ServiceAccount + name: wait-for-servicemesh + namespace: redhat-ods-operator +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: wait-for-servicemesh +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: wait-for-servicemesh + namespace: redhat-ods-operator + annotations: + argocd.argoproj.io/hook: PreSync + argocd.argoproj.io/sync-wave: "10" +spec: + template: + spec: + containers: + - name: minion + image: registry.redhat.io/openshift4/ose-cli + command: + - /bin/bash + - -c + - /scripts/job.sh + volumeMounts: + - name: scripts + mountPath: /scripts + volumes: + - name: scripts + configMap: + name: wait-for-servicemesh + defaultMode: 0755 + restartPolicy: Never + serviceAccount: wait-for-servicemesh + serviceAccountName: wait-for-servicemesh + backoffLimit: 4 diff --git a/components/operators/rhods-operator/instance/components/wait-for-servicemesh/kustomization.yaml b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/kustomization.yaml new file mode 100644 index 00000000..1e503799 --- /dev/null +++ b/components/operators/rhods-operator/instance/components/wait-for-servicemesh/kustomization.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: +- job.yaml + +generatorOptions: + disableNameSuffixHash: true + annotations: + argocd.argoproj.io/hook: PreSync + +configMapGenerator: + - name: wait-for-servicemesh + namespace: redhat-ods-operator + files: + - job.sh diff --git a/components/operators/rhods-operator/instance/overlays/2.9.1/datasciencecluster.yaml b/components/operators/rhods-operator/instance/overlays/2.8+/datasciencecluster.yaml similarity index 100% rename from components/operators/rhods-operator/instance/overlays/2.9.1/datasciencecluster.yaml rename to components/operators/rhods-operator/instance/overlays/2.8+/datasciencecluster.yaml diff --git a/components/operators/rhods-operator/instance/overlays/2.9.1/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/2.8+/kustomization.yaml similarity index 100% rename from components/operators/rhods-operator/instance/overlays/2.9.1/kustomization.yaml rename to components/operators/rhods-operator/instance/overlays/2.8+/kustomization.yaml diff --git a/components/operators/rhods-operator/instance/overlays/eus-2.8-nvidia-gpu/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/eus-2.8-nvidia-gpu/kustomization.yaml new file mode 100644 index 00000000..a011fa27 --- /dev/null +++ b/components/operators/rhods-operator/instance/overlays/eus-2.8-nvidia-gpu/kustomization.yaml @@ -0,0 +1,18 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: redhat-ods-applications + +resources: + - ../../base + +components: + - ../../components/components-serving + - ../../components/components-training + - ../../components/default-notebook-pvc-size + - ../../components/idle-notebook-culling + - ../../components/notebook-pod-sizes + - ../../components/nvidia-gpu-accelerator-profile + - ../../components/fix-kubeadmin-cluster-admin + - ../../components/model-server-pod-sizes + - ../../components/rhoai-dashboard-access diff --git a/components/operators/rhods-operator/instance/overlays/eus-2.8-serving-only/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/eus-2.8-serving-only/kustomization.yaml new file mode 100644 index 00000000..7182111b --- /dev/null +++ b/components/operators/rhods-operator/instance/overlays/eus-2.8-serving-only/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/components-serving + - ../../components/model-server-pod-sizes + - ../../components/rhoai-dashboard-access diff --git a/components/operators/rhods-operator/instance/overlays/eus-2.8-training-only/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/eus-2.8-training-only/kustomization.yaml new file mode 100644 index 00000000..15c03b91 --- /dev/null +++ b/components/operators/rhods-operator/instance/overlays/eus-2.8-training-only/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/components-training + - ../../components/default-notebook-pvc-size + - ../../components/idle-notebook-culling + - ../../components/notebook-pod-sizes + - ../../components/rhoai-dashboard-access diff --git a/components/operators/rhods-operator/instance/overlays/eus-2.8/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/eus-2.8/kustomization.yaml new file mode 100644 index 00000000..e28262e0 --- /dev/null +++ b/components/operators/rhods-operator/instance/overlays/eus-2.8/kustomization.yaml @@ -0,0 +1,17 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: redhat-ods-applications + +resources: + - ../../base + +components: + - ../../components/components-serving + - ../../components/components-training + - ../../components/default-notebook-pvc-size + - ../../components/idle-notebook-culling + - ../../components/notebook-pod-sizes + - ../../components/fix-kubeadmin-cluster-admin + - ../../components/model-server-pod-sizes + - ../../components/rhoai-dashboard-access diff --git a/components/operators/rhods-operator/instance/overlays/fast-nvidia-gpu/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/fast-nvidia-gpu/kustomization.yaml new file mode 100644 index 00000000..81aaa0f0 --- /dev/null +++ b/components/operators/rhods-operator/instance/overlays/fast-nvidia-gpu/kustomization.yaml @@ -0,0 +1,18 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/auth-with-authorino + - ../../components/components-distributed-compute + - ../../components/components-serving + - ../../components/components-training + - ../../components/default-notebook-pvc-size + - ../../components/idle-notebook-culling + - ../../components/notebook-pod-sizes + - ../../components/nvidia-gpu-accelerator-profile + - ../../components/fix-kubeadmin-cluster-admin + - ../../components/model-server-pod-sizes + - ../../components/rhoai-dashboard-access diff --git a/components/operators/rhods-operator/instance/overlays/fast/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/fast/kustomization.yaml new file mode 100644 index 00000000..54245f6b --- /dev/null +++ b/components/operators/rhods-operator/instance/overlays/fast/kustomization.yaml @@ -0,0 +1,17 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +components: + - ../../components/auth-with-authorino + - ../../components/components-distributed-compute + - ../../components/components-serving + - ../../components/components-training + - ../../components/default-notebook-pvc-size + - ../../components/idle-notebook-culling + - ../../components/notebook-pod-sizes + - ../../components/fix-kubeadmin-cluster-admin + - ../../components/model-server-pod-sizes + - ../../components/rhoai-dashboard-access diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.4/kustomization.yaml b/components/operators/rhods-operator/operator/overlays/eus-2.8/kustomization.yaml similarity index 81% rename from components/operators/openshift-gitops-operator/operator/overlays/gitops-1.4/kustomization.yaml rename to components/operators/rhods-operator/operator/overlays/eus-2.8/kustomization.yaml index b84bcd2c..975881f4 100644 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.4/kustomization.yaml +++ b/components/operators/rhods-operator/operator/overlays/eus-2.8/kustomization.yaml @@ -7,5 +7,5 @@ resources: patches: - target: kind: Subscription - name: openshift-gitops-operator + name: rhods-operator path: patch-channel.yaml diff --git a/components/operators/openshift-gitops-operator/operator/overlays/latest/patch-channel.yaml b/components/operators/rhods-operator/operator/overlays/eus-2.8/patch-channel.yaml similarity index 67% rename from components/operators/openshift-gitops-operator/operator/overlays/latest/patch-channel.yaml rename to components/operators/rhods-operator/operator/overlays/eus-2.8/patch-channel.yaml index 4d50d4b1..90587e81 100644 --- a/components/operators/openshift-gitops-operator/operator/overlays/latest/patch-channel.yaml +++ b/components/operators/rhods-operator/operator/overlays/eus-2.8/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: latest + value: eus-2.8 diff --git a/components/operators/openshift-gitops-operator/operator/overlays/stable/kustomization.yaml b/components/operators/rhods-operator/operator/overlays/stable-2.10/kustomization.yaml similarity index 81% rename from components/operators/openshift-gitops-operator/operator/overlays/stable/kustomization.yaml rename to components/operators/rhods-operator/operator/overlays/stable-2.10/kustomization.yaml index b84bcd2c..975881f4 100644 --- a/components/operators/openshift-gitops-operator/operator/overlays/stable/kustomization.yaml +++ b/components/operators/rhods-operator/operator/overlays/stable-2.10/kustomization.yaml @@ -7,5 +7,5 @@ resources: patches: - target: kind: Subscription - name: openshift-gitops-operator + name: rhods-operator path: patch-channel.yaml diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-channel.yaml b/components/operators/rhods-operator/operator/overlays/stable-2.10/patch-channel.yaml similarity index 63% rename from components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-channel.yaml rename to components/operators/rhods-operator/operator/overlays/stable-2.10/patch-channel.yaml index 9ce419d5..9bc0ec7a 100644 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-channel.yaml +++ b/components/operators/rhods-operator/operator/overlays/stable-2.10/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: gitops-1.11 + value: stable-2.10 diff --git a/components/operators/rhods-operator/operator/overlays/stable-2.8/kustomization.yaml b/components/operators/rhods-operator/operator/overlays/stable-2.8/kustomization.yaml new file mode 100644 index 00000000..975881f4 --- /dev/null +++ b/components/operators/rhods-operator/operator/overlays/stable-2.8/kustomization.yaml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +patches: + - target: + kind: Subscription + name: rhods-operator + path: patch-channel.yaml diff --git a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.3/patch-channel.yaml b/components/operators/rhods-operator/operator/overlays/stable-2.8/patch-channel.yaml similarity index 64% rename from components/operators/openshift-gitops-operator/operator/overlays/gitops-1.3/patch-channel.yaml rename to components/operators/rhods-operator/operator/overlays/stable-2.8/patch-channel.yaml index 24bda8ea..f00f6cff 100644 --- a/components/operators/openshift-gitops-operator/operator/overlays/gitops-1.3/patch-channel.yaml +++ b/components/operators/rhods-operator/operator/overlays/stable-2.8/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: gitops-1.3 + value: stable-2.8 diff --git a/components/operators/rhods-operator/rhods-operator b/components/operators/rhods-operator/rhods-operator new file mode 120000 index 00000000..2a28d2cd --- /dev/null +++ b/components/operators/rhods-operator/rhods-operator @@ -0,0 +1 @@ +rhods-operator \ No newline at end of file diff --git a/components/operators/servicemeshoperator/instance/README.md b/components/operators/servicemeshoperator/instance/README.md new file mode 100644 index 00000000..e9398979 --- /dev/null +++ b/components/operators/servicemeshoperator/instance/README.md @@ -0,0 +1,42 @@ +# OpenShift ServiceMesh - Control Plane + +Installs the Control Plane component of OpenShift ServiceMesh. + +## Prerequisites + +First, install the following operators in your cluster: + +- [Kiali Operator](../../kaili) +- [OpenShift ServiceMesh Operator](../operator) + +Review the [Service Mesh Install](https://docs.openshift.com/container-platform/4.14/service_mesh/v1x/installing-ossm.html) documentation for information on specific versions of the operators to install for your cluster version. + +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: + +* [default](overlays/default) + +## Usage + +If you have cloned the `gitops-catalog` repository, you can install Noobaa by running from the root `gitops-catalog` directory + +``` +oc apply -k openshift-servicemesh/instance/overlays/default +``` + +Or, without cloning: + +``` +oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-servicemesh/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-servicemesh/instance/overlays/default?ref=main +``` diff --git a/components/operators/servicemeshoperator/instance/base/kustomization.yaml b/components/operators/servicemeshoperator/instance/base/kustomization.yaml index ab595865..d80b4fdf 100644 --- a/components/operators/servicemeshoperator/instance/base/kustomization.yaml +++ b/components/operators/servicemeshoperator/instance/base/kustomization.yaml @@ -1,6 +1,8 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: istio-system + resources: - - basic-cr.yaml - namespace.yaml diff --git a/components/operators/odf-operator/config-helpers/node-labeler/overlays/default/kustomization.yaml b/components/operators/servicemeshoperator/instance/overlays/2.x/kustomization.yaml similarity index 59% rename from components/operators/odf-operator/config-helpers/node-labeler/overlays/default/kustomization.yaml rename to components/operators/servicemeshoperator/instance/overlays/2.x/kustomization.yaml index 016a0467..4036fa3b 100644 --- a/components/operators/odf-operator/config-helpers/node-labeler/overlays/default/kustomization.yaml +++ b/components/operators/servicemeshoperator/instance/overlays/2.x/kustomization.yaml @@ -1,7 +1,9 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: openshift-storage +namespace: istio-system resources: - ../../base + - servicemesh-controlplane.yaml diff --git a/components/operators/servicemeshoperator/instance/base/basic-cr.yaml b/components/operators/servicemeshoperator/instance/overlays/2.x/servicemesh-controlplane.yaml similarity index 94% rename from components/operators/servicemeshoperator/instance/base/basic-cr.yaml rename to components/operators/servicemeshoperator/instance/overlays/2.x/servicemesh-controlplane.yaml index b8301a98..f685681a 100644 --- a/components/operators/servicemeshoperator/instance/base/basic-cr.yaml +++ b/components/operators/servicemeshoperator/instance/overlays/2.x/servicemesh-controlplane.yaml @@ -1,7 +1,7 @@ apiVersion: maistra.io/v2 kind: ServiceMeshControlPlane metadata: - name: basic + name: istio-system namespace: istio-system spec: version: v2.4 diff --git a/components/operators/servicemeshoperator/instance/overlays/default b/components/operators/servicemeshoperator/instance/overlays/default new file mode 120000 index 00000000..ad985971 --- /dev/null +++ b/components/operators/servicemeshoperator/instance/overlays/default @@ -0,0 +1 @@ +2.x \ No newline at end of file diff --git a/components/operators/openshift-local-storage/README.md b/components/operators/servicemeshoperator/operator/README.md similarity index 52% rename from components/operators/openshift-local-storage/README.md rename to components/operators/servicemeshoperator/operator/README.md index e7aff9c2..31fb8ef3 100644 --- a/components/operators/openshift-local-storage/README.md +++ b/components/operators/servicemeshoperator/operator/README.md @@ -1,25 +1,25 @@ -# Red Hat Local Storage Operator +# OpenShift Service Mesh -Installs the Red Hat Local Storage operator. +Installs the OpenShift Service Mesh 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: - +* [1.0](overlays/1.0) * [stable](overlays/stable) ## Usage -If you have cloned the `gitops-catalog` repository, you can install the Advanced Cluster Management operator based on the overlay of your choice by running from the root `gitops-catalog` directory +If you have cloned the `gitops-catalog` repository, you can install the OpenShift Service Mesh operator based on the overlay of your choice by running from the root `gitops-catalog` directory ``` -oc apply -k local-storage/operator/overlays/ +oc apply -k openshift-servicemesh/operator/overlays/ ``` Or, without cloning: ``` -oc apply -k https://github.com/redhat-cop/gitops-catalog/local-storage/operator/overlays/ +oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-servicemesh/operator/overlays/ ``` As part of a different overlay in your own GitOps repo: @@ -27,6 +27,7 @@ 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/local-storage/operator/overlays/?ref=main + - github.com/redhat-cop/gitops-catalog/openshift-servicemesh/operator/overlays/?ref=main ``` diff --git a/components/operators/servicemeshoperator/operator/base/kustomization.yaml b/components/operators/servicemeshoperator/operator/base/kustomization.yaml index 00078e0a..7afbc6cf 100644 --- a/components/operators/servicemeshoperator/operator/base/kustomization.yaml +++ b/components/operators/servicemeshoperator/operator/base/kustomization.yaml @@ -1,5 +1,8 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: openshift-operators + resources: - subscription.yaml diff --git a/components/operators/servicemeshoperator/operator/base/subscription.yaml b/components/operators/servicemeshoperator/operator/base/subscription.yaml index 3c3ceb23..e1c78d64 100644 --- a/components/operators/servicemeshoperator/operator/base/subscription.yaml +++ b/components/operators/servicemeshoperator/operator/base/subscription.yaml @@ -2,10 +2,10 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: name: servicemeshoperator - namespace: openshift-operators spec: channel: patch-me-see-overlays-dir installPlanApproval: Automatic name: servicemeshoperator source: redhat-operators sourceNamespace: openshift-marketplace + startingCSV: patch-me-see-overlays-dir diff --git a/components/operators/servicemeshoperator/operator/overlays/1.0/kustomization.yaml b/components/operators/servicemeshoperator/operator/overlays/1.0/kustomization.yaml index ff022472..2a2b4d8c 100644 --- a/components/operators/servicemeshoperator/operator/overlays/1.0/kustomization.yaml +++ b/components/operators/servicemeshoperator/operator/overlays/1.0/kustomization.yaml @@ -1,11 +1,15 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../base - patches: - - target: + - path: patch-channel.yaml + target: + group: operators.coreos.com kind: Subscription name: servicemeshoperator - path: patch-channel.yaml + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/servicemeshoperator/operator/overlays/1.0/patch-channel.yaml b/components/operators/servicemeshoperator/operator/overlays/1.0/patch-channel.yaml index 92799e37..854f4b3c 100644 --- a/components/operators/servicemeshoperator/operator/overlays/1.0/patch-channel.yaml +++ b/components/operators/servicemeshoperator/operator/overlays/1.0/patch-channel.yaml @@ -1,3 +1,6 @@ - op: replace path: /spec/channel - value: 1.0 + value: '1.0' +- op: replace + path: /spec/startingCSV + value: servicemeshoperator.v2.0.5.2 diff --git a/components/operators/servicemeshoperator/operator/overlays/stable/kustomization.yaml b/components/operators/servicemeshoperator/operator/overlays/stable/kustomization.yaml index ff022472..2a2b4d8c 100644 --- a/components/operators/servicemeshoperator/operator/overlays/stable/kustomization.yaml +++ b/components/operators/servicemeshoperator/operator/overlays/stable/kustomization.yaml @@ -1,11 +1,15 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../base - patches: - - target: + - path: patch-channel.yaml + target: + group: operators.coreos.com kind: Subscription name: servicemeshoperator - path: patch-channel.yaml + namespace: openshift-operators + version: v1alpha1 diff --git a/components/operators/servicemeshoperator/operator/overlays/stable/patch-channel.yaml b/components/operators/servicemeshoperator/operator/overlays/stable/patch-channel.yaml index 6642eb17..9805b127 100644 --- a/components/operators/servicemeshoperator/operator/overlays/stable/patch-channel.yaml +++ b/components/operators/servicemeshoperator/operator/overlays/stable/patch-channel.yaml @@ -1,3 +1,6 @@ - op: replace path: /spec/channel value: stable +- op: replace + path: /spec/startingCSV + value: servicemeshoperator.v2.5.0 diff --git a/components/operators/servicemeshoperator/servicemeshoperator b/components/operators/servicemeshoperator/servicemeshoperator new file mode 120000 index 00000000..70f38930 --- /dev/null +++ b/components/operators/servicemeshoperator/servicemeshoperator @@ -0,0 +1 @@ +servicemeshoperator \ No newline at end of file diff --git a/demos/base/all/banner-demo.yaml b/demos/base/all/banner-demo.yaml index 77999d15..e0884fc1 100644 --- a/demos/base/all/banner-demo.yaml +++ b/demos/base/all/banner-demo.yaml @@ -8,4 +8,4 @@ spec: location: BannerTop # https://htmlcolorcodes.com/color-picker color: '#FFF' - backgroundColor: '#9F0000' \ No newline at end of file + backgroundColor: '#9F0000' diff --git a/demos/base/all/link-github.yaml b/demos/base/all/link-github.yaml index 670f7f10..83ee189a 100644 --- a/demos/base/all/link-github.yaml +++ b/demos/base/all/link-github.yaml @@ -8,4 +8,4 @@ spec: text: GitHub - NA SSA applicationMenu: section: Git Repos - imageURL: /static/assets/github.svg \ No newline at end of file + imageURL: /static/assets/github.svg diff --git a/demos/base/nvidia-gpu-autoscale/kustomization.yaml b/demos/base/nvidia-gpu-autoscale/kustomization.yaml index 89badb28..752bc2e5 100644 --- a/demos/base/nvidia-gpu-autoscale/kustomization.yaml +++ b/demos/base/nvidia-gpu-autoscale/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../components/configs/cluster/autoscale/overlays/gpus-accelerator-label + - ../../../components/cluster-configs/autoscale/overlays/gpus-accelerator-label - ../../../components/operators/gpu-operator-certified/instance/overlays/aws-time-sliced-2 - ../../../components/operators/gpu-operator-certified/operator/overlays/stable - ../../../components/operators/nfd/instance/overlays/only-nvidia diff --git a/demos/base/rhoai/kustomization.yaml b/demos/base/rhoai/kustomization.yaml index b14ac777..e0a7b705 100644 --- a/demos/base/rhoai/kustomization.yaml +++ b/demos/base/rhoai/kustomization.yaml @@ -2,10 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ../../../components/app-configs/rhoai-config - ../../../components/operators/authorino-operator/operator/overlays/managed-services - ../../../components/operators/openshift-pipelines-operator-rh/operator/overlays/latest - ../../../components/operators/rhods-operator/operator/overlays/fast - - ../../../components/operators/rhods-operator/instance/overlays/2.9.1 + # - ../../../components/operators/rhods-operator/instance/overlays/2.8+ - ../../../components/operators/serverless-operator/operator/overlays/stable - ../../../components/operators/servicemeshoperator/operator/overlays/stable diff --git a/demos/components/cpu-autoscale/kustomization.yaml b/demos/components/cpu-autoscale/kustomization.yaml index dd67e613..fee07caf 100644 --- a/demos/components/cpu-autoscale/kustomization.yaml +++ b/demos/components/cpu-autoscale/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../components/configs/cluster/autoscale/overlays/default + - ../../../components/cluster-configs/autoscale/overlays/default diff --git a/demos/rhoai-extended/kustomization.yaml b/demos/rhoai-extended/kustomization.yaml index c5e9fae6..3a179f91 100644 --- a/demos/rhoai-extended/kustomization.yaml +++ b/demos/rhoai-extended/kustomization.yaml @@ -4,21 +4,21 @@ kind: Kustomization resources: - ../rhoai - - ../../components/configs/kustomized/custom-notebook-images/overlays/rhoai - - ../../components/configs/kustomized/minio/overlays/with-namespace - - ../../components/configs/kustomized/rhoai-config - - ../../components/configs/kustomized/rhoai-data-connector/overlays/group-project - - ../../components/configs/kustomized/rhoai-data-connector/overlays/kserve-project - - ../../components/configs/kustomized/rhoai-data-connector/overlays/modelmesh-project - - ../../components/configs/kustomized/rhoai-modelmesh/overlays/modelmesh-project - - ../../components/configs/kustomized/rhoai-model-runtimes - # - ../../components/configs/kustomized/rhoai-kserve-instances - - ../../components/configs/kustomized/rhoai-notebook/overlays/group-project - - ../../components/configs/kustomized/rhoai-pipelines/overlays/group-project - - ../../components/configs/kustomized/rhoai-projects - - ../../components/configs/kustomized/rhoai-rbac - - ../../components/configs/kustomized/rhoai-rbac-notebooks - # - ../../components/configs/kustomized/rhoai-trustyai + - ../../components/app-configs/custom-notebook-images/overlays/rhoai + - ../../components/app-configs/minio/overlays/with-namespace + # - ../../components/app-configs/rhoai-config + - ../../components/app-configs/rhoai-data-connector/overlays/group-project + - ../../components/app-configs/rhoai-data-connector/overlays/kserve-project + - ../../components/app-configs/rhoai-data-connector/overlays/modelmesh-project + - ../../components/app-configs/rhoai-modelmesh/overlays/modelmesh-project + - ../../components/app-configs/rhoai-model-runtimes + # - ../../components/app-configs/rhoai-kserve-instances + - ../../components/app-configs/rhoai-notebook/overlays/group-project + - ../../components/app-configs/rhoai-pipelines/overlays/group-project + - ../../components/app-configs/rhoai-projects + - ../../components/app-configs/rhoai-rbac + - ../../components/app-configs/rhoai-rbac-notebooks + # - ../../components/app-configs/rhoai-trustyai patches: - target: diff --git a/demos/rhoai-extended/patch-workshop-users.yaml b/demos/rhoai-extended/patch-workshop-users.yaml index 41e58174..8e85a277 100644 --- a/demos/rhoai-extended/patch-workshop-users.yaml +++ b/demos/rhoai-extended/patch-workshop-users.yaml @@ -5,4 +5,4 @@ - darkrainbow - claymore - user1 - - user2 \ No newline at end of file + - user2 diff --git a/demos/rhoai/NOTES.md b/demos/rhoai/NOTES.md index 26c0ee54..e9ad798e 100644 --- a/demos/rhoai/NOTES.md +++ b/demos/rhoai/NOTES.md @@ -3,9 +3,9 @@ ## General Issues - [ ] Current RHOAI documentation [does not explain GPU operation](https://ai-on-openshift.io/odh-rhods/nvidia-gpus/) with RHOAI well -- [ ] `odh-dashboard-conf` needs `groupsConfig` to [setup RBAC](../../components/configs/kustomized/rhoai-config/dashboard-config-cr.yaml) - over-engineered dashboard, poor security +- [ ] `odh-dashboard-conf` needs `groupsConfig` to [setup RBAC](../../components/app-configs/rhoai-config/dashboard-config-cr.yaml) - over-engineered dashboard, poor security - [ ] Poorly documented, inconsistent labels to display resources in dashboard - - Why are [data sci projects](components/configs/kustomized/rhoai-projects) different than regular projects? + - Why are [data sci projects](components/app-configs/rhoai-projects) different than regular projects? - label `app.kubernetes.io/created-by: byon` - [ ] You can't customize the list of potential notebook images per namespace for multi-homed use cases. - Ex: everyone on the cluster sees the same notebook images - list can get very big. @@ -21,4 +21,4 @@ ## Potential enhancements -- [ ] Move config for idle notebooks to CR vs [configmap](../../components/configs/kustomized/rhoai-config/nb-culler-config.yaml) +- [ ] Move config for idle notebooks to CR vs [configmap](../../components/app-configs/rhoai-config/nb-culler-config.yaml) diff --git a/docs/APPS.md b/docs/APPS.md index 3934897a..bbe54f83 100644 --- a/docs/APPS.md +++ b/docs/APPS.md @@ -26,7 +26,7 @@ cat scratch/repo-secret.yml | kubeseal \ ``` cat scratch/htpasswd-secret.yaml | kubeseal \ --controller-namespace sealed-secrets \ - -o yaml > components/configs/login/overlays/rhdp/htpasswd-secret-ss.yaml + -o yaml > components/cluster-configs/login/overlays/rhdp/htpasswd-secret-ss.yaml ``` Convert a secret in OpenShift to a sealed-secret diff --git a/docs/MISC.md b/docs/MISC.md index aed304ff..443d03e8 100644 --- a/docs/MISC.md +++ b/docs/MISC.md @@ -20,9 +20,38 @@ ssh-copy-id 'lab-user@bastion... ## Resolve ingress / auth cert issues -``` +```sh oc -n openshift-config delete cm openshift-service-ca.crt oc -n openshift-ingress delete cm service-ca-bundle oc -n openshift-authentication delete cm v4-0-config-system-service-ca oc -n openshift-authentication delete cm v4-0-config-system-trusted-ca-bundle ``` + +Label storage nodes to deploy odf + +``` +oc label node cluster.ocs.openshift.io/openshift-storage="" --all +# oc label nodes --selector='node-role.kubernetes.io/worker' cluster.ocs.openshift.io/openshift-storage="" --overwrite=true + +oc annotate sc ocs-storagecluster-cephfs storageclass.kubernetes.io/is-default-class="true" +``` + +Setup image registry + +``` +# check storage class +oc get sc + +# setup registry operator +oc patch configs.imageregistry.operator.openshift.io/cluster --type=merge -p '{"spec":{"rolloutStrategy":"RollingUpdate","replicas":2}}' +oc patch configs.imageregistry.operator.openshift.io cluster --type merge -p '{"spec":{"managementState":"Managed"}}' +oc patch configs.imageregistry.operator.openshift.io cluster --type merge -p '{"spec":{"storage":{"pvc":{"claim": null}}}}' +``` + +Expose image registry + +``` +oc patch configs.imageregistry.operator.openshift.io/cluster --patch '{"spec":{"defaultRoute":true}}' --type=merge + +HOST=$(oc get route default-route -n openshift-image-registry --template='{{ .spec.host }}') +``` diff --git a/docs/OTHER.md b/docs/OTHER.md index 00dbd8ff..c9bada8f 100644 --- a/docs/OTHER.md +++ b/docs/OTHER.md @@ -8,3 +8,31 @@ ## SOPS https://github.com/getsops/sops + +## AWS Machine Set storage + +Patch `MachineSet` to add secondary storage + +```sh +spec: + template: + spec: + providerSpec: + value: + blockDevices: + - ebs: + encrypted: true + iops: 0 + kmsKey: + arn: '' + volumeSize: 100 + volumeType: gp3 + - deviceName: /dev/xvdb + ebs: + encrypted: true + iops: 0 + kmsKey: + arn: '' + volumeSize: 1000 + volumeType: gp3 +``` diff --git a/docs/notes/_TEMPLATE.md b/docs/notes/_TEMPLATE.md index 4e387753..3ab75809 100644 --- a/docs/notes/_TEMPLATE.md +++ b/docs/notes/_TEMPLATE.md @@ -25,10 +25,10 @@ State your goal ### Kustomized Code -[Code](../../components/configs/kustomized/rhoai-config/) +[Code](../../components/app-configs/rhoai-config/) ### Rollback / Uninstall ```sh -oc delete -k components/configs/kustomized/rhoai-config +oc delete -k components/app-configs/rhoai-config ``` diff --git a/dump/airflow/values.yaml b/dump/airflow/values.yaml index d6fb884c..2e906e6e 100644 --- a/dump/airflow/values.yaml +++ b/dump/airflow/values.yaml @@ -2,4 +2,4 @@ airflow: gitSync.repo: "https://github.com/dmarcus-wire/telecom-customer-churn-airflow.git" gitSync.branch: "main" gitSync.wait: "2" -namespace: airflow \ No newline at end of file +namespace: airflow diff --git a/components/configs/apply-only/README.md b/dump/apply-only/README.md similarity index 100% rename from components/configs/apply-only/README.md rename to dump/apply-only/README.md diff --git a/components/configs/apply-only/custom-images/README.md b/dump/apply-only/custom-images/README.md similarity index 100% rename from components/configs/apply-only/custom-images/README.md rename to dump/apply-only/custom-images/README.md diff --git a/components/configs/apply-only/custom-images/s2i-r-shiny.yaml b/dump/apply-only/custom-images/s2i-r-shiny.yaml similarity index 100% rename from components/configs/apply-only/custom-images/s2i-r-shiny.yaml rename to dump/apply-only/custom-images/s2i-r-shiny.yaml diff --git a/components/configs/apply-only/skupper/deploy.yaml b/dump/apply-only/skupper/deploy.yaml similarity index 100% rename from components/configs/apply-only/skupper/deploy.yaml rename to dump/apply-only/skupper/deploy.yaml diff --git a/components/configs/apply-only/skupper/kustomization.yaml b/dump/apply-only/skupper/kustomization.yaml similarity index 87% rename from components/configs/apply-only/skupper/kustomization.yaml rename to dump/apply-only/skupper/kustomization.yaml index 5f73f440..ed033fe5 100644 --- a/components/configs/apply-only/skupper/kustomization.yaml +++ b/dump/apply-only/skupper/kustomization.yaml @@ -4,4 +4,4 @@ kind: Kustomization resources: - deploy.yaml - secret-token.yaml - - site-cm.yaml \ No newline at end of file + - site-cm.yaml diff --git a/components/configs/apply-only/skupper/secret-token.yaml b/dump/apply-only/skupper/secret-token.yaml similarity index 100% rename from components/configs/apply-only/skupper/secret-token.yaml rename to dump/apply-only/skupper/secret-token.yaml diff --git a/components/configs/apply-only/skupper/site-cm.yaml b/dump/apply-only/skupper/site-cm.yaml similarity index 100% rename from components/configs/apply-only/skupper/site-cm.yaml rename to dump/apply-only/skupper/site-cm.yaml diff --git a/dump/local-storage/local-disk-block-sc.yaml b/dump/local-storage/local-disk-block-sc.yaml deleted file mode 100644 index 53449a4a..00000000 --- a/dump/local-storage/local-disk-block-sc.yaml +++ /dev/null @@ -1,10 +0,0 @@ -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: local-disks-block - labels: - local.storage.openshift.io/owner-name: local-disks-block - local.storage.openshift.io/owner-namespace: openshift-local-storage -provisioner: kubernetes.io/no-provisioner -reclaimPolicy: Delete -volumeBindingMode: WaitForFirstConsumer diff --git a/dump/local-storage/local-volume-discovery.yaml b/dump/local-storage/local-volume-discovery.yaml deleted file mode 100644 index 0429c035..00000000 --- a/dump/local-storage/local-volume-discovery.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: local.storage.openshift.io/v1alpha1 -kind: LocalVolumeDiscovery -metadata: - name: auto-discover-devices - namespace: openshift-local-storage -spec: {} diff --git a/dump/local-storage/local-volume-set-block.yaml b/dump/local-storage/local-volume-set-block.yaml deleted file mode 100644 index 6094a27d..00000000 --- a/dump/local-storage/local-volume-set-block.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: local.storage.openshift.io/v1alpha1 -kind: LocalVolumeSet -metadata: - name: local-disks-block - namespace: openshift-local-storage -spec: - nodeSelector: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/hostname - operator: In - values: - - se350-04.edge.lab - - se350-05.edge.lab - - se350-06.edge.lab - storageClassName: local-disks-block - volumeMode: Block - deviceInclusionSpec: - deviceTypes: - - disk - # - part - minSize: 100G diff --git a/dump/machineconfiguration.yml b/dump/machineconfiguration.yml index 78bb3d87..80bea114 100644 --- a/dump/machineconfiguration.yml +++ b/dump/machineconfiguration.yml @@ -79,4 +79,4 @@ spec: [Install] WantedBy=local-fs.target enabled: true - name: var-lib-containers.mount \ No newline at end of file + name: var-lib-containers.mount diff --git a/dump/odf/README.md b/dump/odf/README.md deleted file mode 100644 index eb3ba96f..00000000 --- a/dump/odf/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Post Bootstrap Notes - -Label storage nodes to deploy odf - -``` -oc label node cluster.ocs.openshift.io/openshift-storage="" --all -# oc label nodes --selector='node-role.kubernetes.io/worker' cluster.ocs.openshift.io/openshift-storage="" --overwrite=true - -oc annotate sc ocs-storagecluster-cephfs storageclass.kubernetes.io/is-default-class="true" -``` - -Setup image registry - -``` -# check storage class -oc get sc - -# setup registry operator -oc patch configs.imageregistry.operator.openshift.io/cluster --type=merge -p '{"spec":{"rolloutStrategy":"RollingUpdate","replicas":2}}' -oc patch configs.imageregistry.operator.openshift.io cluster --type merge -p '{"spec":{"managementState":"Managed"}}' -oc patch configs.imageregistry.operator.openshift.io cluster --type merge -p '{"spec":{"storage":{"pvc":{"claim": null}}}}' -``` - -Expose image registry - -``` -oc patch configs.imageregistry.operator.openshift.io/cluster --patch '{"spec":{"defaultRoute":true}}' --type=merge - -HOST=$(oc get route default-route -n openshift-image-registry --template='{{ .spec.host }}') -``` diff --git a/dump/odf/storage-cluster.yaml b/dump/odf/storage-cluster.yaml deleted file mode 100644 index 0aa32301..00000000 --- a/dump/odf/storage-cluster.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: ocs.openshift.io/v1 -kind: StorageCluster -metadata: - annotations: - cluster.ocs.openshift.io/local-devices: "true" - storagesystem.odf.openshift.io/watched-by: ocs-storagecluster-storagesystem - uninstall.ocs.openshift.io/cleanup-policy: delete - uninstall.ocs.openshift.io/mode: graceful - name: ocs-storagecluster - namespace: openshift-storage -spec: - storageDeviceSets: - - count: 6 - dataPVCTemplate: - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: '1' - storageClassName: local-disks-block - volumeMode: Block - name: ocs-deviceset-local-disks-block - replica: 1 - encryption: - clusterWide: true - enable: true - monDataDirHostPath: /var/lib/rook - flexibleScaling: true diff --git a/dump/odf/storage-system.yaml b/dump/odf/storage-system.yaml deleted file mode 100644 index 06e37e39..00000000 --- a/dump/odf/storage-system.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: odf.openshift.io/v1alpha1 -kind: StorageSystem -metadata: - name: ocs-storagecluster-storagesystem - namespace: openshift-storage -spec: - kind: storagecluster.ocs.openshift.io/v1 - name: ocs-storagecluster - namespace: openshift-storage diff --git a/dump/pgadmin4/app-pgadmin4.yaml b/dump/pgadmin4/app-pgadmin4.yaml index 0ab009b3..48d4af88 100644 --- a/dump/pgadmin4/app-pgadmin4.yaml +++ b/dump/pgadmin4/app-pgadmin4.yaml @@ -9,7 +9,7 @@ spec: server: https://kubernetes.default.svc project: cluster-config source: - path: components/configs/simple/pgadmin4 + path: components/cluster-configs/simple/pgadmin4 repoURL: https://github.com/redhat-na-ssa/demo-ai-gitops-catlog.git targetRevision: main syncPolicy: diff --git a/dump/workshops/workshop-users/kustomization.yaml b/dump/workshops/workshop-users/kustomization.yaml index a1b7cfc0..dafb4c71 100644 --- a/dump/workshops/workshop-users/kustomization.yaml +++ b/dump/workshops/workshop-users/kustomization.yaml @@ -5,4 +5,4 @@ resources: - admin-rolebinding.yaml - namespace.yaml - workshop-admins-group.yaml - - workshop-users-group.yaml \ No newline at end of file + - workshop-users-group.yaml diff --git a/scripts/library/common.sh b/scripts/library/common.sh index 77f15102..51da38c7 100644 --- a/scripts/library/common.sh +++ b/scripts/library/common.sh @@ -36,9 +36,9 @@ until_true(){ echo "[OK]" } -export_function(){ - FUNC_NAME=${1:-ocp_aws_cluster} +extract_function(){ + EXPORT_NAME=${1:-ocp_aws_cluster} FILE=${2:-scripts/library/ocp.sh} - sed -n '/'"${FUNC_NAME}"'(){/,/^}/p' "${FILE}" + sed -n '/'"${EXPORT_NAME}"'(){/,/^}/p' "${FILE}" } diff --git a/scripts/library/ocp.sh b/scripts/library/ocp.sh index d216d8ef..4c0ca80c 100644 --- a/scripts/library/ocp.sh +++ b/scripts/library/ocp.sh @@ -109,30 +109,91 @@ ocp_aws_setup_ack_system(){ done } -ocp_aws_clone_machineset(){ +ocp_aws_clone_worker_machineset(){ [ -z "${1}" ] && \ echo " - usage: ocp_aws_create_gpu_machineset < instance type, default g4dn.4xlarge > + usage: ocp_aws_clone_worker_machineset < instance type, default g4dn.4xlarge > < machine set name > " INSTANCE_TYPE=${1:-g4dn.4xlarge} - MACHINE_SET=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep worker | head -n1) + SHORT_NAME=${2:-${INSTANCE_TYPE%.*}} + + MACHINE_SET_NAME=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${SHORT_NAME}" | head -n1) + MACHINE_SET_WORKER=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep worker | head -n1) # check for an existing instance machine set - if oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep -q "${INSTANCE_TYPE%.*}"; then - echo "Exists: machineset - ${INSTANCE_TYPE}" + if [ -n "${MACHINE_SET_NAME}" ]; then + echo "Exists: machineset - ${MACHINE_SET_NAME}" else - echo "Creating: machineset - ${INSTANCE_TYPE}" + echo "Creating: machineset - ${SHORT_NAME}" oc -n openshift-machine-api \ - get "${MACHINE_SET}" -o yaml | \ + get "${MACHINE_SET_WORKER}" -o yaml | \ sed '/machine/ s/-worker/-'"${INSTANCE_TYPE}"'/g - /name/ s/-worker/-'"${INSTANCE_TYPE%.*}"'/g + /^ name:/ s/cluster-.*/'"${SHORT_NAME}"'/g + /name/ s/-worker/-'"${SHORT_NAME}"'/g s/instanceType.*/instanceType: '"${INSTANCE_TYPE}"'/ + /cluster-api-autoscaler/d s/replicas.*/replicas: 0/' | \ oc apply -f - fi + + # cosmetic pretty + oc -n openshift-machine-api \ + patch "${MACHINE_SET_NAME}" \ + --type=merge --patch '{"spec":{"template":{"spec":{"metadata":{"labels":{"node-role.kubernetes.io/'"${SHORT_NAME}"'":""}}}}}}' +} + +ocp_aws_create_odf_machineset(){ + INSTANCE_TYPE=${1:-m6a.2xlarge} + SHORT_NAME=${2:-odf-infra} + + ocp_aws_clone_worker_machineset "${INSTANCE_TYPE}" "${SHORT_NAME}" + + MACHINE_SET_NAME=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${SHORT_NAME}" | head -n1) + + echo "Patching: ${MACHINE_SET_NAME}" + +cat << YAML > /tmp/patch.yaml +spec: + replicas: 3 + template: + spec: + taints: + - key: node.ocs.openshift.io/storage + value: 'true' + effect: NoSchedule + metadata: + labels: + cluster.ocs.openshift.io/openshift-storage: '' + node-role.kubernetes.io/infra: '' + providerSpec: + value: + blockDevices: + - ebs: + encrypted: true + iops: 0 + kmsKey: + arn: '' + volumeSize: 100 + volumeType: gp3 + # - deviceName: /dev/xvdb + # ebs: + # encrypted: true + # iops: 0 + # kmsKey: + # arn: '' + # volumeSize: 1000 + # volumeType: gp3 +YAML + + # patch storage + oc -n openshift-machine-api \ + patch "${MACHINE_SET_NAME}" \ + --type=merge --patch "$(cat /tmp/patch.yaml)" + } + ocp_aws_create_metal_machineset(){ # https://aws.amazon.com/ec2/instance-types/m5zn # m5.metal @@ -140,7 +201,7 @@ ocp_aws_create_metal_machineset(){ INSTANCE_TYPE=${1:-m5n.metal} - ocp_aws_clone_machineset "${INSTANCE_TYPE}" + ocp_aws_clone_worker_machineset "${INSTANCE_TYPE}" MACHINE_SET_TYPE=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${INSTANCE_TYPE%.*}" | head -n1) @@ -169,7 +230,7 @@ ocp_aws_create_gpu_machineset(){ INSTANCE_TYPE=${1:-g4dn.4xlarge} - ocp_aws_clone_machineset "${INSTANCE_TYPE}" + ocp_aws_clone_worker_machineset "${INSTANCE_TYPE}" MACHINE_SET_TYPE=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${INSTANCE_TYPE%.*}" | head -n1) @@ -229,7 +290,7 @@ YAML } ocp_aws_cluster_autoscaling(){ - oc apply -k "${GIT_ROOT}"/components/configs/autoscale/overlays/gpus + oc apply -k "${GIT_ROOT}"/components/cluster-configs/autoscale/overlays/gpus ocp_aws_create_gpu_machineset g4dn.4xlarge ocp_create_machineset_autoscale 0 3 diff --git a/scripts/lint.sh b/scripts/lint.sh index 2f4f1320..53177b35 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -4,7 +4,7 @@ set -e usage(){ echo " - usage: scripts/lint.sh + usage: $0 " } @@ -27,11 +27,6 @@ py_bin_checks(){ which pip || exit 0 } -lint_scripts(){ - which shellcheck || return - find . -name '*.sh' -not \( -path '*/venv/*' -o -path '*/scratch/*' \) -print0 | xargs -0 shellcheck -} - lint_spelling(){ which aspell || return which pyspelling || return @@ -41,6 +36,11 @@ lint_spelling(){ pyspelling -c .pyspelling.yml } +lint_scripts(){ + which shellcheck || return + find . -not \( -path '*/venv/*' -o -path '*/scratch/*' \) -name '*.sh' -print0 | xargs -0 shellcheck +} + lint_dockerfiles(){ which hadolint || return find . -not -path "./scratch/*" \( -name Dockerfile -o -name Containerfile \) -exec hadolint {} \; @@ -53,8 +53,13 @@ lint_yaml(){ } lint_kustomize(){ - [ -e scripts/validate_manifests.sh ] || return - scripts/validate_manifests.sh + [ -e scripts/validate_kustomize.sh ] || return + scripts/validate_kustomize.sh +} + +lint_helm(){ + [ -e scripts/validate_helm.sh ] || return + scripts/validate_helm.sh } py_check_venv @@ -65,3 +70,4 @@ lint_scripts || exit 1 lint_dockerfiles || exit 1 lint_yaml || exit 1 lint_kustomize || exit 1 +lint_helm || exit 1 diff --git a/scripts/reverse_tunnel/Dockerfile b/scripts/reverse_tunnel/Dockerfile index 4bfa6eb0..83b8faff 100644 --- a/scripts/reverse_tunnel/Dockerfile +++ b/scripts/reverse_tunnel/Dockerfile @@ -1,5 +1,6 @@ FROM registry.access.redhat.com/ubi9/ubi:9.4 +# hadolint ignore=DL3001 RUN dnf upgrade -y && \ dnf install -y bind-utils openssh-clients which && \ dnf clean all && \ diff --git a/scripts/sandbox_cleanup.sh b/scripts/sandbox_cleanup.sh deleted file mode 100755 index 7fb75f15..00000000 --- a/scripts/sandbox_cleanup.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# shellcheck source=/dev/null -. "$(dirname "$0")"/library/k8s.sh - -sandbox_cleanup(){ - echo "Deleting most resources in sandbox..." - echo "CTRL + C to cancel" - sleep 8 - - k8s_ns_delete_most_resources_force sandbox -} - -sandbox_cleanup diff --git a/scripts/validate_helm.sh b/scripts/validate_helm.sh new file mode 100755 index 00000000..e6db9918 --- /dev/null +++ b/scripts/validate_helm.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# shellcheck disable=SC2034,SC2044 + +HELM_DIRS="." + +which helm || return + +helm_lint_path(){ + LINT=${1} + HELM_LINT_OUTPUT=$(helm lint "${LINT}") + + cmd_response=$? + + if [ $cmd_response -ne 0 ]; then + echo "[ERROR]" + exit 1 + fi + + echo "[OK]" +} + +helm_process(){ + echo "Validating..." + + for LINT in $(find ${HELM_DIRS} -name "Chart.yaml" -exec dirname {} \;) + do + echo "${LINT}" + helm_lint_path "${LINT}" + done + + echo "Helm check passed :)" +} + +helm_process diff --git a/scripts/validate_manifests.sh b/scripts/validate_kustomize.sh similarity index 70% rename from scripts/validate_manifests.sh rename to scripts/validate_kustomize.sh index 953d029c..49b61058 100755 --- a/scripts/validate_manifests.sh +++ b/scripts/validate_kustomize.sh @@ -1,9 +1,6 @@ #!/bin/bash # shellcheck disable=SC2034,SC2044 -# DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -DIR="$(pwd)" - display_help(){ echo "./$(basename "$0") [ -d | --directory DIRECTORY ] [ -e | --enforce-all-schemas ] [ -h | --help ] [ -sl | --schema-location ] Script to validate the manifests generated by Kustomize @@ -17,10 +14,11 @@ Where: which kustomize && KUSTOMIZE_CMD="kustomize build" which helm && GOT_HELM="--enable-helm" +# DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" KUSTOMIZE_CMD="${KUSTOMIZE_CMD:-oc kustomize}" IGNORE_MISSING_SCHEMAS="--ignore-missing-schemas" -SCHEMA_LOCATION="${DIR}/openshift-json-schema" -KUSTOMIZE_DIRS="${DIR}" +SCHEMA_LOCATION="./openshift-json-schema" +KUSTOMIZE_DIRS="." init(){ for i in "${@}" @@ -63,33 +61,32 @@ kustomization_auto_fix(){ } kustomization_build(){ - BUILD=${1} - KUSTOMIZE_BUILD_OUTPUT=$(${KUSTOMIZE_CMD} "${BUILD}" "${GOT_HELM}") - # echo "$KUSTOMIZE_BUILD_OUTPUT" | kubeval ${IGNORE_MISSING_SCHEMAS} --schema-location="file://${SCHEMA_LOCATION}" --force-color + BUILD=${1} + KUSTOMIZE_BUILD_OUTPUT=$(${KUSTOMIZE_CMD} "${BUILD}" "${GOT_HELM}") + # echo "$KUSTOMIZE_BUILD_OUTPUT" | kubeval ${IGNORE_MISSING_SCHEMAS} --schema-location="file://${SCHEMA_LOCATION}" --force-color - build_response=$? + cmd_response=$? - if [ $build_response -ne 0 ]; then - echo "[ERROR]" - exit 1 - fi + if [ $cmd_response -ne 0 ]; then + echo "[ERROR]" + exit 1 + fi - echo "[OK]" + echo "[OK]" } -process_kustomization(){ - +kustomization_process(){ echo "Validating..." - for BUILD in $(find "${KUSTOMIZE_DIRS}" -name "kustomization.yaml" -exec dirname {} \;) + for LINT in $(find "${KUSTOMIZE_DIRS}" -name "kustomization.yaml" -exec dirname {} \;) do - echo "${BUILD}" - - kustomization_build "${BUILD}" - # kustomization_auto_fix "${BUILD}" - + echo "${LINT}" + kustomization_build "${LINT}" + # kustomization_auto_fix "${LINT}" done + + echo "Kustomize check passed :)" } init "${@}" -process_kustomization +kustomization_process diff --git a/scripts/wip/macros.sh b/scripts/wip/macros.sh index 7738de3e..efe0c0f0 100644 --- a/scripts/wip/macros.sh +++ b/scripts/wip/macros.sh @@ -29,5 +29,5 @@ setup_operator_pipelines(){ setup_namespaces(){ # setup namespaces - oc apply -k components/configs/cluster/namespaces/overlays/default + oc apply -k components/cluster-configs/namespaces/overlays/default } diff --git a/scripts/wip/runai.sh b/scripts/wip/runai.sh index 94930098..0fe8ea90 100644 --- a/scripts/wip/runai.sh +++ b/scripts/wip/runai.sh @@ -43,7 +43,7 @@ runai_setup_control_plane(){ runai_help - oc apply -k "${GIT_ROOT}"/components/configs/kustomized/runai-setup + oc apply -k "${GIT_ROOT}"/components/app-configs/runai-setup which helm || return 1 helm repo add runai-backend https://backend-charts.storage.googleapis.com @@ -146,5 +146,5 @@ runai_setup_cluster(){ runai_uninstall(){ helm uninstall runai-cluster -n runai - oc delete -k "${GIT_ROOT}"/components/configs/kustomized/runai-setup + oc delete -k "${GIT_ROOT}"/components/app-configs/runai-setup } diff --git a/workshop/base/kustomization.yaml b/workshop/base/kustomization.yaml index be4479e7..759185dc 100644 --- a/workshop/base/kustomization.yaml +++ b/workshop/base/kustomization.yaml @@ -3,10 +3,10 @@ kind: Kustomization resources: - ../../demos/base/rhoai -- ../../components/configs/kustomized/rhoai-config +# - ../../components/app-configs/rhoai-config -- ../../components/configs/cluster/rbac/overlays/workshop -- ../../components/configs/cluster/login/overlays/htpasswd +- ../../components/cluster-configs/rbac/overlays/workshop +- ../../components/cluster-configs/login/overlays/htpasswd - ../../demos/base/all - ../../demos/base/nvidia-gpu-autoscale diff --git a/workshop/base/link-github.yaml b/workshop/base/link-github.yaml index 8c9266a3..e962bd21 100644 --- a/workshop/base/link-github.yaml +++ b/workshop/base/link-github.yaml @@ -8,4 +8,4 @@ spec: text: GitHub - Fraud Detection applicationMenu: section: Git Repos - imageURL: /static/assets/github.svg \ No newline at end of file + imageURL: /static/assets/github.svg diff --git a/workshop/base/patch-idp.yaml b/workshop/base/patch-idp.yaml index fde4ff33..b4f791e5 100644 --- a/workshop/base/patch-idp.yaml +++ b/workshop/base/patch-idp.yaml @@ -12,4 +12,4 @@ name: htpasswd-workshop mappingMethod: claim name: Workshop Users - type: HTPasswd \ No newline at end of file + type: HTPasswd diff --git a/workshop/instance/kustomization.yaml b/workshop/instance/kustomization.yaml index 8093b76b..55498c2d 100644 --- a/workshop/instance/kustomization.yaml +++ b/workshop/instance/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - owner: workshop +labels: +- includeSelectors: false + pairs: + component: workshop namespace: user0 diff --git a/workshop/instance/ns-rb-admin.yaml b/workshop/instance/ns-rb-admin.yaml index a717d32d..e03a722d 100644 --- a/workshop/instance/ns-rb-admin.yaml +++ b/workshop/instance/ns-rb-admin.yaml @@ -55,4 +55,4 @@ roleRef: subjects: - apiGroup: rbac.authorization.k8s.io kind: Group - name: workshop-admins \ No newline at end of file + name: workshop-admins diff --git a/workshop/instance/quota.yaml b/workshop/instance/quota.yaml index dfe6063f..ae2ee6fe 100644 --- a/workshop/instance/quota.yaml +++ b/workshop/instance/quota.yaml @@ -30,4 +30,4 @@ metadata: spec: hard: # count/cronjobs.batch: '4' - count/daemonsets.apps: '0' \ No newline at end of file + count/daemonsets.apps: '0' diff --git a/workshop/wip/parasol-insurance/00-prereqs/kustomization.yaml b/workshop/wip/parasol-insurance/00-prereqs/kustomization.yaml index e577c8c5..090bf796 100644 --- a/workshop/wip/parasol-insurance/00-prereqs/kustomization.yaml +++ b/workshop/wip/parasol-insurance/00-prereqs/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization resources: - ../../../../demos/rhoai-nvidia-gpu-autoscale - - ../../../../components/configs/kustomized/rhoai-config + # - ../../../../components/app-configs/rhoai-config patches: - target: diff --git a/workshop/wip/parasol-insurance/01-setup/exclude-cm.yaml b/workshop/wip/parasol-insurance/01-setup/exclude-cm.yaml index 57745804..ec9d9d20 100644 --- a/workshop/wip/parasol-insurance/01-setup/exclude-cm.yaml +++ b/workshop/wip/parasol-insurance/01-setup/exclude-cm.yaml @@ -3,4 +3,4 @@ kind: ConfigMap apiVersion: v1 metadata: name: rook-ceph-operator-config - namespace: openshift-storage \ No newline at end of file + namespace: openshift-storage diff --git a/workshop/wip/parasol-insurance/instance/job-data-connector.yaml b/workshop/wip/parasol-insurance/instance/job-data-connector.yaml index 9aea6e2f..0bc66445 100644 --- a/workshop/wip/parasol-insurance/instance/job-data-connector.yaml +++ b/workshop/wip/parasol-insurance/instance/job-data-connector.yaml @@ -50,4 +50,4 @@ spec: name: create-ds-connections restartPolicy: Never serviceAccount: demo-setup - serviceAccountName: demo-setup \ No newline at end of file + serviceAccountName: demo-setup diff --git a/workshop/wip/parasol-insurance/instance/job-pipeline.yaml b/workshop/wip/parasol-insurance/instance/job-pipeline.yaml index 7a677e22..e977854b 100644 --- a/workshop/wip/parasol-insurance/instance/job-pipeline.yaml +++ b/workshop/wip/parasol-insurance/instance/job-pipeline.yaml @@ -48,4 +48,4 @@ spec: name: create-ds-connections restartPolicy: Never serviceAccount: demo-setup - serviceAccountName: demo-setup \ No newline at end of file + serviceAccountName: demo-setup diff --git a/workshop/wip/parasol-insurance/instance/job-rbac.yaml b/workshop/wip/parasol-insurance/instance/job-rbac.yaml index a6c34c0d..11975a27 100644 --- a/workshop/wip/parasol-insurance/instance/job-rbac.yaml +++ b/workshop/wip/parasol-insurance/instance/job-rbac.yaml @@ -29,4 +29,4 @@ subjects: roleRef: kind: ClusterRole name: route-reader - apiGroup: rbac.authorization.k8s.io \ No newline at end of file + apiGroup: rbac.authorization.k8s.io diff --git a/workshop/wip/parasol-insurance/instance/job-repo.yaml b/workshop/wip/parasol-insurance/instance/job-repo.yaml index fadeead9..840c4215 100644 --- a/workshop/wip/parasol-insurance/instance/job-repo.yaml +++ b/workshop/wip/parasol-insurance/instance/job-repo.yaml @@ -34,4 +34,4 @@ spec: - |- pod_name=$(oc get pods -l app=my-workbench -o jsonpath='{.items[0].metadata.name}') oc exec $pod_name -- git clone https://github.com/rh-aiservices-bu/parasol-insurance || true - restartPolicy: Never \ No newline at end of file + restartPolicy: Never diff --git a/workshop/wip/parasol-insurance/instance/kustomization.yaml b/workshop/wip/parasol-insurance/instance/kustomization.yaml index 65f11a45..60715687 100644 --- a/workshop/wip/parasol-insurance/instance/kustomization.yaml +++ b/workshop/wip/parasol-insurance/instance/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - owner: workshop +labels: +- includeSelectors: false + pairs: + component: workshop namespace: user0 diff --git a/workshop/wip/parasol-insurance/instance/ns-rb-admin.yaml b/workshop/wip/parasol-insurance/instance/ns-rb-admin.yaml index a717d32d..e03a722d 100644 --- a/workshop/wip/parasol-insurance/instance/ns-rb-admin.yaml +++ b/workshop/wip/parasol-insurance/instance/ns-rb-admin.yaml @@ -55,4 +55,4 @@ roleRef: subjects: - apiGroup: rbac.authorization.k8s.io kind: Group - name: workshop-admins \ No newline at end of file + name: workshop-admins diff --git a/workshop/wip/parasol-insurance/instance/quota.yaml b/workshop/wip/parasol-insurance/instance/quota.yaml index dfe6063f..ae2ee6fe 100644 --- a/workshop/wip/parasol-insurance/instance/quota.yaml +++ b/workshop/wip/parasol-insurance/instance/quota.yaml @@ -30,4 +30,4 @@ metadata: spec: hard: # count/cronjobs.batch: '4' - count/daemonsets.apps: '0' \ No newline at end of file + count/daemonsets.apps: '0' diff --git a/workshop/wip/parasol-insurance/xx-image-cache/image-puller-app/kustomization.yaml b/workshop/wip/parasol-insurance/xx-image-cache/image-puller-app/kustomization.yaml index 155d3614..94003556 100644 --- a/workshop/wip/parasol-insurance/xx-image-cache/image-puller-app/kustomization.yaml +++ b/workshop/wip/parasol-insurance/xx-image-cache/image-puller-app/kustomization.yaml @@ -4,7 +4,7 @@ kind: Kustomization namespace: image-puller resources: -- ../../../../../components/configs/kustomized/image-puller/base +- ../../../../../components/app-configs/image-puller/base patches: - target: diff --git a/workshop/wip/parasol-insurance/xx-image-cache/image-puller-pipelines/kustomization.yaml b/workshop/wip/parasol-insurance/xx-image-cache/image-puller-pipelines/kustomization.yaml index 46aefeb4..683a15cb 100644 --- a/workshop/wip/parasol-insurance/xx-image-cache/image-puller-pipelines/kustomization.yaml +++ b/workshop/wip/parasol-insurance/xx-image-cache/image-puller-pipelines/kustomization.yaml @@ -4,7 +4,7 @@ kind: Kustomization namespace: image-puller resources: -- ../../../../../components/configs/kustomized/image-puller/base +- ../../../../../components/app-configs/image-puller/base patches: - target: diff --git a/workshop/wip/parasol-insurance/xx-image-cache/image-puller-workbench/kustomization.yaml b/workshop/wip/parasol-insurance/xx-image-cache/image-puller-workbench/kustomization.yaml index dcb9e217..8c269af5 100644 --- a/workshop/wip/parasol-insurance/xx-image-cache/image-puller-workbench/kustomization.yaml +++ b/workshop/wip/parasol-insurance/xx-image-cache/image-puller-workbench/kustomization.yaml @@ -4,7 +4,7 @@ kind: Kustomization namespace: image-puller resources: -- ../../../../../components/configs/kustomized/image-puller/base +- ../../../../../components/app-configs/image-puller/base patches: - target: