Merge pull request #299 from securesign/disable-monitoring-by-default

Disable monitoring by default
securesign · Apr 2, 2024 · bec53c8 · bec53c8
2 parents f202ecf + 686d605
commit bec53c8
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.33.0
+OPERATOR_SDK_VERSION ?= v1.32.0
 
 # Image URL to use all building/pushing image targets
 ifdef IMAGE_TAG

diff --git a/api/v1alpha1/common.go b/api/v1alpha1/common.go
@@ -17,7 +17,7 @@ type ExternalAccess struct {
 type MonitoringConfig struct {
 	// If true, the Operator will create monitoring resources
 	//+kubebuilder:validation:XValidation:rule=(self || !oldSelf),message=Feature cannot be disabled
-	//+kubebuilder:default:=true
+	//+kubebuilder:default:=false
 	Enabled bool `json:"enabled"`
 }
 

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=rhtas-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

diff --git a/bundle/manifests/rhtas-operator.clusterserviceversion.yaml b/bundle/manifests/rhtas-operator.clusterserviceversion.yaml
@@ -110,15 +110,15 @@ metadata:
                 "enabled": true
               },
               "monitoring": {
-                "enabled": true
+                "enabled": false
               }
             },
             "rekor": {
               "externalAccess": {
                 "enabled": true
               },
               "monitoring": {
-                "enabled": true
+                "enabled": false
               }
             },
             "trillian": {
@@ -189,7 +189,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-04-02T08:05:15Z"
+    createdAt: "2024-04-02T16:39:44Z"
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: rhtas-operator.v1.0.0

diff --git a/bundle/manifests/rhtas.redhat.com_fulcios.yaml b/bundle/manifests/rhtas.redhat.com_fulcios.yaml
@@ -241,7 +241,7 @@ spec:
                 description: Enable Service monitors for fulcio
                 properties:
                   enabled:
-                    default: true
+                    default: false
                     description: If true, the Operator will create monitoring resources
                     type: boolean
                     x-kubernetes-validations:

diff --git a/bundle/manifests/rhtas.redhat.com_rekors.yaml b/bundle/manifests/rhtas.redhat.com_rekors.yaml
@@ -91,7 +91,7 @@ spec:
                 description: Enable Service monitors for rekor
                 properties:
                   enabled:
-                    default: true
+                    default: false
                     description: If true, the Operator will create monitoring resources
                     type: boolean
                     x-kubernetes-validations:

diff --git a/bundle/manifests/rhtas.redhat.com_securesigns.yaml b/bundle/manifests/rhtas.redhat.com_securesigns.yaml
@@ -347,7 +347,7 @@ spec:
                     description: Enable Service monitors for fulcio
                     properties:
                       enabled:
-                        default: true
+                        default: false
                         description: If true, the Operator will create monitoring
                           resources
                         type: boolean
@@ -419,7 +419,7 @@ spec:
                     description: Enable Service monitors for rekor
                     properties:
                       enabled:
-                        default: true
+                        default: false
                         description: If true, the Operator will create monitoring
                           resources
                         type: boolean

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -23,14 +23,3 @@ annotations:
   features.operators.openshift.io/token-auth-aws: "false"
   features.operators.openshift.io/token-auth-azure: "false"
   features.operators.openshift.io/token-auth-gcp: "false"
-
-  features.operators.openshift.io/disconnected: "false"
-  features.operators.openshift.io/fips-compliant: "false"
-  features.operators.openshift.io/proxy-aware: "false"
-  features.operators.openshift.io/cnf: "false"
-  features.operators.openshift.io/cni: "false"
-  features.operators.openshift.io/csi: "false"
-  features.operators.openshift.io/tls-profiles: "false"
-  features.operators.openshift.io/token-auth-aws: "false"
-  features.operators.openshift.io/token-auth-azure: "false"
-  features.operators.openshift.io/token-auth-gcp: "false"
diff --git a/config/crd/bases/rhtas.redhat.com_fulcios.yaml b/config/crd/bases/rhtas.redhat.com_fulcios.yaml
@@ -241,7 +241,7 @@ spec:
                 description: Enable Service monitors for fulcio
                 properties:
                   enabled:
-                    default: true
+                    default: false
                     description: If true, the Operator will create monitoring resources
                     type: boolean
                     x-kubernetes-validations:

diff --git a/config/crd/bases/rhtas.redhat.com_rekors.yaml b/config/crd/bases/rhtas.redhat.com_rekors.yaml
@@ -91,7 +91,7 @@ spec:
                 description: Enable Service monitors for rekor
                 properties:
                   enabled:
-                    default: true
+                    default: false
                     description: If true, the Operator will create monitoring resources
                     type: boolean
                     x-kubernetes-validations:

diff --git a/config/crd/bases/rhtas.redhat.com_securesigns.yaml b/config/crd/bases/rhtas.redhat.com_securesigns.yaml
@@ -347,7 +347,7 @@ spec:
                     description: Enable Service monitors for fulcio
                     properties:
                       enabled:
-                        default: true
+                        default: false
                         description: If true, the Operator will create monitoring
                           resources
                         type: boolean
@@ -419,7 +419,7 @@ spec:
                     description: Enable Service monitors for rekor
                     properties:
                       enabled:
-                        default: true
+                        default: false
                         description: If true, the Operator will create monitoring
                           resources
                         type: boolean

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -31,7 +31,7 @@ spec:
           capabilities:
             drop:
               - "ALL"
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
+        image: gcr.io/kubebuilder/kube-rbac-proxy@sha256:d4883d7c622683b3319b5e6b3a7edfbf2594c18060131a8bf64504805f875522
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"

diff --git a/config/samples/rhtas_v1alpha1_securesign.yaml b/config/samples/rhtas_v1alpha1_securesign.yaml
@@ -12,7 +12,7 @@ spec:
     externalAccess:
       enabled: true
     monitoring:
-      enabled: true
+      enabled: false
   trillian:
     database:
       create: true
@@ -30,7 +30,7 @@ spec:
       organizationEmail: jdoe@redhat.com
       commonName: fulcio.hostname
     monitoring:
-      enabled: true
+      enabled: false
   tuf:
     externalAccess:
       enabled: true