chore: update tools (#566)

* chore: update golangci-lint * chore: update controller-gen * chore: update olm tools Signed-off-by: Simon Pasquier <[email protected]> * chore: update Go version in go.mod * chore: fix timeout parameter in .golangci.yml Signed-off-by: Simon Pasquier <[email protected]> --------- Signed-off-by: Simon Pasquier <[email protected]>
rhobs · Sep 19, 2024 · 7157d39 · 7157d39
1 parent 1fcbd08
commit 7157d39
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 458 deletions.
diff --git a/.github/tools b/.github/tools
@@ -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

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,5 +1,5 @@
 run:
-  deadline: 10m
+  timeout: 10m
 
 linters:
   enable:

diff --git a/Makefile.tools b/Makefile.tools
@@ -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

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -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
 

diff --git a/bundle/manifests/monitoring.rhobs_monitoringstacks.yaml b/bundle/manifests/monitoring.rhobs_monitoringstacks.yaml
diff --git a/bundle/manifests/monitoring.rhobs_thanosqueriers.yaml b/bundle/manifests/monitoring.rhobs_thanosqueriers.yaml
@@ -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

diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml
@@ -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",
@@ -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
@@ -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:
@@ -343,6 +316,7 @@ spec:
           verbs:
           - create
           - delete
+          - get
           - list
           - patch
           - update
@@ -384,18 +358,6 @@ spec:
           - patch
           - update
           - watch
-        - apiGroups:
-          - ""
-          resources:
-          - serviceaccounts
-          - services
-          verbs:
-          - create
-          - delete
-          - list
-          - patch
-          - update
-          - watch
         - apiGroups:
           - extensions
           - networking.k8s.io
@@ -405,14 +367,6 @@ spec:
           - get
           - list
           - watch
-        - apiGroups:
-          - loki.grafana.com
-          resources:
-          - application
-          - audit
-          - infrastructure
-          verbs:
-          - get
         - apiGroups:
           - loki.grafana.com
           resources:
@@ -447,6 +401,7 @@ spec:
           - alertmanagers
           - prometheuses
           - servicemonitors
+          - thanosqueriers
           verbs:
           - create
           - delete
@@ -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:
@@ -544,13 +470,6 @@ spec:
           verbs:
           - get
           - update
-        - apiGroups:
-          - observability.openshift.io
-          resources:
-          - uiplugins/status
-          verbs:
-          - get
-          - update
         - apiGroups:
           - operator.openshift.io
           resources:
@@ -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:

diff --git a/bundle/manifests/observability.openshift.io_uiplugins.yaml b/bundle/manifests/observability.openshift.io_uiplugins.yaml
@@ -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:
@@ -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:
@@ -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})$
@@ -110,7 +108,6 @@ spec:
                 description: |-
                   Logging contains configuration for the logging console plugin.
 
-
                   It only applies to UIPlugin Type: Logging.
                 properties:
                   logsLimit:
@@ -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})$
@@ -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})$

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -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