diff --git a/VERSION b/VERSION index cd23180..32786aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.17 +0.0.18 diff --git a/bundle/manifests/susql-operator.clusterserviceversion.yaml b/bundle/manifests/susql-operator.clusterserviceversion.yaml index 912e3dd..31eaefd 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.17 - createdAt: "2024-06-05T09:27:16Z" + containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.18 + createdAt: "2024-06-07T09:21:42Z" 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.17 + name: susql-operator.v0.0.18 namespace: placeholder spec: apiservicedefinitions: {} @@ -216,7 +216,7 @@ spec: value: http://0.0.0.0:8082 - name: SAMPLING-RATE value: "2" - image: quay.io/sustainable_computing_io/susql_operator:0.0.17 + image: quay.io/sustainable_computing_io/susql_operator:0.0.18 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -320,4 +320,4 @@ spec: provider: name: SusQL Operator Contributors url: https://github.com/sustainable-computing-io/susql-operator - version: 0.0.17 + version: 0.0.18 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 0070310..ce4d694 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.17 + newTag: 0.0.18 diff --git a/config/rbac/auth_proxy_role.yaml b/config/rbac/auth_proxy_role.yaml index b043d4d..86fc6af 100644 --- a/config/rbac/auth_proxy_role.yaml +++ b/config/rbac/auth_proxy_role.yaml @@ -27,6 +27,8 @@ rules: resources: - pods - pods/status + - namespaces + - namespaces/status verbs: - get - list diff --git a/internal/controller/resource_manager.go b/internal/controller/resource_manager.go index b80bea8..3a5ebf9 100644 --- a/internal/controller/resource_manager.go +++ b/internal/controller/resource_manager.go @@ -18,6 +18,7 @@ package controller import ( "context" + "fmt" "sigs.k8s.io/controller-runtime/pkg/client" @@ -28,6 +29,7 @@ import ( // Functions to get data from the cluster func (r *LabelGroupReconciler) GetPodNamesMatchingLabels(ctx context.Context, labelGroup *susqlv1.LabelGroup) ([]string, []string, error) { pods := &v1.PodList{} + r.Logger.V(5).Info(fmt.Sprintf("[GetPodNamesMatchingLabels] pods: %#v", pods)) if err := r.List(ctx, pods, client.UnsafeDisableDeepCopy, (client.MatchingLabels)(labelGroup.Status.KubernetesLabels)); err != nil { return nil, nil, err diff --git a/test/rhosaij.yaml b/test/rhosaij.yaml new file mode 100644 index 0000000..6d3dbe6 --- /dev/null +++ b/test/rhosaij.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: susql.ibm.com/v1 +kind: LabelGroup +metadata: + name: openshiftaij + namespace: rhods-notebooks +spec: + labels: + - openshiftaij +---