Skip to content

Commit 71ecf12

Browse files
notandynotandy
committed
Bump hypervisor-crd and requirement
1 parent b40e662 commit 71ecf12

File tree

4 files changed

+148
-91
lines changed

4 files changed

+148
-91
lines changed

‎charts/kvm-node-agent/crds/hypervisor-crd.yaml‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.2
5+
controller-gen.kubebuilder.io/version: v0.16.1
66
name: hypervisors.kvm.cloud.sap
77
spec:
88
group: kvm.cloud.sap
@@ -16,6 +16,21 @@ spec:
1616
scope: Cluster
1717
versions:
1818
- additionalPrinterColumns:
19+
- jsonPath: .metadata.labels.topology\.kubernetes\.io/zone
20+
name: Zone
21+
priority: 2
22+
type: string
23+
- jsonPath: .metadata.labels.kubernetes\.metal\.cloud\.sap/bb
24+
name: Building Block
25+
priority: 2
26+
type: string
27+
- jsonPath: .metadata.labels.worker\.garden\.sapcloud\.io/group
28+
name: Group
29+
priority: 2
30+
type: string
31+
- jsonPath: .status.conditions[?(@.type=="Ready")].status
32+
name: Ready
33+
type: string
1934
- jsonPath: .status.conditions[?(@.type=="Ready")].reason
2035
name: State
2136
type: string
@@ -25,6 +40,9 @@ spec:
2540
- jsonPath: .spec.highAvailability
2641
name: High Availability
2742
type: boolean
43+
- jsonPath: .spec.skipTests
44+
name: Skip Tests
45+
type: boolean
2846
- jsonPath: .status.operatingSystem.prettyVersion
2947
name: Version
3048
type: string
@@ -79,6 +97,12 @@ spec:
7997
spec:
8098
description: HypervisorSpec defines the desired state of Hypervisor
8199
properties:
100+
aggregates:
101+
default: []
102+
description: Aggregates are used to apply aggregates to the hypervisor.
103+
items:
104+
type: string
105+
type: array
82106
createCertManagerCertificate:
83107
default: false
84108
description: |-
@@ -125,6 +149,7 @@ spec:
125149
system version.
126150
type: string
127151
required:
152+
- aggregates
128153
- createCertManagerCertificate
129154
- customTraits
130155
- evacuateOnReboot
@@ -137,6 +162,11 @@ spec:
137162
status:
138163
description: HypervisorStatus defines the observed state of Hypervisor
139164
properties:
165+
aggregates:
166+
description: Aggregates are the applied aggregates of the hypervisor.
167+
items:
168+
type: string
169+
type: array
140170
capabilities:
141171
description: The capabilities of the hypervisors as reported by libvirt.
142172
properties:
@@ -245,9 +275,6 @@ spec:
245275
default: unknown
246276
description: Represents the LibVirt version.
247277
type: string
248-
node:
249-
description: Represents the Hypervisor node name.
250-
type: string
251278
numInstances:
252279
default: 0
253280
description: Represent the num of instances
@@ -296,6 +323,11 @@ spec:
296323
type: string
297324
specHash:
298325
type: string
326+
traits:
327+
description: Traits are the applied traits of the hypervisor.
328+
items:
329+
type: string
330+
type: array
299331
updateStatus:
300332
description: Represents the Hypervisor update status.
301333
properties:
@@ -317,10 +349,7 @@ spec:
317349
- retry
318350
type: object
319351
required:
320-
- libVirtVersion
321-
- node
322352
- numInstances
323-
- updateStatus
324353
type: object
325354
type: object
326355
served: true

‎config/crd/bases/kvm.cloud.sap_hypervisors.yaml‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.2
6+
controller-gen.kubebuilder.io/version: v0.16.1
77
name: hypervisors.kvm.cloud.sap
88
spec:
99
group: kvm.cloud.sap
@@ -17,6 +17,21 @@ spec:
1717
scope: Cluster
1818
versions:
1919
- additionalPrinterColumns:
20+
- jsonPath: .metadata.labels.topology\.kubernetes\.io/zone
21+
name: Zone
22+
priority: 2
23+
type: string
24+
- jsonPath: .metadata.labels.kubernetes\.metal\.cloud\.sap/bb
25+
name: Building Block
26+
priority: 2
27+
type: string
28+
- jsonPath: .metadata.labels.worker\.garden\.sapcloud\.io/group
29+
name: Group
30+
priority: 2
31+
type: string
32+
- jsonPath: .status.conditions[?(@.type=="Ready")].status
33+
name: Ready
34+
type: string
2035
- jsonPath: .status.conditions[?(@.type=="Ready")].reason
2136
name: State
2237
type: string
@@ -26,6 +41,9 @@ spec:
2641
- jsonPath: .spec.highAvailability
2742
name: High Availability
2843
type: boolean
44+
- jsonPath: .spec.skipTests
45+
name: Skip Tests
46+
type: boolean
2947
- jsonPath: .status.operatingSystem.prettyVersion
3048
name: Version
3149
type: string
@@ -80,6 +98,12 @@ spec:
8098
spec:
8199
description: HypervisorSpec defines the desired state of Hypervisor
82100
properties:
101+
aggregates:
102+
default: []
103+
description: Aggregates are used to apply aggregates to the hypervisor.
104+
items:
105+
type: string
106+
type: array
83107
createCertManagerCertificate:
84108
default: false
85109
description: |-
@@ -126,6 +150,7 @@ spec:
126150
system version.
127151
type: string
128152
required:
153+
- aggregates
129154
- createCertManagerCertificate
130155
- customTraits
131156
- evacuateOnReboot
@@ -138,6 +163,11 @@ spec:
138163
status:
139164
description: HypervisorStatus defines the observed state of Hypervisor
140165
properties:
166+
aggregates:
167+
description: Aggregates are the applied aggregates of the hypervisor.
168+
items:
169+
type: string
170+
type: array
141171
capabilities:
142172
description: The capabilities of the hypervisors as reported by libvirt.
143173
properties:
@@ -246,9 +276,6 @@ spec:
246276
default: unknown
247277
description: Represents the LibVirt version.
248278
type: string
249-
node:
250-
description: Represents the Hypervisor node name.
251-
type: string
252279
numInstances:
253280
default: 0
254281
description: Represent the num of instances
@@ -297,6 +324,11 @@ spec:
297324
type: string
298325
specHash:
299326
type: string
327+
traits:
328+
description: Traits are the applied traits of the hypervisor.
329+
items:
330+
type: string
331+
type: array
300332
updateStatus:
301333
description: Represents the Hypervisor update status.
302334
properties:
@@ -318,10 +350,7 @@ spec:
318350
- retry
319351
type: object
320352
required:
321-
- libVirtVersion
322-
- node
323353
- numInstances
324-
- updateStatus
325354
type: object
326355
type: object
327356
served: true

