Skip to content

Commit cd946b2

Browse files
notandynotandy
authored
Merge pull request #38 from cobaltcore-dev/add-commit-sha
Add additional Garden Linux details to the status
2 parents ea18efd + 1701c36 commit cd946b2

6 files changed

Lines changed: 248 additions & 214 deletions

File tree

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

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
---
12
apiVersion: apiextensions.k8s.io/v1
23
kind: CustomResourceDefinition
34
metadata:
45
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
67
name: hypervisors.kvm.cloud.sap
78
spec:
89
group: kvm.cloud.sap
@@ -34,6 +35,9 @@ spec:
3435
- jsonPath: .status.conditions[?(@.type=="Ready")].reason
3536
name: State
3637
type: string
38+
- jsonPath: .status.conditions[?(@.type=="Tainted")].message
39+
name: Taint
40+
type: string
3741
- jsonPath: .spec.lifecycleEnabled
3842
name: Lifecycle
3943
type: boolean
@@ -138,6 +142,16 @@ spec:
138142
description: LifecycleEnabled enables the lifecycle management of
139143
the hypervisor via hypervisor-operator.
140144
type: boolean
145+
maintenance:
146+
description: Maintenance indicates whether the hypervisor is in maintenance
147+
mode.
148+
enum:
149+
- ""
150+
- manual
151+
- auto
152+
- ha
153+
- termination
154+
type: string
141155
reboot:
142156
default: false
143157
description: Reboot request an reboot after successful installation
@@ -251,6 +265,10 @@ spec:
251265
- type
252266
type: object
253267
type: array
268+
evicted:
269+
description: Evicted indicates whether the hypervisor is evicted.
270+
(no instances left with active maintenance mode)
271+
type: boolean
254272
hypervisorId:
255273
description: HypervisorID is the unique identifier of the hypervisor
256274
in OpenStack.
@@ -298,6 +316,14 @@ spec:
298316
firmwareVersion:
299317
description: FirmwareVersion
300318
type: string
319+
gardenLinuxCommitID:
320+
description: Represents the Garden Linux build commit id
321+
type: string
322+
gardenLinuxFeatures:
323+
description: Represents the Garden Linux Feature Set
324+
items:
325+
type: string
326+
type: array
301327
hardwareModel:
302328
description: HardwareModel
303329
type: string
@@ -319,6 +345,10 @@ spec:
319345
prettyVersion:
320346
description: PrettyVersion
321347
type: string
348+
variantID:
349+
description: Identifying a specific variant or edition of the
350+
operating system
351+
type: string
322352
version:
323353
description: Represents the Operating System version.
324354
type: string
@@ -362,4 +392,3 @@ spec:
362392
storage: true
363393
subresources:
364394
status: {}
365-

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,17 @@ spec:
323323
version:
324324
description: Represents the Operating System version.
325325
type: string
326+
gardenLinuxCommitID:
327+
description: GardenLinuxCommitID
328+
type: string
329+
gardenLinuxFeatures:
330+
description: GardenLinuxFeatures
331+
items:
332+
type: string
333+
type: array
334+
variantID:
335+
description: VariantID
336+
type: string
326337
type: object
327338
serviceId:
328339
description: ServiceID is the unique identifier of the compute service

‎go.mod‎

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ go 1.25.0
77

88
require (
99
github.com/cert-manager/cert-manager v1.19.2
10-
github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251211190118-ddfb1ea3841c
10+
github.com/cobaltcore-dev/openstack-hypervisor-operator v0.0.0-20251219152336-768f63171244
1111
github.com/coreos/go-systemd/v22 v22.6.0
12-
github.com/digitalocean/go-libvirt v0.0.0-20251202224409-8b0babaf9393
13-
github.com/godbus/dbus/v5 v5.2.0
12+
github.com/digitalocean/go-libvirt v0.0.0-20260105165635-a0e369cfdc9f
13+
github.com/godbus/dbus/v5 v5.2.2
1414
github.com/onsi/ginkgo/v2 v2.27.3
1515
github.com/onsi/gomega v1.38.3
1616
github.com/sapcc/go-api-declarations v1.18.0
17-
k8s.io/api v0.34.1
18-
k8s.io/apimachinery v0.34.1
19-
k8s.io/client-go v0.34.1
17+
k8s.io/api v0.35.0
18+
k8s.io/apimachinery v0.35.0
19+
k8s.io/client-go v0.35.0
2020
sigs.k8s.io/controller-runtime v0.22.4
2121
)
2222

2323
require (
24-
cel.dev/expr v0.24.0 // indirect
24+
cel.dev/expr v0.25.1 // indirect
2525
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2626
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2727
github.com/beorn7/perks v1.0.1 // indirect
@@ -37,29 +37,28 @@ require (
3737
github.com/go-logr/logr v1.4.3 // indirect
3838
github.com/go-logr/stdr v1.2.2 // indirect
3939
github.com/go-logr/zapr v1.3.0 // indirect
40-
github.com/go-openapi/jsonpointer v0.22.1 // indirect
41-
github.com/go-openapi/jsonreference v0.21.2 // indirect
42-
github.com/go-openapi/swag v0.25.1 // indirect
43-
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
44-
github.com/go-openapi/swag/conv v0.25.1 // indirect
45-
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
46-
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
47-
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
48-
github.com/go-openapi/swag/loading v0.25.1 // indirect
49-
github.com/go-openapi/swag/mangling v0.25.1 // indirect
50-
github.com/go-openapi/swag/netutils v0.25.1 // indirect
51-
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
52-
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
53-
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
40+
github.com/go-openapi/jsonpointer v0.22.4 // indirect
41+
github.com/go-openapi/jsonreference v0.21.4 // indirect
42+
github.com/go-openapi/swag v0.25.4 // indirect
43+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
44+
github.com/go-openapi/swag/conv v0.25.4 // indirect
45+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
46+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
47+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
48+
github.com/go-openapi/swag/loading v0.25.4 // indirect
49+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
50+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
51+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
52+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
53+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
5454
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
55-
github.com/gogo/protobuf v1.3.2 // indirect
5655
github.com/google/btree v1.1.3 // indirect
57-
github.com/google/cel-go v0.26.0 // indirect
58-
github.com/google/gnostic-models v0.7.0 // indirect
56+
github.com/google/cel-go v0.26.1 // indirect
57+
github.com/google/gnostic-models v0.7.1 // indirect
5958
github.com/google/go-cmp v0.7.0 // indirect
6059
github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d // indirect
6160
github.com/google/uuid v1.6.0 // indirect
62-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
61+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // indirect
6362
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6463
github.com/json-iterator/go v1.1.12 // indirect
6564
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -68,51 +67,51 @@ require (
6867
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6968
github.com/prometheus/client_golang v1.23.2 // indirect
7069
github.com/prometheus/client_model v0.6.2 // indirect
71-
github.com/prometheus/common v0.67.1 // indirect
72-
github.com/prometheus/procfs v0.17.0 // indirect
73-
github.com/spf13/cobra v1.10.1 // indirect
70+
github.com/prometheus/common v0.67.5 // indirect
71+
github.com/prometheus/procfs v0.19.2 // indirect
72+
github.com/spf13/cobra v1.10.2 // indirect
7473
github.com/spf13/pflag v1.0.10 // indirect
7574
github.com/stoewer/go-strcase v1.3.1 // indirect
7675
github.com/x448/float16 v0.8.4 // indirect
77-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
78-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
79-
go.opentelemetry.io/otel v1.37.0 // indirect
80-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
81-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
82-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
83-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
84-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
85-
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
76+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
77+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
78+
go.opentelemetry.io/otel v1.39.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
80+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
81+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
82+
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
83+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
84+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
8685
go.uber.org/multierr v1.11.0 // indirect
8786
go.uber.org/zap v1.27.1 // indirect
8887
go.yaml.in/yaml/v2 v2.4.3 // indirect
8988
go.yaml.in/yaml/v3 v3.0.4 // indirect
90-
golang.org/x/crypto v0.45.0 // indirect
91-
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect
92-
golang.org/x/mod v0.30.0 // indirect
93-
golang.org/x/net v0.47.0 // indirect
94-
golang.org/x/oauth2 v0.32.0 // indirect
95-
golang.org/x/sync v0.18.0 // indirect
96-
golang.org/x/sys v0.38.0 // indirect
97-
golang.org/x/term v0.37.0 // indirect
98-
golang.org/x/text v0.31.0 // indirect
89+
golang.org/x/crypto v0.46.0 // indirect
90+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
91+
golang.org/x/mod v0.31.0 // indirect
92+
golang.org/x/net v0.48.0 // indirect
93+
golang.org/x/oauth2 v0.34.0 // indirect
94+
golang.org/x/sync v0.19.0 // indirect
95+
golang.org/x/sys v0.39.0 // indirect
96+
golang.org/x/term v0.38.0 // indirect
97+
golang.org/x/text v0.32.0 // indirect
9998
golang.org/x/time v0.14.0 // indirect
100-
golang.org/x/tools v0.39.0 // indirect
99+
golang.org/x/tools v0.40.0 // indirect
101100
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
102-
google.golang.org/genproto/googleapis/api v0.0.0-20250721164621-a45f3dfb1074 // indirect
103-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 // indirect
104-
google.golang.org/grpc v1.75.1 // indirect
105-
google.golang.org/protobuf v1.36.10 // indirect
101+
google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b // indirect
102+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
103+
google.golang.org/grpc v1.78.0 // indirect
104+
google.golang.org/protobuf v1.36.11 // indirect
106105
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
107106
gopkg.in/inf.v0 v0.9.1 // indirect
108-
k8s.io/apiextensions-apiserver v0.34.1 // indirect
109-
k8s.io/apiserver v0.34.1 // indirect
110-
k8s.io/component-base v0.34.1 // indirect
107+
k8s.io/apiextensions-apiserver v0.35.0 // indirect
108+
k8s.io/apiserver v0.35.0 // indirect
109+
k8s.io/component-base v0.35.0 // indirect
111110
k8s.io/klog/v2 v2.130.1 // indirect
112-
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
113-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
114-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
115-
sigs.k8s.io/gateway-api v1.4.0 // indirect
111+
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
112+
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2 // indirect
113+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
114+
sigs.k8s.io/gateway-api v1.4.1 // indirect
116115
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
117116
sigs.k8s.io/randfill v1.0.0 // indirect
118117
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect

0 commit comments

Comments
 (0)