Skip to content

Commit 1755deb

Browse files
ppaluckippalucki
committed
Update all dependecies from scrtach
1 parent 1823846 commit 1755deb

File tree

5 files changed

+255
-238
lines changed

5 files changed

+255
-238
lines changed

‎Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
### builder
16-
FROM golang:1.21.5-alpine3.19 AS builder
16+
FROM golang:1.22.1-alpine3.19 AS builder
1717

1818
WORKDIR /gardener-extension-cri-resmgr
1919
COPY go.mod .
@@ -42,13 +42,13 @@ ENTRYPOINT ["/gardener-extension-cri-resmgr"]
4242

4343

4444
### agnet and installation joined
45-
FROM debian:12.4 as gardener-extension-cri-resmgr-installation-and-agent
45+
FROM debian:12.5 as gardener-extension-cri-resmgr-installation-and-agent
4646

4747
WORKDIR /gardener-extension-cri-resmgr-installation-and-agent
4848
# Please keep this in sync with CRI_RM_VERSION from Makefile!
49-
COPY --from=intel/cri-resmgr-agent:v0.8.4 /bin/* /bin/
49+
COPY --from=intel/cri-resmgr-agent:v0.9.0 /bin/* /bin/
5050
COPY Makefile .
51-
RUN apt update && apt upgrade && apt --no-install-recommends -y install make=4.3-4.1 wget=1.21.3-1+b2 && apt-get clean && rm -rf /var/lib/apt/lists/*
51+
RUN apt update -y && apt upgrade -y && apt --no-install-recommends -y install make=4.3-4.1 wget=1.21.3-1+b2 && apt-get clean && rm -rf /var/lib/apt/lists/*
5252
RUN make _install-binaries
5353
RUN apt remove -y make wget && apt -y autoremove
5454

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ INSTALLATION_IMAGE_NAME := gardener-extension-cri-resmgr-installation-
2121
TAG := latest
2222

2323
# Please keep it up to date with agent image in charts/images.yaml
24-
CRI_RM_VERSION := 0.8.4
24+
CRI_RM_VERSION := 0.9.0
2525
CRI_RM_ARCHIVE_NAME := cri-resource-manager-$(CRI_RM_VERSION).x86_64.tar.gz
2626
CRI_RM_URL_RELEASE := https://github.com/intel/cri-resource-manager/releases/download/v$(CRI_RM_VERSION)/$(CRI_RM_ARCHIVE_NAME)
2727

‎UPDATE.md

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Update dependencies procedure
2+
3+
1. Update go language toolchain runtime (go directive will be based on that)
4+
5+
```sh
6+
wget https://go.dev/dl/go1.22.1.linux-amd64.tar.gz
7+
sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.1.linux-amd64.tar.gz
8+
go version
9+
```
10+
11+
Warning: gardener project doesn't work under 1.22+, please install 1.21.8 for E2E tests
12+
13+
```
14+
wget https://go.dev/dl/go1.21.8.linux-amd64.tar.gz
15+
sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.21.8.linux-amd64.tar.gz
16+
go version
17+
```
18+
19+
20+
2. Recreate go modules
21+
22+
rm go.mod go.sum
23+
24+
go mod init github.com/intel/gardener-extension-cri-resmgr
25+
go mod tidy
26+
27+
3. Update base images in Dockerfile
28+
29+
- builder image:
30+
31+
`FROM golang:1.22.1-alpine3.19 AS builder`
32+
33+
based on [golang images](https://hub.docker.com/_/golang`).
34+
35+
- installation image:
36+
37+
`FROM debian:12.5 as gardener-extension-cri-resmgr-installation-and-agent`
38+
39+
based on [debian images](https://hub.docker.com/_/debian).
40+
41+
42+
4. Update cri-resource-manager version in:
43+
44+
* Dockerfile:
45+
46+
`COPY --from=intel/cri-resmgr-agent:v0.9.0 /bin/* /bin/'
47+
48+
* Makefile:
49+
50+
`CRI_RM_VERSION=0.9.0`

‎go.mod

+57-91
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,66 @@
11
module github.com/intel/gardener-extension-cri-resmgr
22

3-
go 1.21
3+
go 1.22.0
44

5-
// TO BE REMOVED when concluded unnessesary ! :)
6-
// github.com/gardener/gardener-resource-manager/api => github.com/gardener/gardener-resource-manager/api v0.25.0
7-
// github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.12.1 // keep this value in sync with sigs.k8s.io/controller-runtime
8-
// k8s.io/api => k8s.io/api v0.24.3
9-
// k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.3
10-
// k8s.io/apimachinery => k8s.io/apimachinery v0.24.3
11-
// k8s.io/apiserver => k8s.io/apiserver v0.24.3
12-
// k8s.io/autoscaler => k8s.io/autoscaler v0.0.0-20220531185024-cc90d57b7fe1 // translates to k8s.io/autoscaler/vertical-pod-autoscaler@v0.11.0
13-
// k8s.io/autoscaler/vertical-pod-autoscaler => k8s.io/autoscaler/vertical-pod-autoscaler v0.11.0
14-
// k8s.io/client-go => k8s.io/client-go v0.24.3
15-
// k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.3
16-
// k8s.io/code-generator => k8s.io/code-generator v0.24.3
17-
// k8s.io/component-base => k8s.io/component-base v0.24.3
18-
// k8s.io/helm => k8s.io/helm v2.16.1+incompatible
19-
// k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.3
20-
// sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.12.1
21-
// github.com/go-logr/logr v1.2.4
22-
// github.com/golang/mock v1.6.0
23-
// github.com/onsi/ginkgo/v2 v2.13.0
24-
// github.com/onsi/gomega v1.29.0
25-
// github.com/spf13/cobra v1.7.0
26-
// k8s.io/api v0.28.3
27-
// k8s.io/apimachinery v0.28.3
28-
// k8s.io/client-go v0.28.3
29-
// k8s.io/klog/v2 v2.100.1
30-
// k8s.io/utils v0.0.0-20230505201702-9f6742963106
31-
// sigs.k8s.io/controller-runtime v0.16.3
32-
// github.com/intel/gardener-extension-cri-resmgr/pkg/imagevector v0.0.0-00010101000000-000000000000
33-
// github.com/intel/gardener-extension-cri-resmgr/charts v0.0.0-00010101000000-000000000000 // indirect
5+
toolchain go1.22.1
346

357
require (
36-
github.com/gardener/gardener v1.86.1
8+
github.com/gardener/gardener v1.90.4
379
github.com/go-logr/logr v1.4.1
38-
github.com/onsi/ginkgo/v2 v2.14.0
39-
github.com/onsi/gomega v1.30.0
10+
github.com/onsi/ginkgo/v2 v2.17.0
11+
github.com/onsi/gomega v1.32.0
4012
github.com/spf13/cobra v1.8.0
4113
go.uber.org/mock v0.4.0
42-
k8s.io/api v0.29.0
43-
k8s.io/apimachinery v0.29.0
44-
k8s.io/client-go v0.29.0
45-
k8s.io/klog/v2 v2.120.0
46-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
47-
sigs.k8s.io/controller-runtime v0.16.3
14+
k8s.io/api v0.29.3
15+
k8s.io/apimachinery v0.29.3
16+
k8s.io/client-go v0.29.3
17+
k8s.io/klog/v2 v2.120.1
18+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
19+
sigs.k8s.io/controller-runtime v0.17.2
4820
)
4921

5022
require (
51-
github.com/BurntSushi/toml v1.2.1 // indirect
23+
github.com/BurntSushi/toml v1.3.2 // indirect
5224
github.com/Masterminds/goutils v1.1.1 // indirect
53-
github.com/Masterminds/semver v1.5.0 // indirect
5425
github.com/Masterminds/semver/v3 v3.2.1 // indirect
55-
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
56-
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
26+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
5727
github.com/beorn7/perks v1.0.1 // indirect
5828
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5929
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
60-
github.com/davecgh/go-spew v1.1.1 // indirect
30+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6131
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
62-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
63-
github.com/fluent/fluent-operator/v2 v2.2.0 // indirect
64-
github.com/frankban/quicktest v1.14.5 // indirect
65-
github.com/fsnotify/fsnotify v1.6.0 // indirect
66-
github.com/gardener/etcd-druid v0.21.0 // indirect
32+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
33+
github.com/fluent/fluent-operator/v2 v2.7.0 // indirect
34+
github.com/fsnotify/fsnotify v1.7.0 // indirect
35+
github.com/gardener/etcd-druid v0.22.0 // indirect
6736
github.com/gardener/hvpa-controller/api v0.5.0 // indirect
68-
github.com/gardener/machine-controller-manager v0.50.0 // indirect
69-
github.com/ghodss/yaml v1.0.0 // indirect
70-
github.com/go-logr/zapr v1.2.4 // indirect
71-
github.com/go-openapi/errors v0.20.3 // indirect
37+
github.com/gardener/machine-controller-manager v0.52.0 // indirect
38+
github.com/go-logr/zapr v1.3.0 // indirect
39+
github.com/go-openapi/errors v0.20.4 // indirect
7240
github.com/go-openapi/jsonpointer v0.19.6 // indirect
7341
github.com/go-openapi/jsonreference v0.20.2 // indirect
7442
github.com/go-openapi/swag v0.22.3 // indirect
7543
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
7644
github.com/gobwas/glob v0.2.3 // indirect
7745
github.com/gogo/protobuf v1.3.2 // indirect
7846
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
79-
github.com/golang/protobuf v1.5.3 // indirect
47+
github.com/golang/protobuf v1.5.4 // indirect
8048
github.com/google/gnostic-models v0.6.8 // indirect
8149
github.com/google/go-cmp v0.6.0 // indirect
8250
github.com/google/gofuzz v1.2.0 // indirect
8351
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
84-
github.com/google/uuid v1.3.0 // indirect
52+
github.com/google/uuid v1.4.0 // indirect
8553
github.com/gorilla/websocket v1.5.0 // indirect
8654
github.com/hashicorp/errwrap v1.1.0 // indirect
8755
github.com/hashicorp/go-multierror v1.1.1 // indirect
88-
github.com/huandu/xstrings v1.3.2 // indirect
89-
github.com/imdario/mergo v0.3.12 // indirect
56+
github.com/huandu/xstrings v1.4.0 // indirect
57+
github.com/imdario/mergo v0.3.13 // indirect
9058
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9159
github.com/josharian/intern v1.0.0 // indirect
9260
github.com/json-iterator/go v1.1.12 // indirect
9361
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
9462
github.com/mailru/easyjson v0.7.7 // indirect
95-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
63+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
9664
github.com/mitchellh/copystructure v1.2.0 // indirect
9765
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
9866
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -102,49 +70,47 @@ require (
10270
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
10371
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
10472
github.com/pkg/errors v0.9.1 // indirect
105-
github.com/prometheus/client_golang v1.16.0 // indirect
106-
github.com/prometheus/client_model v0.4.0 // indirect
107-
github.com/prometheus/common v0.44.0 // indirect
108-
github.com/prometheus/procfs v0.10.1 // indirect
109-
github.com/shopspring/decimal v1.2.0 // indirect
110-
github.com/spf13/cast v1.5.1 // indirect
73+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.72.0 // indirect
74+
github.com/prometheus/client_golang v1.18.0 // indirect
75+
github.com/prometheus/client_model v0.5.0 // indirect
76+
github.com/prometheus/common v0.45.0 // indirect
77+
github.com/prometheus/procfs v0.12.0 // indirect
78+
github.com/shopspring/decimal v1.3.1 // indirect
79+
github.com/spf13/cast v1.6.0 // indirect
11180
github.com/spf13/pflag v1.0.5 // indirect
81+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
82+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
83+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
11284
go.uber.org/multierr v1.11.0 // indirect
113-
go.uber.org/zap v1.26.0 // indirect
114-
golang.org/x/crypto v0.17.0 // indirect
115-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
116-
golang.org/x/net v0.19.0 // indirect
117-
golang.org/x/oauth2 v0.10.0 // indirect
118-
golang.org/x/sys v0.15.0 // indirect
119-
golang.org/x/term v0.15.0 // indirect
85+
go.uber.org/zap v1.27.0 // indirect
86+
golang.org/x/crypto v0.20.0 // indirect
87+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
88+
golang.org/x/net v0.21.0 // indirect
89+
golang.org/x/oauth2 v0.15.0 // indirect
90+
golang.org/x/sys v0.17.0 // indirect
91+
golang.org/x/term v0.17.0 // indirect
12092
golang.org/x/text v0.14.0 // indirect
121-
golang.org/x/time v0.3.0 // indirect
122-
golang.org/x/tools v0.16.1 // indirect
93+
golang.org/x/time v0.5.0 // indirect
94+
golang.org/x/tools v0.17.0 // indirect
12395
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
12496
google.golang.org/appengine v1.6.7 // indirect
125-
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
126-
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
127-
google.golang.org/protobuf v1.31.0 // indirect
97+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
98+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
99+
google.golang.org/protobuf v1.33.0 // indirect
128100
gopkg.in/inf.v0 v0.9.1 // indirect
129101
gopkg.in/yaml.v2 v2.4.0 // indirect
130102
gopkg.in/yaml.v3 v3.0.1 // indirect
131-
istio.io/api v1.19.2-0.20231011000955-f3015ebb5bd4 // indirect
132-
istio.io/client-go v1.19.3 // indirect
133-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
103+
helm.sh/helm/v3 v3.14.2 // indirect
104+
istio.io/api v1.19.7-0.20240110022508-68cf4097ffc5 // indirect
105+
istio.io/client-go v1.19.7-0.20240110023605-ad5ce1f48b56 // indirect
106+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
134107
k8s.io/autoscaler/vertical-pod-autoscaler v1.0.0 // indirect
135-
k8s.io/component-base v0.28.3 // indirect
136-
k8s.io/helm v2.17.0+incompatible // indirect
137-
k8s.io/kube-aggregator v0.28.3 // indirect
108+
k8s.io/component-base v0.29.2 // indirect
109+
k8s.io/kube-aggregator v0.29.2 // indirect
138110
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
139-
k8s.io/kubelet v0.28.3 // indirect
140-
k8s.io/metrics v0.28.3 // indirect
111+
k8s.io/kubelet v0.29.2 // indirect
112+
k8s.io/metrics v0.29.2 // indirect
141113
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
142114
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
143-
sigs.k8s.io/yaml v1.3.0 // indirect
144-
)
145-
146-
replace (
147-
// Required for local development - remove before merging
148-
github.com/intel/gardener-extension-cri-resmgr/charts => ./charts
149-
github.com/intel/gardener-extension-cri-resmgr/pkg/imagevector => ./pkg/imagevector
115+
sigs.k8s.io/yaml v1.4.0 // indirect
150116
)

0 commit comments

Comments
 (0)