‎go.mod‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
// SPDX-License-Identifier: Apache-2.0
44
module github.com/cobaltcore-dev/kvm-node-agent
55

6-
go 1.24.4
6+
go 1.24.7
77

88
require (
99
github.com/cert-manager/cert-manager v1.18.2
10-
github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20250909004308-3d79e2af3424
10+
github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20250929130739-0615094e8fea
1111
github.com/coreos/go-systemd/v22 v22.5.0
1212
github.com/digitalocean/go-libvirt v0.0.0-20240916165608-bff44a349d9d
1313
github.com/godbus/dbus/v5 v5.1.0
14-
github.com/onsi/ginkgo/v2 v2.25.1
14+
github.com/onsi/ginkgo/v2 v2.25.3
1515
github.com/onsi/gomega v1.38.2
16-
k8s.io/api v0.34.0
17-
k8s.io/apimachinery v0.34.0
18-
k8s.io/client-go v0.34.0
19-
sigs.k8s.io/controller-runtime v0.21.0
16+
k8s.io/api v0.34.1
17+
k8s.io/apimachinery v0.34.1
18+
k8s.io/client-go v0.34.1
19+
sigs.k8s.io/controller-runtime v0.22.1
2020
)
2121

2222
require (
23-
cel.dev/expr v0.19.1 // indirect
23+
cel.dev/expr v0.24.0 // indirect
2424
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2525
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2626
github.com/beorn7/perks v1.0.1 // indirect
@@ -31,7 +31,7 @@ require (
3131
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3232
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3333
github.com/felixge/httpsnoop v1.0.4 // indirect
34-
github.com/fsnotify/fsnotify v1.8.0 // indirect
34+
github.com/fsnotify/fsnotify v1.9.0 // indirect
3535
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3636
github.com/go-logr/logr v1.4.3 // indirect
3737
github.com/go-logr/stdr v1.2.2 // indirect
@@ -42,12 +42,12 @@ require (
4242
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/google/btree v1.1.3 // indirect
45-
github.com/google/cel-go v0.23.2 // indirect
45+
github.com/google/cel-go v0.26.0 // indirect
4646
github.com/google/gnostic-models v0.7.0 // indirect
4747
github.com/google/go-cmp v0.7.0 // indirect
4848
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4949
github.com/google/uuid v1.6.0 // indirect
50-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
50+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
5151
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5252
github.com/josharian/intern v1.0.0 // indirect
5353
github.com/json-iterator/go v1.1.12 // indirect
@@ -61,19 +61,19 @@ require (
6161
github.com/prometheus/client_model v0.6.1 // indirect
6262
github.com/prometheus/common v0.62.0 // indirect
6363
github.com/prometheus/procfs v0.15.1 // indirect
64-
github.com/spf13/cobra v1.8.1 // indirect
64+
github.com/spf13/cobra v1.9.1 // indirect
6565
github.com/spf13/pflag v1.0.6 // indirect
6666
github.com/stoewer/go-strcase v1.3.0 // indirect
6767
github.com/x448/float16 v0.8.4 // indirect
6868
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
6969
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
70-
go.opentelemetry.io/otel v1.33.0 // indirect
71-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
72-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
73-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
74-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
75-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
76-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
70+
go.opentelemetry.io/otel v1.35.0 // indirect
71+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
72+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
73+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
74+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
75+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
76+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
7777
go.uber.org/automaxprocs v1.6.0 // indirect
7878
go.uber.org/multierr v1.11.0 // indirect
7979
go.uber.org/zap v1.27.0 // indirect
@@ -90,16 +90,16 @@ require (
9090
golang.org/x/time v0.9.0 // indirect
9191
golang.org/x/tools v0.36.0 // indirect
9292
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
93-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
94-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
95-
google.golang.org/grpc v1.69.2 // indirect
93+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
94+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
95+
google.golang.org/grpc v1.72.1 // indirect
9696
google.golang.org/protobuf v1.36.7 // indirect
9797
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9898
gopkg.in/inf.v0 v0.9.1 // indirect
9999
gopkg.in/yaml.v3 v3.0.1 // indirect
100-
k8s.io/apiextensions-apiserver v0.33.0 // indirect
101-
k8s.io/apiserver v0.33.0 // indirect
102-
k8s.io/component-base v0.33.0 // indirect
100+
k8s.io/apiextensions-apiserver v0.34.0 // indirect
101+
k8s.io/apiserver v0.34.0 // indirect
102+
k8s.io/component-base v0.34.0 // indirect
103103
k8s.io/klog/v2 v2.130.1 // indirect
104104
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
105105
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect

0 commit comments

Comments
 (0)