Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(operator): prepare community release v0.6.0 #12246

Merged
merged 4 commits into from
Mar 21, 2024
Merged

chore(operator): prepare community release v0.6.0 #12246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa19bca
chore(operator): prepare community release v0.6.0
JoaoBraveCoding Mar 18, 2024
1e01a07
chore(operator): fix instance value
JoaoBraveCoding Mar 19, 2024
a7cd432
Merge branch 'main' into loki-operator-0.6.0
JoaoBraveCoding Mar 19, 2024
c5da01e
Merge branch 'main' into loki-operator-0.6.0
JoaoBraveCoding Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions operator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Main

## 0.6.0 (2024-03-19)

- [12228](https://github.com/grafana/loki/pull/12228) **xperimental**: Restructure LokiStack metrics
- [12164](https://github.com/grafana/loki/pull/12164) **periklis**: Use safe bearer token authentication to scrape operator metrics
- [12216](https://github.com/grafana/loki/pull/12216) **xperimental**: Fix duplicate operator metrics due to ServiceMonitor selector
Expand Down
2 changes: 1 addition & 1 deletion operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LOKI_OPERATOR_NS ?= kubernetes-operators
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.5.0
VERSION ?= 0.6.0
CHANNELS ?= "alpha"
DEFAULT_CHANNEL ?= "alpha"

Expand Down
4 changes: 2 additions & 2 deletions ...penshift/manifests/loki-operator-controller-manager-metrics-reader_v1_serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kind: ServiceAccount
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-controller-manager-metrics-reader
4 changes: 2 additions & 2 deletions ...nity-openshift/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ metadata:
creationTimestamp: null
labels:
app.kubernetes.io/component: metrics
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-controller-manager-metrics-service
spec:
ports:
Expand Down
4 changes: 2 additions & 2 deletions ...mmunity-openshift/manifests/loki-operator-controller-manager-metrics-token_v1_secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ metadata:
annotations:
kubernetes.io/service-account.name: loki-operator-controller-manager-metrics-reader
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-controller-manager-metrics-token
type: kubernetes.io/service-account-token
4 changes: 2 additions & 2 deletions ...ator-controller-manager-read-metrics_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ kind: ClusterRoleBinding
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-controller-manager-read-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
4 changes: 2 additions & 2 deletions operator/bundle/community-openshift/manifests/loki-operator-manager-config_v1_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ data:
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-manager-config
4 changes: 2 additions & 2 deletions ...hift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator
name: loki-operator-metrics-monitor
spec:
Expand Down
4 changes: 2 additions & 2 deletions ...hift/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ kind: ClusterRole
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-metrics-reader
rules:
- nonResourceURLs:
Expand Down
4 changes: 2 additions & 2 deletions ...unity-openshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ metadata:
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-prometheus
rules:
- apiGroups:
Expand Down
4 changes: 2 additions & 2 deletions ...penshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ metadata:
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-prometheus
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
4 changes: 2 additions & 2 deletions operator/bundle/community-openshift/manifests/loki-operator-webhook-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ kind: Service
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-webhook-service
spec:
ports:
Expand Down
16 changes: 8 additions & 8 deletions operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ metadata:
capabilities: Full Lifecycle
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.5.0
createdAt: "2024-03-14T13:25:52Z"
containerImage: docker.io/grafana/loki-operator:0.6.0
createdAt: "2024-03-19T14:29:49Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
features.operators.openshift.io/disconnected: "true"
Expand All @@ -167,7 +167,7 @@ metadata:
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.arm64: supported
name: loki-operator.v0.5.0
name: loki-operator.v0.6.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1681,11 +1681,11 @@ spec:
serviceAccountName: loki-operator-controller-manager
deployments:
- label:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
control-plane: controller-manager
name: loki-operator-controller-manager
spec:
Expand Down Expand Up @@ -1719,7 +1719,7 @@ spec:
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
value: quay.io/observatorium/opa-openshift:latest
image: docker.io/grafana/loki-operator:0.5.0
image: docker.io/grafana/loki-operator:0.6.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down Expand Up @@ -1844,8 +1844,8 @@ spec:
name: gateway
- image: quay.io/observatorium/opa-openshift:latest
name: opa
replaces: loki-operator.v0.4.0
version: 0.5.0
replaces: loki-operator.v0.5.0
version: 0.6.0
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
4 changes: 2 additions & 2 deletions operator/bundle/community-openshift/manifests/loki.grafana.com_alertingrules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: alertingrules.loki.grafana.com
spec:
conversion:
Expand Down
4 changes: 2 additions & 2 deletions operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: lokistacks.loki.grafana.com
spec:
conversion:
Expand Down
4 changes: 2 additions & 2 deletions operator/bundle/community-openshift/manifests/loki.grafana.com_recordingrules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: recordingrules.loki.grafana.com
spec:
conversion:
Expand Down
4 changes: 2 additions & 2 deletions operator/bundle/community-openshift/manifests/loki.grafana.com_rulerconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: rulerconfigs.loki.grafana.com
spec:
conversion:
Expand Down
4 changes: 2 additions & 2 deletions ...ommunity/manifests/loki-operator-controller-manager-metrics-reader_v1_serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kind: ServiceAccount
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-controller-manager-metrics-reader
4 changes: 2 additions & 2 deletions ...ndle/community/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ metadata:
creationTimestamp: null
labels:
app.kubernetes.io/component: metrics
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-controller-manager-metrics-service
spec:
ports:
Expand Down
4 changes: 2 additions & 2 deletions ...ator-controller-manager-read-metrics_rbac.authorization.k8s.io_v1_clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ kind: ClusterRoleBinding
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-controller-manager-read-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
4 changes: 2 additions & 2 deletions operator/bundle/community/manifests/loki-operator-manager-config_v1_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ data:
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-manager-config
4 changes: 2 additions & 2 deletions ...nity/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ kind: ClusterRole
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-metrics-reader
rules:
- nonResourceURLs:
Expand Down
4 changes: 2 additions & 2 deletions ...undle/community/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ metadata:
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-prometheus
rules:
- apiGroups:
Expand Down
4 changes: 2 additions & 2 deletions ...ommunity/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ metadata:
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-prometheus
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
4 changes: 2 additions & 2 deletions operator/bundle/community/manifests/loki-operator-webhook-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ kind: Service
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/instance: loki-operator-v0.6.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: loki-operator
app.kubernetes.io/version: 0.5.0
app.kubernetes.io/version: 0.6.0
name: loki-operator-webhook-service
spec:
ports:
Expand Down
Loading
Loading