Merge pull request #33 from swastik959/namespace

correct namespace for compliance operator

Author: swastik959

chart/Chart.yaml

@@ -3,7 +3,7 @@ annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Rancher Compliance
   catalog.cattle.io/kube-version: '>= 1.31.0-0 < 1.34.0-0'
-  catalog.cattle.io/namespace: rancher-compliance-system
+  catalog.cattle.io/namespace: compliance-operator-system
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux,windows
   catalog.cattle.io/provides-gvr: compliance.cattle.io.clusterscans/v1

chart/README.md

@@ -5,5 +5,5 @@ The compliance-operator enables running security scans on a kubernetes cluster a
 # Installation
 
 ```
-helm install rancher-compliance ./ --create-namespace -n rancher-compliance-system
+helm install rancher-compliance ./ --create-namespace -n compliance-operator-system
 ```

chart/templates/_helpers.tpl

@@ -1,6 +1,6 @@
 {{/* Ensure namespace is set the same everywhere */}}
 {{- define "app.namespace" -}}
-  {{- .Release.Namespace | default "rancher-compliance-system" -}}
+  {{- .Release.Namespace | default "compliance-operator-system" -}}
 {{- end -}}
 
 {{- define "system_default_registry" -}}

hack/e2e

@@ -34,13 +34,13 @@ function pull_image() {
 }
 
 function dump_logs() {
-  ${KUBECTL} get pods -n rancher-compliance-system --show-labels
+  ${KUBECTL} get pods -n compliance-operator-system --show-labels
   echo "RUNNER LOGS:"
-  ${KUBECTL} logs -n rancher-compliance-system -l app.kubernetes.io/instance=security-scan-runner-k3s-e2e-scan || true
+  ${KUBECTL} logs -n compliance-operator-system -l app.kubernetes.io/instance=security-scan-runner-k3s-e2e-scan || true
   echo "SONOBUOY LOGS (rancher-kube-bench):"
-  ${KUBECTL} logs -n rancher-compliance-system -l component=sonobuoy -c rancher-kube-bench || true
+  ${KUBECTL} logs -n compliance-operator-system -l component=sonobuoy -c rancher-kube-bench || true
   echo "SONOBUOY LOGS (sonobuoy-worker):"
-  ${KUBECTL} logs -n rancher-compliance-system -l component=sonobuoy -c sonobuoy-worker || true    
+  ${KUBECTL} logs -n compliance-operator-system -l component=sonobuoy -c sonobuoy-worker || true    
 }
 
 echo "Running E2E tests"
@@ -72,7 +72,7 @@ ${KUBECTL} wait --timeout=60s --for=condition=ready -n kube-system pod -l k8s-ap
 echo "> Deploying compliance-operator"
 ${KUBECTL} apply -f ./crds
 
-${HELM} install --create-namespace --namespace rancher-compliance-system \
+${HELM} install --create-namespace --namespace compliance-operator-system \
   --set "image.operator.repository=${IMAGE%%:*}" \
   --set "image.operator.tag=${IMAGE#*:}" \
   --set "debug=true" \
@@ -82,7 +82,7 @@ echo "> Wait for compliance-operator to be ready"
 # Can't kubectl wait before the deployment schedules the pod, so
 # wait 10 seconds for that to happen first.
 sleep 10
-${KUBECTL} wait --for=condition=ready -n rancher-compliance-system pod -l compliance.cattle.io/operator=compliance-operator --timeout=30s
+${KUBECTL} wait --for=condition=ready -n compliance-operator-system pod -l compliance.cattle.io/operator=compliance-operator --timeout=30s
 
 echo "> Create ClusterScan"
 ${KUBECTL} apply -f tests/k3s-bench-test.yaml

pkg/apis/compliance.cattle.io/v1/types.go

@@ -13,7 +13,7 @@ const (
 	ClusterProviderAKS = "aks"
 	ClusterProviderK3s = "k3s"
 
-	ClusterScanNS                      = "rancher-compliance-system"
+	ClusterScanNS                      = "compliance-operator-system"
 	ClusterScanSA                      = "compliance-scan-serviceaccount"
 	ClusterScanConfigMap               = "compliance-config-cm"
 	ClusterScanPluginsConfigMap        = "compliance-plugins-cm"

tests/k3s-bench-test.yaml

@@ -2,7 +2,7 @@ apiVersion: compliance.cattle.io/v1
 kind: ClusterScan
 metadata:
   name: k3s-e2e-scan
-  namespace: rancher-compliance-system
+  namespace: compliance-operator-system
 spec:
   scanProfileName: k3s-e2e-profile
   scoreWarning: pass
@@ -11,26 +11,26 @@ apiVersion: compliance.cattle.io/v1
 kind: ClusterScanProfile
 metadata:
   name: k3s-e2e-profile
-  namespace: rancher-compliance-system
+  namespace: compliance-operator-system
 spec:
   benchmarkVersion: sample-ssb-1.0
 ---
 apiVersion: compliance.cattle.io/v1
 kind: ClusterScanBenchmark
 metadata:
   name: sample-ssb-1.0
-  namespace: rancher-compliance-system
+  namespace: compliance-operator-system
 spec:
   customBenchmarkConfigMapName: sample-ssb-1.0
-  customBenchmarkConfigMapNamespace: rancher-compliance-system
+  customBenchmarkConfigMapNamespace: compliance-operator-system
   minKubernetesVersion: '1.30.0'
   maxKubernetesVersion: '1.36.0'
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sample-ssb-1.0
-  namespace: rancher-compliance-system
+  namespace: compliance-operator-system
 data:
   config.yaml: |
     ## Version-specific settings that override the values in cfg/config.yaml