diff --git a/bundle/manifests/grafana-operator-operator-metrics-service_v1_service.yaml b/bundle/manifests/grafana-operator-operator-metrics-service_v1_service.yaml index 2d31c2f5d..a1d92b034 100644 --- a/bundle/manifests/grafana-operator-operator-metrics-service_v1_service.yaml +++ b/bundle/manifests/grafana-operator-operator-metrics-service_v1_service.yaml @@ -3,7 +3,8 @@ kind: Service metadata: creationTimestamp: null labels: - control-plane: controller-manager + app.kubernetes.io/managed-by: olm + app.kubernetes.io/name: grafana-operator name: grafana-operator-operator-metrics-service spec: ports: @@ -12,6 +13,7 @@ spec: protocol: TCP targetPort: metrics selector: - control-plane: controller-manager + app.kubernetes.io/managed-by: olm + app.kubernetes.io/name: grafana-operator status: loadBalancer: {} diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index e19a36c83..1f7769fc5 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -95,7 +95,7 @@ metadata: capabilities: Basic Install categories: Monitoring containerImage: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 - createdAt: "2023-12-20T15:40:51Z" + createdAt: "2024-01-22T07:16:13Z" operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/grafana-operator @@ -304,18 +304,21 @@ spec: serviceAccountName: grafana-operator-controller-manager deployments: - label: - control-plane: controller-manager + app.kubernetes.io/managed-by: olm + app.kubernetes.io/name: grafana-operator name: grafana-operator-controller-manager spec: replicas: 1 selector: matchLabels: - control-plane: controller-manager + app.kubernetes.io/managed-by: olm + app.kubernetes.io/name: grafana-operator strategy: {} template: metadata: labels: - control-plane: controller-manager + app.kubernetes.io/managed-by: olm + app.kubernetes.io/name: grafana-operator spec: containers: - args: diff --git a/bundle/manifests/grafana.integreatly.org_grafanadatasources.yaml b/bundle/manifests/grafana.integreatly.org_grafanadatasources.yaml index 949d58a96..9cbfdd9e3 100644 --- a/bundle/manifests/grafana.integreatly.org_grafanadatasources.yaml +++ b/bundle/manifests/grafana.integreatly.org_grafanadatasources.yaml @@ -72,11 +72,6 @@ spec: type: string user: type: string - required: - - access - - name - - type - - url type: object instanceSelector: properties: diff --git a/bundle/manifests/grafana.integreatly.org_grafanas.yaml b/bundle/manifests/grafana.integreatly.org_grafanas.yaml index 1eb71f4f9..8a5b5d989 100644 --- a/bundle/manifests/grafana.integreatly.org_grafanas.yaml +++ b/bundle/manifests/grafana.integreatly.org_grafanas.yaml @@ -268,6 +268,16 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -336,6 +346,16 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -402,6 +422,16 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -470,6 +500,16 @@ spec: type: object type: object x-kubernetes-map-type: atomic + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic namespaceSelector: properties: matchExpressions: @@ -649,6 +689,14 @@ spec: required: - port type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -699,6 +747,14 @@ spec: required: - port type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -1293,6 +1349,14 @@ spec: required: - port type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -1343,6 +1407,14 @@ spec: required: - port type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -1944,6 +2016,14 @@ spec: required: - port type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -1994,6 +2074,14 @@ spec: required: - port type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -2846,18 +2934,6 @@ spec: type: object resources: properties: - claims: - items: - properties: - name: - type: string - required: - - name - type: object - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2901,6 +2977,8 @@ spec: x-kubernetes-map-type: atomic storageClassName: type: string + volumeAttributesClassName: + type: string volumeMode: type: string volumeName: @@ -3089,6 +3167,43 @@ spec: sources: items: properties: + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + x-kubernetes-map-type: atomic + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + required: + - path + type: object configMap: properties: items: diff --git a/config/default/metrics_service.yaml b/config/default/metrics_service.yaml index 68dd82e7e..4c9845875 100644 --- a/config/default/metrics_service.yaml +++ b/config/default/metrics_service.yaml @@ -2,7 +2,8 @@ apiVersion: v1 kind: Service metadata: labels: - control-plane: controller-manager + app.kubernetes.io/name: grafana-operator + app.kubernetes.io/managed-by: olm name: operator-metrics-service namespace: system spec: @@ -12,4 +13,5 @@ spec: protocol: TCP targetPort: metrics selector: - control-plane: controller-manager + app.kubernetes.io/name: grafana-operator + app.kubernetes.io/managed-by: olm diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index ed4844aab..005099c86 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -2,7 +2,8 @@ apiVersion: v1 kind: Namespace metadata: labels: - control-plane: controller-manager + app.kubernetes.io/name: grafana-operator + app.kubernetes.io/managed-by: olm name: system --- apiVersion: apps/v1 @@ -11,16 +12,19 @@ metadata: name: controller-manager namespace: system labels: - control-plane: controller-manager + app.kubernetes.io/name: grafana-operator + app.kubernetes.io/managed-by: olm spec: selector: matchLabels: - control-plane: controller-manager + app.kubernetes.io/name: grafana-operator + app.kubernetes.io/managed-by: olm replicas: 1 template: metadata: labels: - control-plane: controller-manager + app.kubernetes.io/name: grafana-operator + app.kubernetes.io/managed-by: olm spec: securityContext: runAsNonRoot: true diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index d19136ae7..a2e60628b 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -1,10 +1,10 @@ - # Prometheus Monitor Service (Metrics) apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - control-plane: controller-manager + app.kubernetes.io/name: grafana-operator + app.kubernetes.io/managed-by: olm name: controller-manager-metrics-monitor namespace: system spec: @@ -17,4 +17,5 @@ spec: insecureSkipVerify: true selector: matchLabels: - control-plane: controller-manager + app.kubernetes.io/name: grafana-operator + app.kubernetes.io/managed-by: olm diff --git a/deploy/kustomize/base/deployment.yaml b/deploy/kustomize/base/deployment.yaml index 29bbb4b25..6c1af8672 100644 --- a/deploy/kustomize/base/deployment.yaml +++ b/deploy/kustomize/base/deployment.yaml @@ -5,17 +5,17 @@ metadata: name: grafana-operator-controller-manager namespace: default labels: - app: grafana-operator-controller-manager + app.kubernetes.io/name: grafana-operator spec: replicas: 1 selector: matchLabels: - control-plane: grafana-operator-controller-manager + app.kubernetes.io/name: grafana-operator strategy: {} template: metadata: labels: - control-plane: grafana-operator-controller-manager + app.kubernetes.io/name: grafana-operator spec: containers: - args: diff --git a/deploy/kustomize/base/service.yaml b/deploy/kustomize/base/service.yaml index 765fd9a57..834911dd1 100644 --- a/deploy/kustomize/base/service.yaml +++ b/deploy/kustomize/base/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: grafana-operator-metrics-service labels: - app: grafana-operator-controller-manager + app.kubernetes.io/name: grafana-operator spec: type: ClusterIP ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: metrics selector: - control-plane: grafana-operator-controller-manager + app.kubernetes.io/name: grafana-operator