Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/tools
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# DO NOT EDIT! Autogenerated by make tools

golangci-lint v1.55.2
controller-gen v0.14.0
golangci-lint v1.61.0
controller-gen v0.16.2
kustomize v4.5.2
oc v4.8.11
operator-sdk v1.34.1
opm v1.39.0
operator-sdk v1.36.1
opm v1.47.0
promq v0.0.1
crdoc v0.5.2
jsonnet v0.20.0
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
deadline: 10m
timeout: 10m

linters:
enable:
Expand Down
8 changes: 4 additions & 4 deletions Makefile.tools
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ TOOLS_DIR = $(shell pwd)/tmp/bin
# see: .github/tools-cache/action.yaml

CONTROLLER_GEN=$(TOOLS_DIR)/controller-gen
CONTROLLER_GEN_VERSION= v0.14.0
CONTROLLER_GEN_VERSION= v0.16.2

KUSTOMIZE=$(TOOLS_DIR)/kustomize
KUSTOMIZE_VERSION= v4.5.2

OPERATOR_SDK = $(TOOLS_DIR)/operator-sdk
OPERATOR_SDK_VERSION = v1.34.1
OPERATOR_SDK_VERSION = v1.36.1

OPM=$(TOOLS_DIR)/opm
OPM_VERSION = v1.39.0
OPM_VERSION = v1.47.0

GOLANGCI_LINT=$(TOOLS_DIR)/golangci-lint
GOLANGCI_LINT_VERSION = v1.55.2
GOLANGCI_LINT_VERSION = v1.61.0

## NOTE: promq does not have any releases, so we use a fake version starting with v0.0.1
# thus to upgrade/invalidate the github cache, increment the value
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=observability-operator
LABEL operators.operatorframework.io.bundle.channels.v1=development
LABEL operators.operatorframework.io.bundle.channel.default.v1=development
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.1
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.36.1
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=unknown

Expand Down
66 changes: 1 addition & 65 deletions bundle/manifests/monitoring.rhobs_monitoringstacks.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/manifests/monitoring.rhobs_thanosqueriers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
observability.openshift.io/api-support: TechPreview
creationTimestamp: null
name: thanosqueriers.monitoring.rhobs
Expand Down
113 changes: 10 additions & 103 deletions bundle/manifests/observability-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ metadata:
categories: Monitoring
certified: "false"
containerImage: observability-operator:0.4.0
createdAt: "2024-08-30T12:02:05Z"
createdAt: "2024-09-18T08:56:09Z"
description: A Go based Kubernetes operator to setup and manage highly available
Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
operators.operatorframework.io/builder: operator-sdk-v1.34.1
operators.operatorframework.io/builder: operator-sdk-v1.36.1
operators.operatorframework.io/internal-objects: |-
[
"prometheuses.monitoring.rhobs",
Expand Down Expand Up @@ -273,28 +273,10 @@ spec:
- ""
resources:
- configmaps
- endpoints
- events
- namespaces
- nodes
- persistentvolumeclaims
- persistentvolumes
- pods
- replicationcontrollers
- secrets
- serviceaccounts
- services
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- configmaps
- serviceaccounts
- services
verbs:
- create
- delete
- get
Expand All @@ -306,30 +288,21 @@ spec:
- ""
resources:
- endpoints
- events
- namespaces
- nodes
- persistentvolumeclaims
- persistentvolumes
- pods
- services
- replicationcontrollers
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- secrets
- serviceaccounts
- services
verbs:
- create
- delete
- list
- patch
- update
- watch
- apiGroups:
- apps
resources:
- daemonsets
- deployments
- replicasets
- statefulsets
verbs:
Expand All @@ -343,6 +316,7 @@ spec:
verbs:
- create
- delete
- get
- list
- patch
- update
Expand Down Expand Up @@ -384,18 +358,6 @@ spec:
- patch
- update
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
- services
verbs:
- create
- delete
- list
- patch
- update
- watch
- apiGroups:
- extensions
- networking.k8s.io
Expand All @@ -405,14 +367,6 @@ spec:
- get
- list
- watch
- apiGroups:
- loki.grafana.com
resources:
- application
- audit
- infrastructure
verbs:
- get
- apiGroups:
- loki.grafana.com
resources:
Expand Down Expand Up @@ -447,6 +401,7 @@ spec:
- alertmanagers
- prometheuses
- servicemonitors
- thanosqueriers
verbs:
- create
- delete
Expand All @@ -472,35 +427,6 @@ spec:
verbs:
- get
- update
- apiGroups:
- monitoring.rhobs
resources:
- monitoringstacks/status
verbs:
- get
- update
- apiGroups:
- monitoring.rhobs
resources:
- servicemonitors
verbs:
- create
- delete
- list
- patch
- update
- watch
- apiGroups:
- monitoring.rhobs
resources:
- thanosqueriers
verbs:
- create
- delete
- list
- patch
- update
- watch
- apiGroups:
- monitoring.rhobs
resources:
Expand Down Expand Up @@ -544,13 +470,6 @@ spec:
verbs:
- get
- update
- apiGroups:
- observability.openshift.io
resources:
- uiplugins/status
verbs:
- get
- update
- apiGroups:
- operator.openshift.io
resources:
Expand Down Expand Up @@ -587,18 +506,6 @@ spec:
- patch
- update
- watch
- apiGroups:
- rbac.authorization.k8s.io
resources:
- rolebindings
- roles
verbs:
- create
- delete
- list
- patch
- update
- watch
- apiGroups:
- security.openshift.io
resourceNames:
Expand Down
7 changes: 1 addition & 6 deletions bundle/manifests/observability.openshift.io_uiplugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.2
creationTimestamp: null
name: uiplugins.observability.openshift.io
spec:
Expand Down Expand Up @@ -49,7 +49,6 @@ spec:
description: |-
Define a label-selector for nodes which the Pods should be scheduled on.


When no selector is specified it will default to a value only selecting Linux nodes ("kubernetes.io/os=linux").
type: object
tolerations:
Expand Down Expand Up @@ -100,7 +99,6 @@ spec:
description: |-
Timeout is the maximum duration before a query timeout.


The value is expected to be a sequence of digits followed by a unit suffix, which can be 's' (seconds)
or 'm' (minutes).
pattern: ^([0-9]+)([sm]{1})$
Expand All @@ -110,7 +108,6 @@ spec:
description: |-
Logging contains configuration for the logging console plugin.


It only applies to UIPlugin Type: Logging.
properties:
logsLimit:
Expand All @@ -136,7 +133,6 @@ spec:
description: |-
Timeout is the maximum duration before a query timeout.


The value is expected to be a sequence of digits followed by an optional unit suffix, which can be 's' (seconds)
or 'm' (minutes). If the unit is omitted, it defaults to seconds.
pattern: ^([0-9]+)([sm]{0,1})$
Expand All @@ -152,7 +148,6 @@ spec:
description: |-
Timeout is the maximum duration before a query timeout.


The value is expected to be a sequence of digits followed by a unit suffix, which can be 's' (seconds)
or 'm' (minutes).
pattern: ^([0-9]+)([sm]{1})$
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ annotations:
operators.operatorframework.io.bundle.package.v1: observability-operator
operators.operatorframework.io.bundle.channels.v1: development
operators.operatorframework.io.bundle.channel.default.v1: development
operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1
operators.operatorframework.io.metrics.builder: operator-sdk-v1.36.1
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: unknown

Expand Down
Loading