diff --git a/VERSION b/VERSION index d34586a..c4475d3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.25 \ No newline at end of file +0.0.26 diff --git a/bundle/manifests/susql-operator-susql-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/bundle/manifests/susql-operator-susql-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml deleted file mode 100644 index 68d62a7..0000000 --- a/bundle/manifests/susql-operator-susql-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - labels: - app.kubernetes.io/component: metrics - app.kubernetes.io/created-by: susql-operator - app.kubernetes.io/instance: susql-controller-manager-metrics-monitor - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: servicemonitor - app.kubernetes.io/part-of: susql-operator - control-plane: susql-controller-manager - name: susql-operator-susql-controller-manager-metrics-monitor -spec: - endpoints: - - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - path: /metrics - port: https - scheme: https - tlsConfig: - insecureSkipVerify: true - selector: - matchLabels: - control-plane: susql-controller-manager diff --git a/bundle/manifests/susql-operator.clusterserviceversion.yaml b/bundle/manifests/susql-operator.clusterserviceversion.yaml index d049ac3..09000ef 100644 --- a/bundle/manifests/susql-operator.clusterserviceversion.yaml +++ b/bundle/manifests/susql-operator.clusterserviceversion.yaml @@ -22,15 +22,15 @@ metadata: ] capabilities: Basic Install categories: Monitoring - containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.25 - createdAt: "2024-08-28T09:06:10Z" + containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.26 + createdAt: "2024-08-28T12:13:39Z" description: 'Aggregates energy and CO2 emission data for pods tagged with SusQL labels ' operators.operatorframework.io/builder: operator-sdk-v1.36.1 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/sustainable-computing-io/susql-operator support: https://github.com/sustainable-computing-io/susql-operator/issues - name: susql-operator.v0.0.25 + name: susql-operator.v0.0.26 namespace: placeholder spec: apiservicedefinitions: {} @@ -284,43 +284,13 @@ spec: key: CARBON-QUERY-FILTER name: susql-config optional: true - - name: CARBON-INTENSITY - valueFrom: - configMapKeyRef: - key: CARBON-INTENSITY - name: susql-config - optional: true - - name: CARBON-INTENSITY-URL - valueFrom: - configMapKeyRef: - key: CARBON-INTENSITY-URL - name: susql-config - optional: true - - name: CARBON-LOCATION - valueFrom: - configMapKeyRef: - key: CARBON-LOCATION - name: susql-config - optional: true - - name: CARBON-QUERY-RATE - valueFrom: - configMapKeyRef: - key: CARBON-QUERY-RATE - name: susql-config - optional: true - - name: CARBON-QUERY-FILTER - valueFrom: - configMapKeyRef: - key: CARBON-QUERY-FILTER - name: susql-config - optional: true - name: CARBON-QUERY-CONV-2J valueFrom: configMapKeyRef: key: CARBON-QUERY-CONV-2J name: susql-config optional: true - image: quay.io/sustainable_computing_io/susql_operator:0.0.25 + image: quay.io/sustainable_computing_io/susql_operator:0.0.26 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -423,4 +393,4 @@ spec: provider: name: SusQL Operator Contributors url: https://github.com/sustainable-computing-io/susql-operator - version: 0.0.25 \ No newline at end of file + version: 0.0.26 diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml deleted file mode 100644 index 1b93359..0000000 --- a/bundle/metadata/dependencies.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependencies: - - type: olm.package - value: - packageName: prometheus - version: "<0.66.0" diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 5b14036..76fcde3 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -24,7 +24,7 @@ resources: # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. #- ../certmanager # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. -- ../prometheus +# - ../prometheus patchesStrategicMerge: # Protect the /metrics endpoint by putting it behind auth. diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index fc8a50c..f98e5bd 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/sustainable_computing_io/susql_operator - newTag: 0.0.25 \ No newline at end of file + newTag: 0.0.26