Fix lint issues and add annotation in the ClusterServiceVersion

maistra · Mar 15, 2023 · 4240d75 · 4240d75
1 parent 36eb17e
commit 4240d75
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 2 deletions.
diff --git a/build/generate-manifests.sh b/build/generate-manifests.sh
@@ -26,6 +26,7 @@ if [[ ${COMMUNITY} == "true" ]]; then
  OLM_FEATURES="[]"
  ARCHITECTURE_LABELS=$(generateArchitectureLabels amd64)
  OLM_SUBSCRIPTION_ANNOTATION=""
+ OLM_CLUSTER_MONITORING=""
 else
  BUILD_TYPE="servicemesh"
  JAEGER_STORAGE="Memory"
@@ -37,6 +38,7 @@ else
  OLM_FEATURES="[\"Disconnected\"]"
  ARCHITECTURE_LABELS=$(generateArchitectureLabels amd64 s390x ppc64le)
  OLM_SUBSCRIPTION_ANNOTATION="operators.openshift.io/valid-subscription: '[\"OpenShift Container Platform\", \"OpenShift Platform Plus\"]'"
+ OLM_CLUSTER_MONITORING="operatorframework.io/cluster-monitoring: \"true\""
 fi
 : "${DEPLOYMENT_FILE:=deploy/${BUILD_TYPE}-operator.yaml}"
 : "${MANIFESTS_DIR:=manifests-${BUILD_TYPE}}"
@@ -115,6 +117,7 @@ $RELATED_IMAGES"
  sed -i -e 's+__BUG_URL__+'"$BUG_URL"'+' "${csv_path}"
  sed -i -e 's+__OLM_FEATURES__+'"$OLM_FEATURES"'+' "${csv_path}"
  sed -i -e 's+__OLM_SUBSCRIPTION_ANNOTATION__+'"$OLM_SUBSCRIPTION_ANNOTATION"'+' "${csv_path}"
+ sed -i -e 's+__OLM_CLUSTER_MONITORING__+'"$OLM_CLUSTER_MONITORING"'+' "${csv_path}"
  sed -i -e 's/__JAEGER_STORAGE__/'${JAEGER_STORAGE}'/' "${csv_path}"
  sed -i -e 's/__DATE__/'"$(date +%Y-%m-%dT%H:%M:%S%Z)"'/g' "${csv_path}"
  sed -i -e 's+__IMAGE_SRC__+'"${IMAGE_SRC}"'+g' "${csv_path}"

diff --git a/build/manifest-templates/clusterserviceversion.yaml b/build/manifest-templates/clusterserviceversion.yaml
@@ -17,6 +17,7 @@ metadata:
  createdAt: __DATE__
  support: Red Hat, Inc. 
  olm.skipRange: ">=1.0.2 <__SEMANTIC_VERSION__"
+ __OLM_CLUSTER_MONITORING__
  operators.openshift.io/infrastructure-features: '__OLM_FEATURES__'
  __OLM_SUBSCRIPTION_ANNOTATION__
  alm-examples: |-

diff --git a/deploy/maistra-operator.yaml b/deploy/maistra-operator.yaml
@@ -10377,6 +10377,7 @@ rules:
  - monitoring.coreos.com
  resources:
  - servicemonitors
+ - prometheusrules
  verbs:
  - get
  - create

diff --git a/deploy/servicemesh-operator.yaml b/deploy/servicemesh-operator.yaml
@@ -10377,6 +10377,7 @@ rules:
  - monitoring.coreos.com
  resources:
  - servicemonitors
+ - prometheusrules
  verbs:
  - get
  - create

diff --git a/manifests-maistra/2.4.0/maistraoperator.v2.4.0.clusterserviceversion.yaml b/manifests-maistra/2.4.0/maistraoperator.v2.4.0.clusterserviceversion.yaml
@@ -18,7 +18,7 @@ metadata:
  createdAt: 2022-12-19T14:03:48EST
  support: Red Hat, Inc. 
  olm.skipRange: ">=1.0.2 <2.4.0-0"
- operatorframework.io/cluster-monitoring: "true"
+
  operators.openshift.io/infrastructure-features: '[]'
 
  alm-examples: |-

diff --git a/pkg/controller/servicemesh/webhooks/hacks.go b/pkg/controller/servicemesh/webhooks/hacks.go
@@ -177,7 +177,6 @@ func createWebhookResources(ctx context.Context, mgr manager.Manager, log logr.L
  "maistra-operator-prometheusrule",
  "sum without (smcp_namespace) (servicemesh_member_count)",
  "cluster:servicemesh_member_count:sum"), metav1.CreateOptions{}); err != nil {
-
  if errors.IsAlreadyExists(err) {
  log.Info("Maistra Operator webhook PrometheusRule already exists")
  } else {