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

Bump k8s and tools #553

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bump k8s and tools #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dbcd64
build(deps): bump k8s.io/* from 0.30.3 to 0.31.0
jan--f Aug 15, 2024
87d0389
build(deps): bump tool versions and regenerate
jan--f Aug 15, 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
6 changes: 3 additions & 3 deletions .github/tools
View file
Open in desktop
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
kustomize v4.5.2
controller-gen v0.16.1
kustomize v5.4.3
oc v4.8.11
operator-sdk v1.34.1
opm v1.39.0
opm v1.45.0
promq v0.0.1
crdoc v0.5.2
jsonnet v0.20.0
Expand Down
12 changes: 6 additions & 6 deletions Makefile.tools
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ 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.1

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

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

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

GOLANGCI_LINT=$(TOOLS_DIR)/golangci-lint
GOLANGCI_LINT_VERSION = v1.55.2
Expand Down Expand Up @@ -78,7 +78,7 @@ $(KUSTOMIZE) kustomize: $(TOOLS_DIR)
@{ \
set -ex ;\
[[ -f $(KUSTOMIZE) ]] && exit 0 ;\
GOBIN=$(TOOLS_DIR) go install sigs.k8s.io/kustomize/kustomize/v4@$(KUSTOMIZE_VERSION) ;\
GOBIN=$(TOOLS_DIR) go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION) ;\
}

.PHONY: operator-sdk
Expand Down Expand Up @@ -128,9 +128,9 @@ $(OC) oc: $(TOOLS_DIR)
curl -sSLo $(OC) https://mirror.openshift.com/pub/openshift-v4/$${ARCH}/clients/oc/latest/$${OS}/oc.tar.gz ;\
tar -xf $(TOOLS_DIR)/oc -C $(TOOLS_DIR) ;\
rm -f $(TOOLS_DIR)/README.md ;\
$(OC) version ;\
$(OC) version || true;\
version=$(OC_VERSION) ;\
$(OC) version | grep -q $${version##v} ;\
$(OC) version | grep -q $${version##v} || true ;\
}

.PHONY: crdoc
Expand Down
74 changes: 8 additions & 66 deletions bundle/manifests/monitoring.rhobs_monitoringstacks.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/manifests/monitoring.rhobs_thanosqueriers.yaml
View file
Open in desktop
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.1
creationTimestamp: null
name: thanosqueriers.monitoring.rhobs
spec:
Expand Down
99 changes: 9 additions & 90 deletions bundle/manifests/observability-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ metadata:
categories: Monitoring
certified: "false"
containerImage: observability-operator:0.3.5
createdAt: "2024-08-09T13:29:41Z"
createdAt: "2024-08-15T07:48:07Z"
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
Expand Down Expand Up @@ -271,28 +271,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 @@ -304,30 +286,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 @@ -341,6 +314,7 @@ spec:
verbs:
- create
- delete
- get
- list
- patch
- update
Expand Down Expand Up @@ -403,14 +377,6 @@ spec:
- get
- list
- watch
- apiGroups:
- loki.grafana.com
resources:
- application
- audit
- infrastructure
verbs:
- get
- apiGroups:
- loki.grafana.com
resources:
Expand Down Expand Up @@ -445,6 +411,7 @@ spec:
- alertmanagers
- prometheuses
- servicemonitors
- thanosqueriers
verbs:
- create
- delete
Expand All @@ -470,35 +437,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 @@ -542,13 +480,6 @@ spec:
verbs:
- get
- update
- apiGroups:
- observability.openshift.io
resources:
- uiplugins/status
verbs:
- get
- update
- apiGroups:
- operator.openshift.io
resources:
Expand Down Expand Up @@ -585,18 +516,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
View file
Open in desktop
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.1
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
Loading
Loading