Remove unnecessary annotations and rbacs

Fix eventrecorder and reasoning
openshift · Dec 14, 2020 · 5d7df47 · 5d7df47
1 parent 27b1541
commit 5d7df47
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 71 deletions.
diff --git a/assets/vsphere_problem_detector/04_clusterrole.yaml b/assets/vsphere_problem_detector/04_clusterrole.yaml
@@ -50,12 +50,6 @@ rules:
   verbs:
   - list
   - watch
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - '*'
 - apiGroups:
   - ''
   resources:
@@ -73,21 +67,12 @@ rules:
   - secrets
   - services
   - endpoints
-  - events
   - configmaps
   - persistentvolumes
   verbs:
   - get
   - list
   - watch
-- apiGroups:
-  - ''
-  resources:
-  - namespaces
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - storage.k8s.io
   resources:
@@ -97,23 +82,13 @@ rules:
   - list
   - watch
 - apiGroups:
-  - '*'
+  - cloudcredential.openshift.io
   resources:
-  - events
+  - credentialsrequests
   verbs:
   - get
-  - patch
-  - create
   - list
   - watch
-  - update
-  - delete
-- apiGroups:
-  - cloudcredential.openshift.io
-  resources:
-  - credentialsrequests
-  verbs:
-  - '*'
 - apiGroups:
   - operator.openshift.io
   resources:

diff --git a/assets/vsphere_problem_detector/10_service.yaml b/assets/vsphere_problem_detector/10_service.yaml
@@ -2,8 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    include.release.openshift.io/ibm-cloud-managed: "true"
-    include.release.openshift.io/self-managed-high-availability: "true"
     service.alpha.openshift.io/serving-cert-secret-name: vsphere-problem-detector-serving-cert
   labels:
     app: vsphere-problem-detector-metrics

diff --git a/assets/vsphere_problem_detector/11_service_monitor.yaml b/assets/vsphere_problem_detector/11_service_monitor.yaml
@@ -3,9 +3,6 @@ kind: ServiceMonitor
 metadata:
   name: vsphere-problem-detector
   namespace: openshift-cluster-storage-operator
-  annotations:
-    include.release.openshift.io/ibm-cloud-managed: "true"
-    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go
diff --git a/pkg/operator/vsphereproblemdetector/monitoring.go b/pkg/operator/vsphereproblemdetector/monitoring.go
@@ -36,7 +36,7 @@ func newMonitoringController(
 		operatorClient: clients.OperatorClient,
 		kubeClient:     clients.KubeClient,
 		dynamicClient:  clients.DynamicClient,
-		eventRecorder:  eventRecorder,
+		eventRecorder:  eventRecorder.WithComponentSuffix("vsphere-monitoring-controller"),
 	}
 	return factory.New().
 		WithSync(c.sync).
@@ -45,7 +45,7 @@ func newMonitoringController(
 			clients.MonitoringInformer.Monitoring().V1().ServiceMonitors().Informer()).
 		ResyncEvery(resyncInterval).
 		WithSyncDegradedOnError(clients.OperatorClient).
-		ToController(monitoringControllerName, eventRecorder.WithComponentSuffix("vsphere-monitoring-controller"))
+		ToController(monitoringControllerName, c.eventRecorder)
 }
 
 func (c *monitoringController) sync(ctx context.Context, syncContext factory.SyncContext) error {

diff --git a/pkg/utils/deployment_controller.go b/pkg/utils/deployment_controller.go
@@ -46,7 +46,7 @@ func CreateDeployment(depOpts DeploymentOptions) (*appsv1.Deployment, error) {
 		deploymentAvailable.Status = operatorapi.ConditionTrue
 	} else {
 		deploymentAvailable.Status = operatorapi.ConditionFalse
-		deploymentAvailable.Reason = "WaitDeployment"
+		deploymentAvailable.Reason = "Deploying"
 		deploymentAvailable.Message = "Waiting for a Deployment pod to start"
 	}
 
@@ -68,14 +68,11 @@ func CreateDeployment(depOpts DeploymentOptions) (*appsv1.Deployment, error) {
 			} else {
 				msg := fmt.Sprintf("%d out of %d pods running", deployment.Status.UpdatedReplicas, *deployment.Spec.Replicas)
 				deploymentProgressing.Status = operatorapi.ConditionTrue
-				deploymentProgressing.Reason = "WaitDeployment"
+				deploymentProgressing.Reason = "Deploying"
 				deploymentProgressing.Message = msg
 			}
 		}
 	}
-
-	depOpts.OpStatus.ReadyReplicas = deployment.Status.ReadyReplicas
-
 	updateGenerationFn := func(newStatus *operatorapi.OperatorStatus) error {
 		if deployment != nil {
 			resourcemerge.SetDeploymentGeneration(&newStatus.Generations, deployment)