Skip to content

Commit 0939eea

Browse files
authored
build: Update tools (#223)
actionlint v1.6.26 clusterctl v1.5.2 ginkgo v2.12.1 git v2.42.0 goreleaser v1.21.2 helm-docs v1.11.2 kubebuilder v3.12.0 kubectl v1.28.2 helm v3.13.0
1 parent f09ef9e commit 0939eea

File tree

4 files changed

+60
-36
lines changed

4 files changed

+60
-36
lines changed

charts/capi-runtime-extensions/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ A Helm chart for capi-runtime-extensions
5353
| service.annotations | object | `{}` | |
5454
| service.port | int | `443` | |
5555
| service.type | string | `"ClusterIP"` | |
56-
| tolerations | list | `[]` | |
56+
| tolerations | list | `[]` | |

common/pkg/capi/clustertopology/patches/generator_test.go

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestMutateIfApplicable(t *testing.T) {
4343
if obj.Data == nil {
4444
obj.Data = map[string]string{}
4545
}
46-
obj.Data["foo"] = "bar"
46+
obj.Data["foo"] = "bar" //nolint:goconst // bar doesn't need to be a const.
4747
return nil
4848
},
4949
expected: &unstructured.Unstructured{
@@ -91,6 +91,37 @@ func TestMutateIfApplicable(t *testing.T) {
9191
"unknownField": "foo",
9292
},
9393
},
94+
}, {
95+
name: "check deletion of elements in slice",
96+
input: &unstructured.Unstructured{Object: map[string]interface{}{
97+
"apiVersion": "controlplane.cluster.x-k8s.io/v1beta1",
98+
"kind": "KubeadmControlPlaneTemplate",
99+
"data": map[string]interface{}{
100+
"existingFoo": "bar",
101+
},
102+
}},
103+
holderRef: &runtimehooksv1.HolderReference{
104+
Kind: "Cluster",
105+
FieldPath: "spec.controlPlaneRef",
106+
},
107+
patchSelector: selectors.ControlPlane(),
108+
mutFn: func(obj *v1.ConfigMap) error {
109+
if obj.Data == nil {
110+
obj.Data = map[string]string{}
111+
}
112+
obj.Data["foo"] = "bar"
113+
delete(obj.Data, "existingFoo")
114+
return nil
115+
},
116+
expected: &unstructured.Unstructured{
117+
Object: map[string]interface{}{
118+
"apiVersion": "controlplane.cluster.x-k8s.io/v1beta1",
119+
"kind": "KubeadmControlPlaneTemplate",
120+
"data": map[string]interface{}{
121+
"foo": "bar",
122+
},
123+
},
124+
},
94125
}}
95126
for testIdx := range tests {
96127
tt := tests[testIdx] // Capture loop var.

devbox.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"gojq@latest",
1818
"path:./hack/flakes/golangci-lint",
1919
"golines@latest",
20-
"google-cloud-sdk@latest",
2120
"goreleaser@latest",
2221
"gotestsum@latest",
2322
"hadolint@latest",

devbox.lock

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"lockfile_version": "1",
33
"packages": {
44
"actionlint@latest": {
5-
"last_modified": "2023-06-30T04:44:22Z",
6-
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#actionlint",
5+
"last_modified": "2023-10-06T07:35:11Z",
6+
"resolved": "github:NixOS/nixpkgs/a2eb207f45e4a14a1e3019d9e3863d1e208e2295#actionlint",
77
"source": "devbox-search",
8-
"version": "1.6.25"
8+
"version": "1.6.26"
99
},
1010
1111
"last_modified": "2023-06-30T04:44:22Z",
@@ -14,10 +14,10 @@
1414
"version": "3.8.0"
1515
},
1616
"clusterctl@latest": {
17-
"last_modified": "2023-09-10T10:53:27Z",
18-
"resolved": "github:NixOS/nixpkgs/78058d810644f5ed276804ce7ea9e82d92bee293#clusterctl",
17+
"last_modified": "2023-10-01T23:11:39Z",
18+
"resolved": "github:NixOS/nixpkgs/f8be2c43b4b1c1aec02f741ae909696b8410ebc1#clusterctl",
1919
"source": "devbox-search",
20-
"version": "1.5.1"
20+
"version": "1.5.2"
2121
},
2222
"coreutils@latest": {
2323
"last_modified": "2023-09-17T10:54:49Z",
@@ -44,16 +44,16 @@
4444
"version": "4.9.0"
4545
},
4646
"ginkgo@latest": {
47-
"last_modified": "2023-09-04T16:24:30Z",
48-
"resolved": "github:NixOS/nixpkgs/3c15feef7770eb5500a4b8792623e2d6f598c9c1#ginkgo",
47+
"last_modified": "2023-09-27T18:02:17Z",
48+
"resolved": "github:NixOS/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9#ginkgo",
4949
"source": "devbox-search",
50-
"version": "2.12.0"
50+
"version": "2.12.1"
5151
},
5252
"git@latest": {
53-
"last_modified": "2023-07-23T03:35:12Z",
54-
"resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#git",
53+
"last_modified": "2023-10-06T07:35:11Z",
54+
"resolved": "github:NixOS/nixpkgs/a2eb207f45e4a14a1e3019d9e3863d1e208e2295#git",
5555
"source": "devbox-search",
56-
"version": "2.41.0"
56+
"version": "2.42.0"
5757
},
5858
"github-cli@latest": {
5959
"last_modified": "2023-02-24T09:01:09Z",
@@ -91,17 +91,11 @@
9191
"source": "devbox-search",
9292
"version": "0.11.0"
9393
},
94-
"google-cloud-sdk@latest": {
95-
"last_modified": "2023-06-30T04:44:22Z",
96-
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#google-cloud-sdk",
97-
"source": "devbox-search",
98-
"version": "433.0.1"
99-
},
10094
"goreleaser@latest": {
101-
"last_modified": "2023-09-04T16:24:30Z",
102-
"resolved": "github:NixOS/nixpkgs/3c15feef7770eb5500a4b8792623e2d6f598c9c1#goreleaser",
95+
"last_modified": "2023-10-01T23:11:39Z",
96+
"resolved": "github:NixOS/nixpkgs/f8be2c43b4b1c1aec02f741ae909696b8410ebc1#goreleaser",
10397
"source": "devbox-search",
104-
"version": "1.20.0"
98+
"version": "1.21.2"
10599
},
106100
"gotestsum@latest": {
107101
"last_modified": "2023-07-23T03:35:12Z",
@@ -116,10 +110,10 @@
116110
"version": "2.12.0"
117111
},
118112
"helm-docs@latest": {
119-
"last_modified": "2023-09-10T10:53:27Z",
120-
"resolved": "github:NixOS/nixpkgs/78058d810644f5ed276804ce7ea9e82d92bee293#helm-docs",
113+
"last_modified": "2023-09-27T18:02:17Z",
114+
"resolved": "github:NixOS/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9#helm-docs",
121115
"source": "devbox-search",
122-
"version": "1.11.1"
116+
"version": "1.11.2"
123117
},
124118
125119
"last_modified": "2023-08-08T11:45:39Z",
@@ -134,16 +128,16 @@
134128
"version": "0.20.0"
135129
},
136130
"kubebuilder@latest": {
137-
"last_modified": "2023-07-23T03:35:12Z",
138-
"resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#kubebuilder",
131+
"last_modified": "2023-09-27T18:02:17Z",
132+
"resolved": "github:NixOS/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9#kubebuilder",
139133
"source": "devbox-search",
140-
"version": "3.11.1"
134+
"version": "3.12.0"
141135
},
142136
"kubectl@latest": {
143-
"last_modified": "2023-09-04T16:24:30Z",
144-
"resolved": "github:NixOS/nixpkgs/3c15feef7770eb5500a4b8792623e2d6f598c9c1#kubectl",
137+
"last_modified": "2023-10-02T08:16:30Z",
138+
"resolved": "github:NixOS/nixpkgs/f902cb49892d300ff15cb237e48aa1cad79d68c3#kubectl",
145139
"source": "devbox-search",
146-
"version": "1.28.1"
140+
"version": "1.28.2"
147141
},
148142
"kubernetes-controller-tools@latest": {
149143
"last_modified": "2023-09-04T16:24:30Z",
@@ -152,10 +146,10 @@
152146
"version": "0.13.0"
153147
},
154148
"kubernetes-helm@latest": {
155-
"last_modified": "2023-07-23T03:35:12Z",
156-
"resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#kubernetes-helm",
149+
"last_modified": "2023-09-29T09:08:59Z",
150+
"resolved": "github:NixOS/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8#kubernetes-helm",
157151
"source": "devbox-search",
158-
"version": "3.12.2"
152+
"version": "3.13.0"
159153
},
160154
"kustomize@latest": {
161155
"last_modified": "2023-08-14T01:28:26Z",

0 commit comments

Comments
 (0)