Skip to content

Commit

Permalink
Bump k8s dependencies to 1.31.0
Browse files Browse the repository at this point in the history 
Also bump controller-runtime to 0.19.0.
  • Loading branch information
@swiatekm
swiatekm committed Aug 21, 2024
1 parent 3b1eac2 commit 99d5ed2
Show file tree
Hide file tree
Showing 16 changed files with 392 additions and 111 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
CHAINSAW ?= $(LOCALBIN)/chainsaw

KUSTOMIZE_VERSION ?= v5.0.3
CONTROLLER_TOOLS_VERSION ?= v0.14.0
CONTROLLER_TOOLS_VERSION ?= v0.16.1
GOLANGCI_LINT_VERSION ?= v1.57.2
KIND_VERSION ?= v0.20.0
CHAINSAW_VERSION ?= v0.2.5
Expand Down
29 changes: 4 additions & 25 deletions bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ metadata:
categories: Logging & Tracing,Monitoring
certified: "false"
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
createdAt: "2024-08-14T11:18:29Z"
createdAt: "2024-08-21T11:36:51Z"
description: Provides the OpenTelemetry components, including the Collector
operators.operatorframework.io/builder: operator-sdk-v1.29.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down Expand Up @@ -378,6 +378,7 @@ spec:
- opentelemetry.io
resources:
- instrumentations
- opentelemetrycollectors
verbs:
- get
- list
Expand Down Expand Up @@ -406,31 +407,7 @@ spec:
- opentelemetry.io
resources:
- opampbridges/status
verbs:
- get
- patch
- update
- apiGroups:
- opentelemetry.io
resources:
- opentelemetrycollectors
verbs:
- get
- list
- patch
- update
- watch
- apiGroups:
- opentelemetry.io
resources:
- opentelemetrycollectors/finalizers
verbs:
- get
- patch
- update
- apiGroups:
- opentelemetry.io
resources:
- opentelemetrycollectors/status
verbs:
- get
Expand Down Expand Up @@ -499,6 +476,8 @@ spec:
- --zap-log-level=info
- --zap-time-encoding=rfc3339nano
- --enable-nginx-instrumentation=true
- --target-allocator-image=ghcr.io/open-telemetry/opentelemetry-operator/target-allocator:v0.107.0-9-g3b1eac22
- --operator-opamp-bridge-image=ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge:v0.107.0-9-g3b1eac22
env:
- name: SERVICE_ACCOUNT_NAME
valueFrom:
Expand Down
16 changes: 15 additions & 1 deletion bundle/community/manifests/opentelemetry.io_instrumentations.yaml
View file
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
labels:
app.kubernetes.io/name: opentelemetry-operator
Expand Down Expand Up @@ -189,6 +189,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -299,6 +301,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -478,6 +482,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -598,6 +604,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -774,6 +782,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -882,6 +892,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -1003,6 +1015,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down
21 changes: 20 additions & 1 deletion bundle/community/manifests/opentelemetry.io_opampbridges.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.1
creationTimestamp: null
labels:
app.kubernetes.io/name: opentelemetry-operator
Expand Down Expand Up @@ -679,6 +679,8 @@ spec:
type: integer
type: array
x-kubernetes-list-type: atomic
supplementalGroupsPolicy:
type: string
sysctls:
items:
properties:
Expand Down Expand Up @@ -743,6 +745,8 @@ spec:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -965,10 +969,12 @@ spec:
diskURI:
type: string
fsType:
default: ext4
type: string
kind:
type: string
readOnly:
default: false
type: boolean
required:
- diskName
Expand Down Expand Up @@ -1345,6 +1351,13 @@ spec:
required:
- path
type: object
image:
properties:
pullPolicy:
type: string
reference:
type: string
type: object
iscsi:
properties:
chapAuthDiscovery:
Expand All @@ -1358,6 +1371,7 @@ spec:
iqn:
type: string
iscsiInterface:
default: default
type: string
lun:
format: int32
Expand Down Expand Up @@ -1606,13 +1620,15 @@ spec:
image:
type: string
keyring:
default: /etc/ceph/keyring
type: string
monitors:
items:
type: string
type: array
x-kubernetes-list-type: atomic
pool:
default: rbd
type: string
readOnly:
type: boolean
Expand All @@ -1624,6 +1640,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
user:
default: admin
type: string
required:
- image
Expand All @@ -1632,6 +1649,7 @@ spec:
scaleIO:
properties:
fsType:
default: xfs
type: string
gateway:
type: string
Expand All @@ -1649,6 +1667,7 @@ spec:
sslEnabled:
type: boolean
storageMode:
default: ThinProvisioned
type: string
storagePool:
type: string
Expand Down
Loading

0 comments on commit 99d5ed2

Please sign in to comment.