operator: Prepare community release v0.3.0 (#9216)

pull/9347/head
Periklis Tsirakidis 3 years ago committed by GitHub
parent f78ceec941
commit bd52505a7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      operator/CHANGELOG.md
  2. 4
      operator/Makefile
  3. 4
      operator/bundle/community-openshift/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
  4. 4
      operator/bundle/community-openshift/manifests/loki-operator-manager-config_v1_configmap.yaml
  5. 4
      operator/bundle/community-openshift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
  6. 4
      operator/bundle/community-openshift/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
  7. 4
      operator/bundle/community-openshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml
  8. 4
      operator/bundle/community-openshift/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml
  9. 4
      operator/bundle/community-openshift/manifests/loki-operator-webhook-service_v1_service.yaml
  10. 14
      operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml
  11. 4
      operator/bundle/community-openshift/manifests/loki.grafana.com_alertingrules.yaml
  12. 4
      operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml
  13. 4
      operator/bundle/community-openshift/manifests/loki.grafana.com_recordingrules.yaml
  14. 4
      operator/bundle/community-openshift/manifests/loki.grafana.com_rulerconfigs.yaml
  15. 4
      operator/bundle/community/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
  16. 4
      operator/bundle/community/manifests/loki-operator-manager-config_v1_configmap.yaml
  17. 4
      operator/bundle/community/manifests/loki-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
  18. 4
      operator/bundle/community/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_role.yaml
  19. 4
      operator/bundle/community/manifests/loki-operator-prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml
  20. 4
      operator/bundle/community/manifests/loki-operator-webhook-service_v1_service.yaml
  21. 14
      operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml
  22. 4
      operator/bundle/community/manifests/loki.grafana.com_alertingrules.yaml
  23. 4
      operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml
  24. 4
      operator/bundle/community/manifests/loki.grafana.com_recordingrules.yaml
  25. 4
      operator/bundle/community/manifests/loki.grafana.com_rulerconfigs.yaml
  26. 4
      operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml
  27. 4
      operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml
  28. 6
      operator/config/overlays/community-openshift/kustomization.yaml
  29. 6
      operator/config/overlays/community/kustomization.yaml
  30. 2
      operator/hack/operatorhub.sh

@ -1,10 +1,14 @@
## Main
- [9339](https://github.com/grafana/loki/pull/9339) **JoaoBraveCoding**: Add default PodAntiAffinity to Ruler
- [9329](https://github.com/grafana/loki/pull/9329) **JoaoBraveCoding**: Add default PodAntiAffinity to Ingester
- [9262](https://github.com/grafana/loki/pull/9262) **btaani**: Add PodDisruptionBudget to the Ruler
- [9260](https://github.com/grafana/loki/pull/9260) **JoaoBraveCoding**: Add PodDisruptionBudgets to the ingestion path
- [9188](https://github.com/grafana/loki/pull/9188) **aminesnow**: Add PodDisruptionBudgets to the query path
- [9162](https://github.com/grafana/loki/pull/9162) **aminesnow**: Add a PodDisruptionBudget to lokistack-gateway
# 0.3.0 (2023-04-20)
- [9049](https://github.com/grafana/loki/pull/9049) **alanconway**: Revert 1x.extra-small changes, add 1x.demo
- [8661](https://github.com/grafana/loki/pull/8661) **xuanyunhui**: Add a new Object Storage Type for AlibabaCloud OSS
- [9036](https://github.com/grafana/loki/pull/9036) **periklis**: Update Loki operand to v2.8.0

@ -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 ?= v0.2.0
VERSION ?= v0.3.0
CHANNELS ?= "alpha"
DEFAULT_CHANNEL ?= "alpha"
SUPPORTED_OCP_VERSIONS="v4.10"
@ -33,7 +33,7 @@ REGISTRY_BASE_OPENSHIFT = quay.io/openshift-logging
REGISTRY_BASE ?= $(REGISTRY_BASE_COMMUNITY)
# TODO(@periklis): Replace this image tag with VERSION once we have GH tags
MAIN_IMAGE_TAG = main-99acb9b
MAIN_IMAGE_TAG = main-ac1c1fd
# Customize for variants: community, community-openshift or openshift
VARIANT ?= community

@ -5,11 +5,11 @@ metadata:
service.beta.openshift.io/serving-cert-secret-name: loki-operator-metrics
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-controller-manager-metrics-service
spec:
ports:

@ -59,9 +59,9 @@ data:
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-manager-config

@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator
name: loki-operator-metrics-monitor
spec:

@ -3,11 +3,11 @@ kind: ClusterRole
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-metrics-reader
rules:
- nonResourceURLs:

@ -6,11 +6,11 @@ metadata:
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-prometheus
rules:
- apiGroups:

@ -6,11 +6,11 @@ metadata:
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-prometheus
roleRef:
apiGroup: rbac.authorization.k8s.io

@ -3,11 +3,11 @@ kind: Service
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-webhook-service
spec:
ports:

@ -149,7 +149,7 @@ metadata:
capabilities: Full Lifecycle
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:main-99acb9b
containerImage: docker.io/grafana/loki-operator:main-ac1c1fd
createdAt: "2023-04-26T13:24:42Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
@ -160,7 +160,7 @@ metadata:
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.arm64: supported
name: loki-operator.v0.2.0
name: loki-operator.v0.3.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -1475,11 +1475,11 @@ spec:
serviceAccountName: default
deployments:
- label:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
control-plane: controller-manager
name: loki-operator-controller-manager
spec:
@ -1513,7 +1513,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:main-99acb9b
image: docker.io/grafana/loki-operator:main-ac1c1fd
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@ -1635,8 +1635,8 @@ spec:
name: gateway
- image: quay.io/observatorium/opa-openshift:latest
name: opa
replaces: loki-operator.v0.1.0
version: 0.2.0
replaces: loki-operator.v0.2.0
version: 0.3.0
webhookdefinitions:
- admissionReviewVersions:
- v1

@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: alertingrules.loki.grafana.com
spec:
conversion:

@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: lokistacks.loki.grafana.com
spec:
conversion:

@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: recordingrules.loki.grafana.com
spec:
conversion:

@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: rulerconfigs.loki.grafana.com
spec:
conversion:

@ -3,11 +3,11 @@ kind: Service
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-controller-manager-metrics-service
spec:
ports:

@ -24,9 +24,9 @@ data:
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-manager-config

@ -3,11 +3,11 @@ kind: ClusterRole
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-metrics-reader
rules:
- nonResourceURLs:

@ -6,11 +6,11 @@ metadata:
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-prometheus
rules:
- apiGroups:

@ -6,11 +6,11 @@ metadata:
include.release.openshift.io/single-node-developer: "true"
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-prometheus
roleRef:
apiGroup: rbac.authorization.k8s.io

@ -3,11 +3,11 @@ kind: Service
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: loki-operator-webhook-service
spec:
ports:

@ -149,7 +149,7 @@ metadata:
capabilities: Full Lifecycle
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:main-99acb9b
containerImage: docker.io/grafana/loki-operator:main-ac1c1fd
createdAt: "2023-04-26T13:24:39Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
@ -160,7 +160,7 @@ metadata:
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.arm64: supported
name: loki-operator.v0.2.0
name: loki-operator.v0.3.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -1461,11 +1461,11 @@ spec:
serviceAccountName: default
deployments:
- label:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
control-plane: controller-manager
name: loki-operator-controller-manager
spec:
@ -1499,7 +1499,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:main-99acb9b
image: docker.io/grafana/loki-operator:main-ac1c1fd
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@ -1616,8 +1616,8 @@ spec:
name: gateway
- image: quay.io/observatorium/opa-openshift:latest
name: opa
replaces: loki-operator.v0.1.0
version: 0.2.0
replaces: loki-operator.v0.2.0
version: 0.3.0
webhookdefinitions:
- admissionReviewVersions:
- v1

@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: alertingrules.loki.grafana.com
spec:
conversion:

@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: lokistacks.loki.grafana.com
spec:
conversion:

@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: recordingrules.loki.grafana.com
spec:
conversion:

@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/instance: loki-operator-v0.3.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.2.0
app.kubernetes.io/version: 0.3.0
name: rulerconfigs.loki.grafana.com
spec:
conversion:

@ -6,7 +6,7 @@ metadata:
capabilities: Full Lifecycle
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:main-99acb9b
containerImage: docker.io/grafana/loki-operator:main-ac1c1fd
createdAt: "2022-12-22T13:28:40+00:00"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
@ -2062,5 +2062,5 @@ spec:
minKubeVersion: 1.21.1
provider:
name: Grafana Loki SIG Operator
replaces: loki-operator.v0.1.0
replaces: loki-operator.v0.2.0
version: 0.0.0

@ -6,7 +6,7 @@ metadata:
capabilities: Full Lifecycle
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:main-99acb9b
containerImage: docker.io/grafana/loki-operator:main-ac1c1fd
createdAt: "2022-12-22T13:28:40+00:00"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
@ -2048,5 +2048,5 @@ spec:
minKubeVersion: 1.21.1
provider:
name: Grafana Loki SIG Operator
replaces: loki-operator.v0.1.0
replaces: loki-operator.v0.2.0
version: 0.0.0

@ -11,8 +11,8 @@ labels:
app.kubernetes.io/managed-by: operator-lifecycle-manager
includeSelectors: true
- pairs:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/version: "0.2.0"
app.kubernetes.io/instance: loki-operator-v0.3.0
app.kubernetes.io/version: "0.3.0"
configMapGenerator:
- files:
@ -27,4 +27,4 @@ patchesStrategicMerge:
images:
- name: controller
newName: docker.io/grafana/loki-operator
newTag: main-99acb9b
newTag: main-ac1c1fd

@ -22,8 +22,8 @@ labels:
app.kubernetes.io/managed-by: operator-lifecycle-manager
includeSelectors: true
- pairs:
app.kubernetes.io/instance: loki-operator-v0.2.0
app.kubernetes.io/version: "0.2.0"
app.kubernetes.io/instance: loki-operator-v0.3.0
app.kubernetes.io/version: "0.3.0"
generatorOptions:
disableNameSuffixHash: true
@ -43,7 +43,7 @@ patchesStrategicMerge:
images:
- name: controller
newName: docker.io/grafana/loki-operator
newTag: main-99acb9b
newTag: main-ac1c1fd
# the following config is for teaching kustomize how to do var substitution
vars:

@ -48,7 +48,7 @@ import os, yaml
with open("./operators/loki-operator/${INT_VERSION}/metadata/annotations.yaml", 'r') as f:
y=yaml.safe_load(f) or {}
y['annotations']['com.redhat.openshift.versions'] = os.getenv('SUPPORTED_OCP_VERSIONS')
with open("./operators/loki-operator/${VERSION}/metadata/annotations.yaml", 'w') as f:
with open("./operators/loki-operator/${INT_VERSION}/metadata/annotations.yaml", 'w') as f:
yaml.dump(y, f)
END
fi

Loading…
Cancel
Save