Skip to content

Commit

Permalink
Merge pull request #176 from periklis/fix-openshift-bundle-manifest-l…
Browse files Browse the repository at this point in the history
…abels

[release-5.7] Fix openshift bundle manifest labels
  • Loading branch information
periklis authored Aug 2, 2023
2 parents 5792483 + c086fd1 commit e439c94
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:main-99acb9b
createdAt: "2023-07-24T12:33:56Z"
createdAt: "2023-08-02T08:03:04Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:main-99acb9b
createdAt: "2023-07-24T12:33:54Z"
createdAt: "2023-08-02T08:03:02Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: loki-operator-controller-manager-metrics-service
spec:
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ data:
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: loki-operator-v0.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: loki-operator-manager-config
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.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: loki-operator
name: loki-operator-metrics-monitor
spec:
Expand Down
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.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: loki-operator-metrics-reader
rules:
- nonResourceURLs:
Expand Down
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.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: loki-operator-prometheus
rules:
- apiGroups:
Expand Down
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.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: loki-operator-prometheus
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
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.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: loki-operator-webhook-service
spec:
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: quay.io/openshift-logging/loki-operator:v0.1.0
createdAt: "2023-07-24T12:33:58Z"
createdAt: "2023-08-02T08:03:06Z"
description: |
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
## Prerequisites and Requirements
Expand Down Expand Up @@ -1482,11 +1482,11 @@ spec:
serviceAccountName: default
deployments:
- label:
app.kubernetes.io/instance: loki-operator-v0.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
control-plane: controller-manager
name: loki-operator-controller-manager
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: alertingrules.loki.grafana.com
spec:
conversion:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: lokistacks.loki.grafana.com
spec:
conversion:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: recordingrules.loki.grafana.com
spec:
conversion:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
labels:
app.kubernetes.io/instance: loki-operator-v0.0.1
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
app.kubernetes.io/part-of: cluster-logging
app.kubernetes.io/version: 0.0.1
app.kubernetes.io/version: 0.1.0
name: rulerconfigs.loki.grafana.com
spec:
conversion:
Expand Down
6 changes: 3 additions & 3 deletions operator/config/overlays/openshift/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ labels:
app.kubernetes.io/managed-by: operator-lifecycle-manager
includeSelectors: true
- pairs:
app.kubernetes.io/instance: loki-operator-v0.0.1
app.kubernetes.io/version: "0.0.1"
app.kubernetes.io/instance: loki-operator-v0.1.0
app.kubernetes.io/version: "0.1.0"

generatorOptions:
disableNameSuffixHash: true
Expand All @@ -44,4 +44,4 @@ patchesStrategicMerge:
images:
- name: controller
newName: quay.io/openshift-logging/loki-operator
newTag: v0.0.1
newTag: v0.1.0

0 comments on commit e439c94

Please sign in to comment.