diff --git a/VERSION b/VERSION index 236c7ad..818944f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.21 +0.0.22 diff --git a/api/v1/labelgroup_types.go b/api/v1/labelgroup_types.go index a500fb8..f785127 100644 --- a/api/v1/labelgroup_types.go +++ b/api/v1/labelgroup_types.go @@ -31,7 +31,7 @@ type LabelGroupSpec struct { // Do not use the most recent value stored in the database DisableUsingMostRecentValue bool `json:"disableUsingMostRecentValue,omitempty"` - // List of labels to be tracked for energy measurments (up to 3) + // List of labels to be tracked for energy measurments (up to 5) Labels []string `json:"labels,omitempty"` } diff --git a/bundle/manifests/susql-operator.clusterserviceversion.yaml b/bundle/manifests/susql-operator.clusterserviceversion.yaml index 04703c7..544cd77 100644 --- a/bundle/manifests/susql-operator.clusterserviceversion.yaml +++ b/bundle/manifests/susql-operator.clusterserviceversion.yaml @@ -22,14 +22,14 @@ metadata: ] capabilities: Basic Install categories: Monitoring - containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.21 - createdAt: "2024-07-02T05:17:47Z" + containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.22 + createdAt: "2024-07-09T05:01:04Z" description: 'Aggregates energy data from pods tagged with SusQL labels ' operators.operatorframework.io/builder: operator-sdk-v1.34.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.21 + name: susql-operator.v0.0.22 namespace: placeholder spec: apiservicedefinitions: {} @@ -224,7 +224,7 @@ spec: value: :8081 - name: METRICS-BIND-ADDRESS value: 127.0.0.1:9999 - image: quay.io/sustainable_computing_io/susql_operator:0.0.21 + image: quay.io/sustainable_computing_io/susql_operator:0.0.22 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -328,4 +328,4 @@ spec: provider: name: SusQL Operator Contributors url: https://github.com/sustainable-computing-io/susql-operator - version: 0.0.21 + version: 0.0.22 diff --git a/bundle/manifests/susql.ibm.com_labelgroups.yaml b/bundle/manifests/susql.ibm.com_labelgroups.yaml index 9f54c83..a367730 100644 --- a/bundle/manifests/susql.ibm.com_labelgroups.yaml +++ b/bundle/manifests/susql.ibm.com_labelgroups.yaml @@ -39,7 +39,7 @@ spec: type: boolean labels: description: List of labels to be tracked for energy measurments (up - to 3) + to 5) items: type: string type: array diff --git a/config/crd/bases/susql.ibm.com_labelgroups.yaml b/config/crd/bases/susql.ibm.com_labelgroups.yaml index d0b9775..5afc71f 100644 --- a/config/crd/bases/susql.ibm.com_labelgroups.yaml +++ b/config/crd/bases/susql.ibm.com_labelgroups.yaml @@ -39,7 +39,7 @@ spec: type: boolean labels: description: List of labels to be tracked for energy measurments (up - to 3) + to 5) items: type: string type: array diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 3a9192b..06c051c 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.21 + newTag: 0.0.22 diff --git a/internal/controller/labelgroup_controller.go b/internal/controller/labelgroup_controller.go index 326c9bb..ca01e74 100644 --- a/internal/controller/labelgroup_controller.go +++ b/internal/controller/labelgroup_controller.go @@ -52,8 +52,8 @@ const ( ) var ( - susqlKubernetesLabelNames = []string{"susql.label/1", "susql.label/2", "susql.label/3", "susql.label/4"} // Names of the SusQL Kubernetes labels - susqlPrometheusLabelNames = []string{"susql_label_1", "susql_label_2", "susql_label_3", "susql_label_4"} // Names of the SusQL Prometheus labels + susqlKubernetesLabelNames = []string{"susql.label/1", "susql.label/2", "susql.label/3", "susql.label/4", "susql.label/5", "susql.label/6"} // Names of the SusQL Kubernetes labels + susqlPrometheusLabelNames = []string{"susql_label_1", "susql_label_2", "susql_label_3", "susql_label_4", "susql_label_5", "susql_label_6"} // Names of the SusQL Prometheus labels ) //+kubebuilder:rbac:groups=susql.ibm.com,resources=labelgroups,verbs=get;list;watch;create;update;patch;delete