diff --git a/dp-terraform/helm/rhacs-terraform/Chart.lock b/dp-terraform/helm/rhacs-terraform/Chart.lock index fc11a0e6c9..caccac0139 100644 --- a/dp-terraform/helm/rhacs-terraform/Chart.lock +++ b/dp-terraform/helm/rhacs-terraform/Chart.lock @@ -20,8 +20,5 @@ dependencies: - name: vertical-pod-autoscaler repository: "" version: 0.1.0 -- name: compliance-operator - repository: "" - version: 0.1.0 -digest: sha256:324d9c58d59b0f51e3d547e8825c9bb8415f90d47b5e75ef90d76e844d41a772 -generated: "2024-06-12T12:15:47.378422393+02:00" +digest: sha256:d935785f613711e133ef1b0e340d5ac480f54b31c586f94abdda4955593c936a +generated: "2024-06-17T16:30:27.282273206+02:00" diff --git a/dp-terraform/helm/rhacs-terraform/Chart.yaml b/dp-terraform/helm/rhacs-terraform/Chart.yaml index 7f8934250c..d8f3813bb1 100644 --- a/dp-terraform/helm/rhacs-terraform/Chart.yaml +++ b/dp-terraform/helm/rhacs-terraform/Chart.yaml @@ -46,6 +46,3 @@ dependencies: - name: vertical-pod-autoscaler version: "0.1.0" condition: verticalPodAutoscaler.enabled - - name: compliance-operator - version: "0.1.0" - condition: complianceOperator.enabled diff --git a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/.helmignore b/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/Chart.yaml b/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/Chart.yaml deleted file mode 100644 index 5397ccc5ee..0000000000 --- a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: compliance-operator -description: "Chart to install compliance operator" -type: application -version: "0.1.0" -appVersion: "0.1.0" diff --git a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/README.md b/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/README.md deleted file mode 100644 index c730169b5d..0000000000 --- a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Compliance Operator - -Compliance Operator is used to run compliance checks, e.g. NIST or CIS we use it in ACSCS -for testing purposes in our dogfooding instances. -Starting at version 1.5.0 the operator is upgraded automatically. -If the operator breaks it can easily be uninstalled / paused by disabling the flag without production impact. - -Value to disable the operator: - -``` -complianceOperator: - enabled: false -``` diff --git a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/01-namespace.yaml b/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/01-namespace.yaml deleted file mode 100644 index beed3860fc..0000000000 --- a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/01-namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-compliance diff --git a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/02-subscription.yaml b/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/02-subscription.yaml deleted file mode 100644 index ed935f3a4c..0000000000 --- a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/02-subscription.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: compliance-operator - namespace: openshift-compliance -spec: - channel: stable - installPlanApproval: Automatic - name: compliance-operator - source: redhat-operators - sourceNamespace: openshift-marketplace - startingCSV: compliance-operator.v1.5.0 diff --git a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/03-operator-group.yaml b/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/03-operator-group.yaml deleted file mode 100644 index a1aebcc202..0000000000 --- a/dp-terraform/helm/rhacs-terraform/charts/compliance-operator/templates/03-operator-group.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: compliance-operator - namespace: openshift-compliance -spec: - targetNamespaces: - - openshift-compliance - upgradeStrategy: Default diff --git a/dp-terraform/helm/rhacs-terraform/values.yaml b/dp-terraform/helm/rhacs-terraform/values.yaml index 9f40c742fd..74a3fc96f4 100644 --- a/dp-terraform/helm/rhacs-terraform/values.yaml +++ b/dp-terraform/helm/rhacs-terraform/values.yaml @@ -275,9 +275,6 @@ secretStore: verticalPodAutoscaler: enabled: true -complianceOperator: - enabled: false - global: secretStore: aws: