Skip to content

Commit 9aa82da

Browse files
RonnanSouzaRonnanSouza
authored
Merge pull request #104 from topfreegames/chore/kops-1-34
feat: update kops dependency to 1.33
2 parents 98f778c + 7109dd3 commit 9aa82da

16 files changed

+905
-593
lines changed

‎.github/workflows/go.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v2
1919
with:
20-
go-version: 1.23.5
20+
go-version: 1.25.3
2121

2222
- name: Run lint
23-
uses: golangci/golangci-lint-action@v6.1.0
23+
uses: golangci/golangci-lint-action@v8.0.0
2424
with:
2525
version: latest
2626
args: --timeout 10m0s
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Go
3535
uses: actions/setup-go@v2
3636
with:
37-
go-version: 1.23.5
37+
go-version: 1.25.3
3838

3939
- name: Install dependencies
4040
run: sudo apt install make -y

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.23.5
1+
golang 1.25.3

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23 as builder
2+
FROM golang:1.25 as builder
33

44
ARG TARGETOS
55
ARG TARGETARCH

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The operator consists of several key components:
4646
- cluster-api-control-plane-controller
4747
- AWS credentials configured
4848
- kOps CLI installed (for development)
49-
- Go 1.23.5 or later
49+
- Go 1.25.3 or later
5050
- kubebuilder v3
5151

5252
## Usage

‎config/crd/bases/controlplane.cluster.x-k8s.io_kopscontrolplanes.yaml‎

Lines changed: 183 additions & 24 deletions
Large diffs are not rendered by default.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_karpenternodepoolsv1s.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,8 @@ spec:
276276
a node.
277277
type: string
278278
timeAdded:
279-
description: |-
280-
TimeAdded represents the time at which the taint was added.
281-
It is only written for NoExecute taints.
279+
description: TimeAdded represents the time at which
280+
the taint was added.
282281
format: date-time
283282
type: string
284283
value:
@@ -308,9 +307,8 @@ spec:
308307
a node.
309308
type: string
310309
timeAdded:
311-
description: |-
312-
TimeAdded represents the time at which the taint was added.
313-
It is only written for NoExecute taints.
310+
description: TimeAdded represents the time at which
311+
the taint was added.
314312
format: date-time
315313
type: string
316314
value:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_kopsmachinepools.yaml‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,8 @@ spec:
473473
applied to a node.
474474
type: string
475475
timeAdded:
476-
description: |-
477-
TimeAdded represents the time at which the taint was added.
478-
It is only written for NoExecute taints.
476+
description: TimeAdded represents the time
477+
at which the taint was added.
479478
format: date-time
480479
type: string
481480
value:
@@ -506,9 +505,8 @@ spec:
506505
applied to a node.
507506
type: string
508507
timeAdded:
509-
description: |-
510-
TimeAdded represents the time at which the taint was added.
511-
It is only written for NoExecute taints.
508+
description: TimeAdded represents the time
509+
at which the taint was added.
512510
format: date-time
513511
type: string
514512
value:
@@ -902,9 +900,8 @@ spec:
902900
applied to a node.
903901
type: string
904902
timeAdded:
905-
description: |-
906-
TimeAdded represents the time at which the taint was added.
907-
It is only written for NoExecute taints.
903+
description: TimeAdded represents the time
904+
at which the taint was added.
908905
format: date-time
909906
type: string
910907
value:
@@ -935,9 +932,8 @@ spec:
935932
applied to a node.
936933
type: string
937934
timeAdded:
938-
description: |-
939-
TimeAdded represents the time at which the taint was added.
940-
It is only written for NoExecute taints.
935+
description: TimeAdded represents the time
936+
at which the taint was added.
941937
format: date-time
942938
type: string
943939
value:
@@ -1065,6 +1061,12 @@ spec:
10651061
description: ConfigOverride is the complete containerd config
10661062
file provided by the user.
10671063
type: string
1064+
installCriCtl:
1065+
description: InstallCriCtl installs crictl (default "false").
1066+
type: boolean
1067+
installNerdCtl:
1068+
description: InstallNerdCtl installs nerdctl (default "false").
1069+
type: boolean
10681070
logLevel:
10691071
description: LogLevel controls the logging details [trace,
10701072
debug, info, warn, error, fatal, panic] (default "info").
@@ -1098,12 +1100,16 @@ spec:
10981100
enabled:
10991101
description: |-
11001102
Enabled determines if kOps will install the Nvidia GPU runtime and drivers.
1101-
They will only be installed on intances that has an Nvidia GPU.
1103+
They will only be installed on instances that has an Nvidia GPU.
11021104
type: boolean
1105+
image:
1106+
description: Image defines the container image used to
1107+
deploy the Nvidia Kubernetes Device Plugin.
1108+
type: string
11031109
package:
11041110
description: |-
11051111
Package is the name of the nvidia driver package that will be installed.
1106-
Default is "nvidia-headless-510-server".
1112+
Default is "nvidia-driver-535-server".
11071113
type: string
11081114
type: object
11091115
packages:
@@ -1175,6 +1181,11 @@ spec:
11751181
description: State directory for execution state files (default
11761182
"/run/containerd").
11771183
type: string
1184+
useECRCredentialsForMirrors:
1185+
description: Enables Kubelet ECR Credential helper to pass
1186+
credentials to containerd mirrors, to use ECR as a pull-through
1187+
cache
1188+
type: boolean
11781189
version:
11791190
description: Version used to pick the containerd package.
11801191
type: string
@@ -1399,8 +1410,9 @@ spec:
13991410
file that will be used to get client certificate for kubelet
14001411
type: string
14011412
cgroupDriver:
1402-
description: CgroupDriver allows the explicit setting of the
1403-
kubelet cgroup driver. If omitted, defaults to cgroupfs.
1413+
description: |-
1414+
CgroupDriver allows the explicit setting of the kubelet cgroup driver.
1415+
DEPRECATED: The cgroup driver is automatically detected.
14041416
type: string
14051417
cgroupRoot:
14061418
description: cgroupRoot is the root cgroup to use for pods.
@@ -1665,7 +1677,7 @@ spec:
16651677
protectKernelDefaults:
16661678
description: |-
16671679
Default kubelet behaviour for kernel tuning. If set, kubelet errors if any of kernel tunables is different than kubelet defaults.
1668-
(DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag.
1680+
DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag.
16691681
type: boolean
16701682
readOnlyPort:
16711683
description: ReadOnlyPort is the port used by the kubelet

0 commit comments

Comments
 (0)