Merge pull request #863 from tkashem/csv-monitoring

Package API server monitoring

Author: openshift-merge-robot

cmd/olm/main.go

@@ -25,8 +25,9 @@ import (
 )
 
 const (
-	defaultWakeupInterval = 5 * time.Minute
-	defaultOperatorName   = ""
+	defaultWakeupInterval          = 5 * time.Minute
+	defaultOperatorName            = ""
+	defaultPackageServerStatusName = ""
 )
 
 // config flags defined globally so that they appear on the test binary as well
@@ -45,6 +46,9 @@ var (
 	writeStatusName = flag.String(
 		"writeStatusName", defaultOperatorName, "ClusterOperator name in which to write status, set to \"\" to disable.")
 
+	writePackageServerStatusName = flag.String(
+		"writePackageServerStatusName", defaultPackageServerStatusName, "ClusterOperator name in which to write status for package API server, set to \"\" to disable.")
+
 	debug = flag.Bool(
 		"debug", false, "use debug log level")
 
@@ -170,5 +174,18 @@ func main() {
 		operatorstatus.MonitorClusterStatus(*writeStatusName, op.AtLevel(), ctx.Done(), opClient, configClient)
 	}
 
+	if *writePackageServerStatusName != "" {
+		logger.Info("Initializing cluster operator monitor for package server")
+
+		names := *writePackageServerStatusName
+		discovery := opClient.KubernetesInterface().Discovery()
+		monitor, sender := operatorstatus.NewMonitor(names, logger, discovery, configClient)
+
+		handler := operatorstatus.NewCSVWatchNotificationHandler(logger, op.GetCSVSetGenerator(), op.GetReplaceFinder(), sender)
+		op.RegisterCSVWatchNotification(handler)
+
+		go monitor.Run(op.Done())
+	}
+
 	<-op.Done()
 }

deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml

@@ -40,6 +40,10 @@ spec:
           - -writeStatusName
           - {{ .Values.writeStatusName }}
           {{- end }}
+          {{- if .Values.writePackageServerStatusName }}
+          - -writePackageServerStatusName
+          - {{ .Values.writePackageServerStatusName }}
+          {{- end }}
           {{- if .Values.olm.tlsCertPath }}
           - -tls-cert
           - {{ .Values.olm.tlsCertPath }}

deploy/chart/templates/0000_50_olm_16-packageserver.clusterserviceversion.yaml renamed to deploy/chart/templates/0000_50_olm_15-packageserver.clusterserviceversion.yaml

@@ -16,4 +16,15 @@ status:
   versions:
     - name: operator
       version: "0.0.1-snapshot"
+{{- if .Values.writePackageServerStatusName }}
+---
+apiVersion: config.openshift.io/v1
+kind: ClusterOperator
+metadata:
+  name: {{ .Values.writePackageServerStatusName }}
+status:
+  versions:
+    - name: operator
+      version: "0.0.1-snapshot"
+{{- end }}      
 {{- end }}

deploy/chart/templates/0000_50_olm_17-packageserver.deployment.yaml renamed to deploy/chart/templates/0000_50_olm_16-packageserver.deployment.yaml

@@ -4,6 +4,10 @@ kind: ClusterServiceVersion
 metadata:
   name: packageserver.v{{ .Chart.Version }}
   namespace: {{ .Values.namespace }}
+  labels:
+    {{- if .Values.writePackageServerStatusName }}
+    olm.clusteroperator.name: {{ .Values.writePackageServerStatusName }}
+    {{- end }}
 spec:
   displayName: Package Server
   description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.

deploy/chart/templates/0000_50_olm_18-upstream-operators.catalogsource.yaml renamed to deploy/chart/templates/0000_50_olm_17-upstream-operators.catalogsource.yaml

@@ -6,6 +6,7 @@ operator_namespace: openshift-operators
 imagestream: true
 writeStatusName: operator-lifecycle-manager
 writeStatusNameCatalog: operator-lifecycle-manager-catalog
+writePackageServerStatusName: operator-lifecycle-manager-packageserver
 olm:
   replicaCount: 1
   image:

deploy/chart/templates/0000_50_olm_19-service-monitor.yaml renamed to deploy/chart/templates/0000_50_olm_18-service-monitor.yaml

@@ -5,6 +5,7 @@ catalog_namespace: olm
 operator_namespace: operators
 imagestream: false
 writeStatusName: '""'
+writePackageServerStatusName: ""
 olm:
   replicaCount: 1
   image: