Bumping Prometheus Operator version

build/kube_setup.sh

@@ -154,7 +154,7 @@ function install_cert_manager {
 }
 
 function install_prometheus_operator {
-    PROM_VERSION=0.47.0
+    PROM_VERSION=0.56.3
     PROM_OPERATOR_NS=default
     PROM_TARFILE="prometheus-operator-${PROM_VERSION}.tar.gz"
 
@@ -179,7 +179,7 @@ function install_prometheus_operator {
 
     echo "*** Applying prometheus operator manifest ..."
     cd prometheus-operator-${PROM_VERSION}
-    ${KUBECTL_CMD} apply -f bundle.yaml
+    ${KUBECTL_CMD} create -f bundle.yaml --validate=false
 
     echo "*** Will wait for Prometheus operator to come up in background"
     ${KUBECTL_CMD} rollout status deployment/prometheus-operator -n $PROM_OPERATOR_NS | sed "s/^/[prometheus] /" &

controllers/cloud.redhat.com/providers/metrics/operator.go

@@ -182,7 +182,7 @@ func createSubscription(cache *rc.ObjectCache, env *crd.ClowdEnvironment) error
 		Name:                "prometheus",
 		Source:              "community-operators",
 		SourceNamespace:     "openshift-marketplace",
-		StartingCSV:         utils.StringPtr("prometheusoperator.0.47.0"),
+		StartingCSV:         utils.StringPtr("prometheusoperator.0.56.3"),
 	}
 
 	return cache.Update(PrometheusSubscription, subObj)

docs/antora/modules/ROOT/pages/api_reference.adoc

@@ -132,7 +132,7 @@ AutoScalerConfig configures the Clowder provider controlling the creation of Aut
 [cols="25a,75a", options="header"]
 |===
 | Field | Description
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-autoscalermode[$$AutoScalerMode$$]__ | Enable the autoscaler feature
+| *`mode`* __AutoScalerMode__ | Enable the autoscaler feature
 |===
 
 
@@ -433,7 +433,7 @@ DatabaseConfig configures the Clowder provider controlling the creation of Datab
 [cols="25a,75a", options="header"]
 |===
 | Field | Description
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-databasemode[$$DatabaseMode$$]__ | The mode of operation of the Clowder Database Provider. Valid options are: (*_app-interface_*) where the provider will pass through database credentials found in the secret defined by the database name in the ClowdApp, and (*_local_*) where the provider will spin up a local instance of the database.
+| *`mode`* __DatabaseMode__ | The mode of operation of the Clowder Database Provider. Valid options are: (*_app-interface_*) where the provider will pass through database credentials found in the secret defined by the database name in the ClowdApp, and (*_local_*) where the provider will spin up a local instance of the database.
 | *`caBundleURL`* __string__ | Indicates where Clowder will fetch the database CA certificate bundle from. Currently only used in (*_app-interface_*) mode. If none is specified, the AWS RDS combined CA bundle is used.
 | *`pvc`* __boolean__ | If using the (*_local_*) mode and PVC is set to true, this instructs the local Database instance to use a PVC instead of emptyDir for its volumes.
 |===
@@ -494,10 +494,10 @@ Deployment defines a service running inside a ClowdApp and will output a deploym
 | *`name`* __string__ | Name defines the identifier of a Pod inside the ClowdApp. This name will be used along side the name of the ClowdApp itself to form a <app>-<pod> pattern which will be used for all other created resources and also for some labels. It must be unique within a ClowdApp.
 | *`minReplicas`* __integer__ | Deprecated: Use Replicas instead If Replicas is not set and MinReplicas is set, then MinReplicas will be used
 | *`replicas`* __integer__ | Defines the desired replica count for the pod
-| *`web`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-webdeprecated[$$WebDeprecated$$]__ | If set to true, creates a service on the webPort defined in the ClowdEnvironment resource, along with the relevant liveness and readiness probes.
+| *`web`* __WebDeprecated__ | If set to true, creates a service on the webPort defined in the ClowdEnvironment resource, along with the relevant liveness and readiness probes.
 | *`webServices`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-webservices[$$WebServices$$]__ | 
 | *`podSpec`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-podspec[$$PodSpec$$]__ | PodSpec defines a container running inside a ClowdApp.
-| *`k8sAccessLevel`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-k8saccesslevel[$$K8sAccessLevel$$]__ | K8sAccessLevel defines the level of access for this deployment
+| *`k8sAccessLevel`* __K8sAccessLevel__ | K8sAccessLevel defines the level of access for this deployment
 | *`autoScaler`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-autoscaler[$$AutoScaler$$]__ | AutoScaler defines the configuration for the Keda auto scaler
 | *`autoScalerSimple`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-autoscalersimple[$$AutoScalerSimple$$]__ | 
 | *`deploymentStrategy`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-deploymentstrategy[$$DeploymentStrategy$$]__ | DeploymentStrategy allows the deployment strategy to be set only if the deployment has no public service enabled
@@ -621,7 +621,7 @@ FeatureFlagsConfig configures the Clowder provider controlling the creation of F
 [cols="25a,75a", options="header"]
 |===
 | Field | Description
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-featureflagsmode[$$FeatureFlagsMode$$]__ | The mode of operation of the Clowder FeatureFlag Provider. Valid options are: (*_app-interface_*) where the provider will pass through credentials to the app configuration, and (*_local_*) where a local Unleash instance will be created.
+| *`mode`* __FeatureFlagsMode__ | The mode of operation of the Clowder FeatureFlag Provider. Valid options are: (*_app-interface_*) where the provider will pass through credentials to the app configuration, and (*_local_*) where a local Unleash instance will be created.
 | *`pvc`* __boolean__ | If using the (*_local_*) mode and PVC is set to true, this instructs the local Database instance to use a PVC instead of emptyDir for its volumes.
 | *`credentialRef`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-namespacedname[$$NamespacedName$$]__ | Defines the secret containing the client access token, only used for (*_app-interface_*) mode.
 | *`hostname`* __string__ | Defines the hostname for (*_app-interface_*) mode
@@ -694,7 +694,7 @@ InMemoryDBConfig configures the Clowder provider controlling the creation of InM
 [cols="25a,75a", options="header"]
 |===
 | Field | Description
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-inmemorymode[$$InMemoryMode$$]__ | The mode of operation of the Clowder InMemory Provider. Valid options are: (*_redis_*) where a local Minio instance will be created, and (*_elasticache_*) which will search the namespace of the ClowdApp for a secret called 'elasticache'
+| *`mode`* __InMemoryMode__ | The mode of operation of the Clowder InMemory Provider. Valid options are: (*_redis_*) where a local Minio instance will be created, and (*_elasticache_*) which will search the namespace of the ClowdApp for a secret called 'elasticache'
 | *`pvc`* __boolean__ | If using the (*_local_*) mode and PVC is set to true, this instructs the local Database instance to use a PVC instead of emptyDir for its volumes.
 |===
 
@@ -995,7 +995,7 @@ KafkaConfig configures the Clowder provider controlling the creation of Kafka in
 [cols="25a,75a", options="header"]
 |===
 | Field | Description
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-kafkamode[$$KafkaMode$$]__ | The mode of operation of the Clowder Kafka Provider. Valid options are: (*_operator_*) which provisions Strimzi resources and will configure KafkaTopic CRs and place them in the Kafka cluster's namespace described in the configuration, (*_app-interface_*) which simply passes the topic names through to the App's cdappconfig.json and expects app-interface to have created the relevant topics, and (*_local_*) where a small instance of Kafka is created in the desired cluster namespace and configured to auto-create topics.
+| *`mode`* __KafkaMode__ | The mode of operation of the Clowder Kafka Provider. Valid options are: (*_operator_*) which provisions Strimzi resources and will configure KafkaTopic CRs and place them in the Kafka cluster's namespace described in the configuration, (*_app-interface_*) which simply passes the topic names through to the App's cdappconfig.json and expects app-interface to have created the relevant topics, and (*_local_*) where a small instance of Kafka is created in the desired cluster namespace and configured to auto-create topics.
 | *`enableLegacyStrimzi`* __boolean__ | EnableLegacyStrimzi disables TLS + user auth
 | *`pvc`* __boolean__ | If using the (*_local_*) or (*_operator_*) mode and PVC is set to true, this sets the provisioned Kafka instance to use a PVC instead of emptyDir for its volumes.
 | *`cluster`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-kafkaclusterconfig[$$KafkaClusterConfig$$]__ | Defines options related to the Kafka cluster for this environment. Ignored for (*_local_*) mode.
@@ -1088,7 +1088,7 @@ LoggingConfig configures the Clowder provider controlling the creation of Loggin
 [cols="25a,75a", options="header"]
 |===
 | Field | Description
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-loggingmode[$$LoggingMode$$]__ | The mode of operation of the Clowder Logging Provider. Valid options are: (*_app-interface_*) where the provider will pass through cloudwatch credentials to the app configuration, and (*_none_*) where no logging will be configured.
+| *`mode`* __LoggingMode__ | The mode of operation of the Clowder Logging Provider. Valid options are: (*_app-interface_*) where the provider will pass through cloudwatch credentials to the app configuration, and (*_none_*) where no logging will be configured.
 |===
 
 
@@ -1123,7 +1123,7 @@ MetricsConfig configures the Clowder provider controlling the creation of metric
 | Field | Description
 | *`port`* __integer__ | The port that metrics services inside ClowdApp pods should be served on.
 | *`path`* __string__ | A prefix path that pods will be instructed to use when setting up their metrics server.
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-metricsmode[$$MetricsMode$$]__ | The mode of operation of the Metrics provider. The allowed modes are (*_none_*), which disables metrics service generation, or (*_operator_*) where services and probes are generated. (*_app-interface_*) where services and probes are generated for app-interface.
+| *`mode`* __MetricsMode__ | The mode of operation of the Metrics provider. The allowed modes are  (*_none_*), which disables metrics service generation, or (*_operator_*) where services and probes are generated. (*_app-interface_*) where services and probes are generated for app-interface.
 | *`prometheus`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-prometheusconfig[$$PrometheusConfig$$]__ | Prometheus specific configuration
 |===
 
@@ -1196,7 +1196,7 @@ ObjectStoreConfig configures the Clowder provider controlling the creation of Ob
 [cols="25a,75a", options="header"]
 |===
 | Field | Description
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-objectstoremode[$$ObjectStoreMode$$]__ | The mode of operation of the Clowder ObjectStore Provider. Valid options are: (*_app-interface_*) where the provider will pass through Amazon S3 credentials to the app configuration, and (*_minio_*) where a local Minio instance will be created.
+| *`mode`* __ObjectStoreMode__ | The mode of operation of the Clowder ObjectStore Provider. Valid options are: (*_app-interface_*) where the provider will pass through Amazon S3 credentials to the app configuration, and (*_minio_*) where a local Minio instance will be created.
 | *`suffix`* __string__ | Currently unused.
 | *`pvc`* __boolean__ | If using the (*_local_*) mode and PVC is set to true, this instructs the local Database instance to use a PVC instead of emptyDir for its volumes.
 |===
@@ -1286,7 +1286,7 @@ PrivateWebService is the definition of the private web service. There can be onl
 |===
 | Field | Description
 | *`enabled`* __boolean__ | Enabled describes if Clowder should enable the private service and provide the configuration in the cdappconfig.
-| *`appProtocol`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-appprotocol[$$AppProtocol$$]__ | AppProtocol determines the protocol to be used for the private port, (defaults to http)
+| *`appProtocol`* __AppProtocol__ | AppProtocol determines the protocol to be used for the private port, (defaults to http)
 |===
 
 
@@ -1417,7 +1417,7 @@ ServiceMeshConfig determines if this env should be part of a service mesh and, i
 [cols="25a,75a", options="header"]
 |===
 | Field | Description
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-servicemeshmode[$$ServiceMeshMode$$]__ | 
+| *`mode`* __ServiceMeshMode__ | 
 |===
 
 
@@ -1551,8 +1551,8 @@ SimpleAutoScalerReplicas defines the minimum and maximum replica counts for the
 |===
 | Field | Description
 | *`iqe`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-iqeconfig[$$IqeConfig$$]__ | Defines the environment for iqe/smoke testing
-| *`k8sAccessLevel`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-k8saccesslevel[$$K8sAccessLevel$$]__ | The mode of operation of the testing Pod. Valid options are: 'default', 'view' or 'edit'
-| *`configAccess`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-configaccessmode[$$ConfigAccessMode$$]__ | The mode of operation for access to outside app configs. Valid options are: (*_none_*) -- no app config is mounted to the pod (*_app_*) -- only the ClowdApp's config is mounted to the pod (*_environment_*) -- the config for all apps in the env are mounted
+| *`k8sAccessLevel`* __K8sAccessLevel__ | The mode of operation of the testing Pod. Valid options are: 'default', 'view' or 'edit'
+| *`configAccess`* __ConfigAccessMode__ | The mode of operation for access to outside app configs. Valid options are: (*_none_*) -- no app config is mounted to the pod (*_app_*) -- only the ClowdApp's config is mounted to the pod (*_environment_*) -- the config for all apps in the env are mounted
 |===
 
 
@@ -1613,7 +1613,7 @@ WebConfig configures the Clowder provider controlling the creation of web servic
 | *`privatePort`* __integer__ | The private port that web services inside a ClowdApp should be served on.
 | *`aiuthPort`* __integer__ | The auth port that the web local mode will use with the AuthSidecar
 | *`apiPrefix`* __string__ | An api prefix path that pods will be instructed to use when setting up their web server.
-| *`mode`* __xref:{anchor_prefix}-github-com-redhatinsights-clowder-apis-cloud-redhat-com-v1alpha1-webmode[$$WebMode$$]__ | The mode of operation of the Web provider. The allowed modes are (*_none_*/*_operator_*), and (*_local_*) which deploys keycloak and BOP.
+| *`mode`* __WebMode__ | The mode of operation of the Web provider. The allowed modes are (*_none_*/*_operator_*), and (*_local_*) which deploys keycloak and BOP.
 | *`bopURL`* __string__ | The URL of BOP - only used in (*_none_*/*_operator_*) mode.
 | *`ingressClass`* __string__ | Ingress Class Name used only in (*_local_*) mode.
 | *`keycloakVersion`* __string__ | Optional keycloak version override -- used only in (*_local_*) mode -- if not set, a hard-coded default is used.

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/minio/minio-go/v7 v7.0.43
 	github.com/onsi/ginkgo/v2 v2.13.0
 	github.com/onsi/gomega v1.29.0
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.58.0
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.56.3
 	github.com/prometheus/client_golang v1.15.1
 	github.com/stretchr/testify v1.8.3
 	go.uber.org/zap v1.24.0
@@ -62,7 +62,8 @@ require (
 	github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-kit/kit v0.10.0 // indirect
+	github.com/go-kit/kit v0.13.0 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
@@ -175,9 +176,9 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	howett.net/plist v1.0.0 // indirect
 	k8s.io/component-base v0.26.4 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
+	k8s.io/klog/v2 v2.90.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
-	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
+	k8s.io/utils v0.0.0-20230202215443-34013725500c // indirect
 	knative.dev/pkg v0.0.0-20220826162920-93b66e6a8700 // indirect
 	sigs.k8s.io/gateway-api v0.6.0 // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect