Skip to content

Commit de65752

Browse files
authored
CAPI 1.9.5, k8s/* 0.31.6, controller-runtime 0.19.6, controller-gen 0.16.5 (#388)
* config/{crd,rbac}: regen * bump github.com/google/cel-go to 0.20.1 * docs, e2e: bump kubernetes to 1.31.6 * */*.go: silence lint about cluster-api/errors and Failure{Message,Reason} deprecation
1 parent 32b49a7 commit de65752

23 files changed

+212
-310
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
180180

181181
## Tool Versions
182182
KUSTOMIZE_VERSION ?= v5.0.0
183-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
183+
CONTROLLER_TOOLS_VERSION ?= v0.16.5
184184
ENVTEST_VERSION ?= latest
185185

186186
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

api/v1alpha1/proxmoxcluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/utils/ptr"
2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
24-
"sigs.k8s.io/cluster-api/errors"
24+
"sigs.k8s.io/cluster-api/errors" //nolint:staticcheck
2525
"sigs.k8s.io/controller-runtime/pkg/client"
2626
)
2727

api/v1alpha1/proxmoxmachine_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
corev1 "k8s.io/api/core/v1"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
26-
clusterapierrors "sigs.k8s.io/cluster-api/errors"
26+
clusterapierrors "sigs.k8s.io/cluster-api/errors" //nolint:staticcheck
2727
)
2828

2929
const (

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxclusters.yaml

Lines changed: 5 additions & 20 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.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: proxmoxclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -78,7 +78,6 @@ spec:
7878
for operations. This implies that VMs can be cloned on different nodes from
7979
the node which holds the VM template.
8080
81-
8281
This field is optional and should only be set if you want to restrict
8382
the nodes where the VM can be cloned.
8483
If not set, the ProxmoxCluster will be used to determine the nodes.
@@ -121,7 +120,6 @@ spec:
121120
description: |-
122121
Size defines the size in gigabyte.
123122
124-
125123
As Proxmox does not support shrinking, the size
126124
must be bigger than the already configured size in the
127125
template.
@@ -545,17 +543,14 @@ spec:
545543
This node will be used to locate the template VM, which will
546544
be used for cloning operations.
547545
548-
549546
Cloning will be performed according to the configuration.
550547
Setting the `Target` field will tell Proxmox to clone the
551548
VM on that target node.
552549
553-
554550
When Target is not set and the ProxmoxCluster contains
555551
a set of `AllowedNodes`, the algorithm will instead evenly
556552
distribute the VMs across the nodes from that list.
557553
558-
559554
If neither a `Target` nor `AllowedNodes` was set, the VM
560555
will be cloned onto the same node as SourceNode.
561556
minLength: 1
@@ -800,20 +795,20 @@ spec:
800795
description: |-
801796
The reason for the condition's last transition in CamelCase.
802797
The specific API may choose whether or not this field is considered a guaranteed API.
803-
This field may not be empty.
798+
This field may be empty.
804799
type: string
805800
severity:
806801
description: |-
807-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
802+
severity provides an explicit classification of Reason code, so the users or machines can immediately
808803
understand the current situation and act accordingly.
809804
The Severity field MUST be set only when Status=False.
810805
type: string
811806
status:
812-
description: Status of the condition, one of True, False, Unknown.
807+
description: status of the condition, one of True, False, Unknown.
813808
type: string
814809
type:
815810
description: |-
816-
Type of condition in CamelCase or in foo.example.com/CamelCase.
811+
type of condition in CamelCase or in foo.example.com/CamelCase.
817812
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
818813
can be useful (see .node.status.conditions), the ability to deconflict is important.
819814
type: string
@@ -829,7 +824,6 @@ spec:
829824
reconciling the Machine and will contain a more verbose string suitable
830825
for logging and human consumption.
831826
832-
833827
This field should not be set for transitive errors that a controller
834828
faces that are expected to be fixed automatically over
835829
time (like service outages), but instead indicate that something is
@@ -839,7 +833,6 @@ spec:
839833
spec, values that are unsupported by the controller, or the
840834
responsible controller itself being critically misconfigured.
841835
842-
843836
Any transient errors that occur during the reconciliation of ProxmoxMachines
844837
can be added as events to the ProxmoxCluster object and/or logged in the
845838
controller's output.
@@ -850,7 +843,6 @@ spec:
850843
reconciling the Machine and will contain a succinct value suitable
851844
for machine interpretation.
852845
853-
854846
This field should not be set for transitive errors that a controller
855847
faces that are expected to be fixed automatically over
856848
time (like service outages), but instead indicate that something is
@@ -860,7 +852,6 @@ spec:
860852
spec, values that are unsupported by the controller, or the
861853
responsible controller itself being critically misconfigured.
862854
863-
864855
Any transient errors that occur during the reconciliation of ProxmoxCluster
865856
can be added as events to the ProxmoxCluster object and/or logged in the
866857
controller's output.
@@ -880,9 +871,7 @@ spec:
880871
This field is effectively required, but due to backwards compatibility is
881872
allowed to be empty. Instances of this type with an empty value here are
882873
almost certainly wrong.
883-
TODO: Add other useful fields. apiVersion, kind, uid?
884874
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
885-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
886875
type: string
887876
type: object
888877
x-kubernetes-map-type: atomic
@@ -910,9 +899,7 @@ spec:
910899
This field is effectively required, but due to backwards compatibility is
911900
allowed to be empty. Instances of this type with an empty value here are
912901
almost certainly wrong.
913-
TODO: Add other useful fields. apiVersion, kind, uid?
914902
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
915-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
916903
type: string
917904
type: object
918905
x-kubernetes-map-type: atomic
@@ -941,9 +928,7 @@ spec:
941928
This field is effectively required, but due to backwards compatibility is
942929
allowed to be empty. Instances of this type with an empty value here are
943930
almost certainly wrong.
944-
TODO: Add other useful fields. apiVersion, kind, uid?
945931
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
946-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
947932
type: string
948933
type: object
949934
x-kubernetes-map-type: atomic

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxclustertemplates.yaml

Lines changed: 2 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.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: proxmoxclustertemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -57,7 +57,7 @@ spec:
5757
additionalProperties:
5858
type: string
5959
description: |-
60-
Annotations is an unstructured key value map stored with a resource that may be
60+
annotations is an unstructured key value map stored with a resource that may be
6161
set by external tools to store and retrieve arbitrary metadata. They are not
6262
queryable and should be preserved when modifying objects.
6363
More info: http://kubernetes.io/docs/user-guide/annotations
@@ -100,7 +100,6 @@ spec:
100100
for operations. This implies that VMs can be cloned on different nodes from
101101
the node which holds the VM template.
102102
103-
104103
This field is optional and should only be set if you want to restrict
105104
the nodes where the VM can be cloned.
106105
If not set, the ProxmoxCluster will be used to determine the nodes.
@@ -145,7 +144,6 @@ spec:
145144
description: |-
146145
Size defines the size in gigabyte.
147146
148-
149147
As Proxmox does not support shrinking, the size
150148
must be bigger than the already configured size in the
151149
template.
@@ -586,17 +584,14 @@ spec:
586584
This node will be used to locate the template VM, which will
587585
be used for cloning operations.
588586
589-
590587
Cloning will be performed according to the configuration.
591588
Setting the `Target` field will tell Proxmox to clone the
592589
VM on that target node.
593590
594-
595591
When Target is not set and the ProxmoxCluster contains
596592
a set of `AllowedNodes`, the algorithm will instead evenly
597593
distribute the VMs across the nodes from that list.
598594
599-
600595
If neither a `Target` nor `AllowedNodes` was set, the VM
601596
will be cloned onto the same node as SourceNode.
602597
minLength: 1

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachines.yaml

Lines changed: 5 additions & 14 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.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: proxmoxmachines.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -71,7 +71,6 @@ spec:
7171
for operations. This implies that VMs can be cloned on different nodes from
7272
the node which holds the VM template.
7373
74-
7574
This field is optional and should only be set if you want to restrict
7675
the nodes where the VM can be cloned.
7776
If not set, the ProxmoxCluster will be used to determine the nodes.
@@ -113,7 +112,6 @@ spec:
113112
description: |-
114113
Size defines the size in gigabyte.
115114
116-
117115
As Proxmox does not support shrinking, the size
118116
must be bigger than the already configured size in the
119117
template.
@@ -513,17 +511,14 @@ spec:
513511
This node will be used to locate the template VM, which will
514512
be used for cloning operations.
515513
516-
517514
Cloning will be performed according to the configuration.
518515
Setting the `Target` field will tell Proxmox to clone the
519516
VM on that target node.
520517
521-
522518
When Target is not set and the ProxmoxCluster contains
523519
a set of `AllowedNodes`, the algorithm will instead evenly
524520
distribute the VMs across the nodes from that list.
525521
526-
527522
If neither a `Target` nor `AllowedNodes` was set, the VM
528523
will be cloned onto the same node as SourceNode.
529524
minLength: 1
@@ -646,20 +641,20 @@ spec:
646641
description: |-
647642
The reason for the condition's last transition in CamelCase.
648643
The specific API may choose whether or not this field is considered a guaranteed API.
649-
This field may not be empty.
644+
This field may be empty.
650645
type: string
651646
severity:
652647
description: |-
653-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
648+
severity provides an explicit classification of Reason code, so the users or machines can immediately
654649
understand the current situation and act accordingly.
655650
The Severity field MUST be set only when Status=False.
656651
type: string
657652
status:
658-
description: Status of the condition, one of True, False, Unknown.
653+
description: status of the condition, one of True, False, Unknown.
659654
type: string
660655
type:
661656
description: |-
662-
Type of condition in CamelCase or in foo.example.com/CamelCase.
657+
type of condition in CamelCase or in foo.example.com/CamelCase.
663658
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
664659
can be useful (see .node.status.conditions), the ability to deconflict is important.
665660
type: string
@@ -675,7 +670,6 @@ spec:
675670
reconciling the Machine and will contain a more verbose string suitable
676671
for logging and human consumption.
677672
678-
679673
This field should not be set for transitive errors that a controller
680674
faces that are expected to be fixed automatically over
681675
time (like service outages), but instead indicate that something is
@@ -685,7 +679,6 @@ spec:
685679
spec, values that are unsupported by the controller, or the
686680
responsible controller itself being critically misconfigured.
687681
688-
689682
Any transient errors that occur during the reconciliation of ProxmoxMachines
690683
can be added as events to the ProxmoxMachine object and/or logged in the
691684
controller's output.
@@ -696,7 +689,6 @@ spec:
696689
reconciling the Machine and will contain a succinct value suitable
697690
for machine interpretation.
698691
699-
700692
This field should not be set for transitive errors that a controller
701693
faces that are expected to be fixed automatically over
702694
time (like service outages), but instead indicate that something is
@@ -706,7 +698,6 @@ spec:
706698
spec, values that are unsupported by the controller, or the
707699
responsible controller itself being critically misconfigured.
708700
709-
710701
Any transient errors that occur during the reconciliation of ProxmoxMachines
711702
can be added as events to the ProxmoxMachine object and/or logged in the
712703
controller's output.

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachinetemplates.yaml

Lines changed: 2 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.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: proxmoxmachinetemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -57,7 +57,7 @@ spec:
5757
additionalProperties:
5858
type: string
5959
description: |-
60-
Annotations is an unstructured key value map stored with a resource that may be
60+
annotations is an unstructured key value map stored with a resource that may be
6161
set by external tools to store and retrieve arbitrary metadata. They are not
6262
queryable and should be preserved when modifying objects.
6363
More info: http://kubernetes.io/docs/user-guide/annotations
@@ -82,7 +82,6 @@ spec:
8282
for operations. This implies that VMs can be cloned on different nodes from
8383
the node which holds the VM template.
8484
85-
8685
This field is optional and should only be set if you want to restrict
8786
the nodes where the VM can be cloned.
8887
If not set, the ProxmoxCluster will be used to determine the nodes.
@@ -125,7 +124,6 @@ spec:
125124
description: |-
126125
Size defines the size in gigabyte.
127126
128-
129127
As Proxmox does not support shrinking, the size
130128
must be bigger than the already configured size in the
131129
template.
@@ -545,17 +543,14 @@ spec:
545543
This node will be used to locate the template VM, which will
546544
be used for cloning operations.
547545
548-
549546
Cloning will be performed according to the configuration.
550547
Setting the `Target` field will tell Proxmox to clone the
551548
VM on that target node.
552549
553-
554550
When Target is not set and the ProxmoxCluster contains
555551
a set of `AllowedNodes`, the algorithm will instead evenly
556552
distribute the VMs across the nodes from that list.
557553
558-
559554
If neither a `Target` nor `AllowedNodes` was set, the VM
560555
will be cloned onto the same node as SourceNode.
561556
minLength: 1

0 commit comments

Comments
 (0)