Skip to content

Commit

Permalink
Add support for Kubernetes v1.31 (#410)
Browse files Browse the repository at this point in the history 
* Add support for Kubernetes v1.31

Signed-off-by: Marko Mudrinić <[email protected]>

* Update cri-tools to v1.31.1 and v1.30.1

Signed-off-by: Marko Mudrinić <[email protected]>

* Increase memory limit for the lint job

Signed-off-by: Marko Mudrinić <[email protected]>

---------

Signed-off-by: Marko Mudrinić <[email protected]>
  • Loading branch information
@xmudrii
xmudrii authored Aug 15, 2024
1 parent c1a823e commit d21723f
Show file tree
Hide file tree
Showing 22 changed files with 85 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .prow/verify.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ presubmits:
memory: 1Gi
cpu: 800m
limits:
memory: 2Gi
memory: 4Gi

- name: pull-operating-system-manager-yamllint
always_run: true
Expand Down
6 changes: 4 additions & 2 deletions deploy/osps/default/osp-amzn2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,12 @@ spec:
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.30.1"
{{- else if semverCompare "~1.31.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.31.1"
{{- else }}
{{- /* Fallback to the latest version */}}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
{{- end }}
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
Expand Down
6 changes: 4 additions & 2 deletions deploy/osps/default/osp-centos.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,12 @@ spec:
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.30.1"
{{- else if semverCompare "~1.31.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.31.1"
{{- else }}
{{- /* Fallback to the latest version */}}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
{{- end }}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"
Expand Down
6 changes: 4 additions & 2 deletions deploy/osps/default/osp-flatcar-cloud-init.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,12 @@ spec:
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.30.1"
{{- else if semverCompare "~1.31.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.31.1"
{{- else }}
{{- /* Fallback to the latest version */}}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
{{- end }}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"
Expand Down
6 changes: 4 additions & 2 deletions deploy/osps/default/osp-flatcar.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,12 @@ spec:
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.30.1"
{{- else if semverCompare "~1.31.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.31.1"
{{- else }}
{{- /* Fallback to the latest version */}}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
{{- end }}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"
Expand Down
6 changes: 4 additions & 2 deletions deploy/osps/default/osp-rhel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,12 @@ spec:
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.30.1"
{{- else if semverCompare "~1.31.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.31.1"
{{- else }}
{{- /* Fallback to the latest version */}}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
{{- end }}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"
Expand Down
6 changes: 4 additions & 2 deletions deploy/osps/default/osp-rockylinux.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,12 @@ spec:
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.30.1"
{{- else if semverCompare "~1.31.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.31.1"
{{- else }}
{{- /* Fallback to the latest version */}}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
{{- end }}
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
Expand Down
6 changes: 4 additions & 2 deletions deploy/osps/default/osp-ubuntu.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,12 @@ spec:
{{- else if semverCompare "~1.29.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.29.0"
{{- else if semverCompare "~1.30.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.30.1"
{{- else if semverCompare "~1.31.0" .KubeVersion }}
CRI_TOOLS_RELEASE="v1.31.1"
{{- else }}
{{- /* Fallback to the latest version */}}
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
{{- end }}
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
Expand Down
1 change: 1 addition & 0 deletions docs/compatibility-matrix.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

Currently supported K8S versions are:

- 1.31
- 1.30
- 1.29
- 1.28
Expand Down
24 changes: 13 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ require (
github.com/go-test/deep v1.1.1
github.com/kubermatic/machine-controller v1.59.1-0.20240627060120-8f3166ae03b0
github.com/onsi/ginkgo/v2 v2.19.0
github.com/pmezard/go-difflib v1.0.0
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
github.com/sethvargo/go-password v0.3.0
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
go.uber.org/zap v1.27.0
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/yaml.v3 v3.0.1
k8c.io/reconciler v0.5.0
k8s.io/api v0.30.2
k8s.io/apimachinery v0.30.2
k8s.io/client-go v0.30.2
k8s.io/code-generator v0.30.2
k8s.io/api v0.31.0
k8s.io/apimachinery v0.31.0
k8s.io/client-go v0.31.0
k8s.io/code-generator v0.31.0
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
sigs.k8s.io/controller-runtime v0.18.4
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/controller-tools v0.14.0
sigs.k8s.io/yaml v1.4.0
)
Expand All @@ -39,13 +39,13 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/flatcar/ignition v0.36.2 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
Expand Down Expand Up @@ -81,8 +81,9 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/vincent-petithory/dataurl v1.0.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/crypto v0.24.0 // indirect
Expand All @@ -98,10 +99,11 @@ require (
golang.org/x/tools v0.22.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiextensions-apiserver v0.30.2 // indirect
k8s.io/apiextensions-apiserver v0.31.0 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b // indirect
Expand Down
46 changes: 27 additions & 19 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03V
github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
Expand All @@ -71,6 +72,8 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
Expand Down Expand Up @@ -199,8 +202,9 @@ github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7ir
github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Expand All @@ -227,8 +231,8 @@ github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA=
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
Expand All @@ -251,6 +255,8 @@ github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8A
github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
Expand Down Expand Up @@ -469,6 +475,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
Expand All @@ -493,16 +501,16 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8c.io/reconciler v0.5.0 h1:BHpelg1UfI/7oBFctqOq8sX6qzflXpl3SlvHe7e8wak=
k8c.io/reconciler v0.5.0/go.mod h1:pT1+SVcVXJQeBJhpJBXQ5XW64QnKKeYTnVlQf0dGE0k=
k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
k8s.io/apiextensions-apiserver v0.30.2 h1:l7Eue2t6QiLHErfn2vwK4KgF4NeDgjQkCXtEbOocKIE=
k8s.io/apiextensions-apiserver v0.30.2/go.mod h1:lsJFLYyK40iguuinsb3nt+Sj6CmodSI4ACDLep1rgjw=
k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
k8s.io/code-generator v0.30.2 h1:ZY1+aGkqZVwKIyGsOzquaeZ5rSfE6wZHur8z3jQAaiw=
k8s.io/code-generator v0.30.2/go.mod h1:RQP5L67QxqgkVquk704CyvWFIq0e6RCMmLTXxjE8dVA=
k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
k8s.io/code-generator v0.31.0 h1:w607nrMi1KeDKB3/F/J4lIoOgAwc+gV9ZKew4XRfMp8=
k8s.io/code-generator v0.31.0/go.mod h1:84y4w3es8rOJOUUP1rLsIiGlO1JuEaPFXQPA9e/K6U0=
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
Expand All @@ -511,13 +519,13 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b h1:Q9xmGWBvOGd8UJyccgpYlLosk/JlfP3xQLNkQlHJeXw=
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak=
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
sigs.k8s.io/controller-tools v0.14.0 h1:rnNoCC5wSXlrNoBKKzL70LNJKIQKEzT6lloG6/LF73A=
sigs.k8s.io/controller-tools v0.14.0/go.mod h1:TV7uOtNNnnR72SpzhStvPkoS/U5ir0nMudrkrC4M9Sc=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
4 changes: 2 additions & 2 deletions pkg/admission/machinedeployment/mutation/mutation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func TestMutateMachineDeployment(t *testing.T) {
Template: clusterv1alpha1.MachineTemplateSpec{
Spec: clusterv1alpha1.MachineSpec{
Versions: clusterv1alpha1.MachineVersionInfo{
Kubelet: "1.30.0",
Kubelet: "1.31.0",
},
ProviderSpec: clusterv1alpha1.ProviderSpec{
Value: &runtime.RawExtension{
Expand All @@ -72,7 +72,7 @@ func TestMutateMachineDeployment(t *testing.T) {
Template: clusterv1alpha1.MachineTemplateSpec{
Spec: clusterv1alpha1.MachineSpec{
Versions: clusterv1alpha1.MachineVersionInfo{
Kubelet: "1.30.0",
Kubelet: "1.31.0",
},
ProviderSpec: clusterv1alpha1.ProviderSpec{
Value: &runtime.RawExtension{
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/osc_reconciler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ kPe6XoSbiLm/kxk32T0=

const (
defaultOSPPathPrefix = "../../../../deploy/osps/default/"
defaultKubeletVersion = "1.30.0"
defaultKubeletVersion = "1.31.0"
ospUbuntu = "osp-ubuntu"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ spec:
rm -f "$cni_filename"
cd -
chown -R root:root "$cni_bin_dir"
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.29.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
Expand All @@ -341,7 +341,7 @@ spec:
rm -f "$cri_tools_filename"
ln -sf "$opt_bin/crictl" "$usr_local_bin"/crictl || echo "symbolic link is skipped"
cd -
KUBE_VERSION="${KUBE_VERSION:-v1.30.0}"
KUBE_VERSION="${KUBE_VERSION:-v1.31.0}"
kube_dir="$opt_bin/kubernetes-$KUBE_VERSION"
kube_base_url="https://dl.k8s.io/$KUBE_VERSION/bin/linux/$arch"
kube_sum_file="$kube_dir/sha256"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ spec:
rm -f "$cni_filename"
cd -
chown -R root:root "$cni_bin_dir"
CRI_TOOLS_RELEASE="v1.30.0"
CRI_TOOLS_RELEASE="v1.31.1"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
Expand All @@ -349,7 +349,7 @@ spec:
rm -f "$cri_tools_filename"
ln -sf "$opt_bin/crictl" "$usr_local_bin"/crictl || echo "symbolic link is skipped"
cd -
KUBE_VERSION="${KUBE_VERSION:-v1.30.0}"
KUBE_VERSION="${KUBE_VERSION:-v1.31.0}"
kube_dir="$opt_bin/kubernetes-$KUBE_VERSION"
kube_base_url="https://dl.k8s.io/$KUBE_VERSION/bin/linux/$arch"
kube_sum_file="$kube_dir/sha256"
Expand Down
Loading

0 comments on commit d21723f

Please sign in to comment.