Skip to content

Commit b690ca3

Browse files
authored
Merge pull request #1209 from mythi/PR-2022-073
version updates
2 parents 850fd78 + 69435f4 commit b690ca3

File tree

5 files changed

+64
-64
lines changed

5 files changed

+64
-64
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: golangci-lint
5959
uses: golangci/golangci-lint-action@v3
6060
with:
61-
version: v1.49.0
61+
version: v1.50.0
6262
args: -v --timeout 5m
6363

6464
build:

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pipeline {
99
GO111MODULE="on"
1010
REG="cloud-native-image-registry.westus.cloudapp.azure.com/"
1111
K8S_VERSION="1.25.0"
12-
GOLANGCI_LINT_VERSION="v1.49.0"
12+
GOLANGCI_LINT_VERSION="v1.50.0"
1313
GO_VERSION="1.19"
1414
GO_TAR="go${GO_VERSION}.linux-amd64.tar.gz"
1515
GOROOT="/usr/local/go"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ EXTRA_BUILD_ARGS ?= ""
1010

1111
CERT_MANAGER_VERSION ?= v1.9.1
1212
CONTROLLER_GEN_VERSION ?= v0.10.0
13-
GOLANGCI_LINT_VERSION ?= v1.49.0
13+
GOLANGCI_LINT_VERSION ?= v1.50.0
1414
KIND_VERSION ?= v0.16.0
1515
GOLICENSES_VERSION ?= v1.4.0
1616
# Current Operator version

go.mod

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ require (
1515
golang.org/x/sys v0.0.0-20220908164124-27713097b956
1616
golang.org/x/text v0.3.8
1717
google.golang.org/grpc v1.50.0
18-
k8s.io/api v0.25.2
19-
k8s.io/apimachinery v0.25.2
18+
k8s.io/api v0.25.3
19+
k8s.io/apimachinery v0.25.3
2020
k8s.io/client-go v1.5.2
21-
k8s.io/component-base v0.25.2
21+
k8s.io/component-base v0.25.3
2222
k8s.io/klog/v2 v2.70.1
23-
k8s.io/kubelet v1.25.2
24-
k8s.io/kubernetes v1.25.2
23+
k8s.io/kubelet v1.25.3
24+
k8s.io/kubernetes v1.25.3
2525
k8s.io/pod-security-admission v0.0.0
2626
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
2727
sigs.k8s.io/controller-runtime v0.13.0
@@ -91,42 +91,42 @@ require (
9191
gopkg.in/yaml.v2 v2.4.0 // indirect
9292
gopkg.in/yaml.v3 v3.0.1 // indirect
9393
k8s.io/apiextensions-apiserver v0.25.0 // indirect
94-
k8s.io/apiserver v0.25.2 // indirect
95-
k8s.io/component-helpers v0.25.2 // indirect
94+
k8s.io/apiserver v0.25.3 // indirect
95+
k8s.io/component-helpers v0.25.3 // indirect
9696
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
9797
k8s.io/kubectl v0.0.0 // indirect
98-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
98+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
9999
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
100100
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
101101
)
102102

103103
replace (
104-
k8s.io/api => k8s.io/api v0.25.2
105-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.2
106-
k8s.io/apimachinery => k8s.io/apimachinery v0.25.3-rc.0
107-
k8s.io/apiserver => k8s.io/apiserver v0.25.2
108-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.2
109-
k8s.io/client-go => k8s.io/client-go v0.25.2
110-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.2
111-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.2
112-
k8s.io/code-generator => k8s.io/code-generator v0.25.3-rc.0
113-
k8s.io/component-base => k8s.io/component-base v0.25.2
114-
k8s.io/component-helpers => k8s.io/component-helpers v0.25.2
115-
k8s.io/controller-manager => k8s.io/controller-manager v0.25.2
116-
k8s.io/cri-api => k8s.io/cri-api v0.25.3-rc.0
117-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.2
118-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.2
119-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.2
120-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.2
121-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.2
122-
k8s.io/kubectl => k8s.io/kubectl v0.25.2
123-
k8s.io/kubelet => k8s.io/kubelet v0.25.2
124-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.2
125-
k8s.io/metrics => k8s.io/metrics v0.25.2
126-
k8s.io/mount-utils => k8s.io/mount-utils v0.25.3-rc.0
127-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.2
128-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.2
129-
k8s.io/sample-controller => k8s.io/sample-controller v0.25.2
104+
k8s.io/api => k8s.io/api v0.25.3
105+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3
106+
k8s.io/apimachinery => k8s.io/apimachinery v0.25.4-rc.0
107+
k8s.io/apiserver => k8s.io/apiserver v0.25.3
108+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3
109+
k8s.io/client-go => k8s.io/client-go v0.25.3
110+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.3
111+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.3
112+
k8s.io/code-generator => k8s.io/code-generator v0.25.4-rc.0
113+
k8s.io/component-base => k8s.io/component-base v0.25.3
114+
k8s.io/component-helpers => k8s.io/component-helpers v0.25.3
115+
k8s.io/controller-manager => k8s.io/controller-manager v0.25.3
116+
k8s.io/cri-api => k8s.io/cri-api v0.25.4-rc.0
117+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.3
118+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.3
119+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.3
120+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.3
121+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.3
122+
k8s.io/kubectl => k8s.io/kubectl v0.25.3
123+
k8s.io/kubelet => k8s.io/kubelet v0.25.3
124+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.3
125+
k8s.io/metrics => k8s.io/metrics v0.25.3
126+
k8s.io/mount-utils => k8s.io/mount-utils v0.25.4-rc.0
127+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.3
128+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.3
129+
k8s.io/sample-controller => k8s.io/sample-controller v0.25.3
130130
)
131131

132-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.2
132+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.3

go.sum

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
306306
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
307307
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
308308
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
309-
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
310309
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
310+
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
311311
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
312312
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
313313
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -340,7 +340,7 @@ go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16g
340340
go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8=
341341
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
342342
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
343-
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
343+
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
344344
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
345345
go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
346346
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -662,40 +662,40 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
662662
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
663663
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
664664
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
665-
k8s.io/api v0.25.2 h1:v6G8RyFcwf0HR5jQGIAYlvtRNrxMJQG1xJzaSeVnIS8=
666-
k8s.io/api v0.25.2/go.mod h1:qP1Rn4sCVFwx/xIhe+we2cwBLTXNcheRyYXwajonhy0=
667-
k8s.io/apiextensions-apiserver v0.25.2 h1:8uOQX17RE7XL02ngtnh3TgifY7EhekpK+/piwzQNnBo=
668-
k8s.io/apiextensions-apiserver v0.25.2/go.mod h1:iRwwRDlWPfaHhuBfQ0WMa5skdQfrE18QXJaJvIDLvE8=
669-
k8s.io/apimachinery v0.25.3-rc.0 h1:nhztVhLsZuw2xENfIrVXcsNUiemnlH/r+Bb8hbl/1gA=
670-
k8s.io/apimachinery v0.25.3-rc.0/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA=
671-
k8s.io/apiserver v0.25.2 h1:YePimobk187IMIdnmsMxsfIbC5p4eX3WSOrS9x6FEYw=
672-
k8s.io/apiserver v0.25.2/go.mod h1:30r7xyQTREWCkG2uSjgjhQcKVvAAlqoD+YyrqR6Cn+I=
673-
k8s.io/client-go v0.25.2 h1:SUPp9p5CwM0yXGQrwYurw9LWz+YtMwhWd0GqOsSiefo=
674-
k8s.io/client-go v0.25.2/go.mod h1:i7cNU7N+yGQmJkewcRD2+Vuj4iz7b30kI8OcL3horQ4=
675-
k8s.io/component-base v0.25.2 h1:Nve/ZyHLUBHz1rqwkjXm/Re6IniNa5k7KgzxZpTfSQY=
676-
k8s.io/component-base v0.25.2/go.mod h1:90W21YMr+Yjg7MX+DohmZLzjsBtaxQDDwaX4YxDkl60=
677-
k8s.io/component-helpers v0.25.2 h1:A4xQEFq7tbnhB3CTwZTLcQtyEhFFZN2TyQjNgziuSEI=
678-
k8s.io/component-helpers v0.25.2/go.mod h1:iuyfZG2jGWYvR5F/yGFUYNdL/IFz2smcwpNaOqP+YNM=
665+
k8s.io/api v0.25.3 h1:Q1v5UFfYe87vi5H7NU0p4RXC26PPMT8KOpr1TLQbCMQ=
666+
k8s.io/api v0.25.3/go.mod h1:o42gKscFrEVjHdQnyRenACrMtbuJsVdP+WVjqejfzmI=
667+
k8s.io/apiextensions-apiserver v0.25.3 h1:bfI4KS31w2f9WM1KLGwnwuVlW3RSRPuIsfNF/3HzR0k=
668+
k8s.io/apiextensions-apiserver v0.25.3/go.mod h1:ZJqwpCkxIx9itilmZek7JgfUAM0dnTsA48I4krPqRmo=
669+
k8s.io/apimachinery v0.25.4-rc.0 h1:UT6bguD+eHoAZRxI/A7EIhMjkmnRvsINLWPOV1CbH94=
670+
k8s.io/apimachinery v0.25.4-rc.0/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo=
671+
k8s.io/apiserver v0.25.3 h1:m7+xGuG5+KYAnEsqaFtDyWMkmMMEOFYlu+NlWv5qSBI=
672+
k8s.io/apiserver v0.25.3/go.mod h1:9bT47iM2fzRuhICJpM/RcQR9sqDDfZ7Yw60h0p3JW08=
673+
k8s.io/client-go v0.25.3 h1:oB4Dyl8d6UbfDHD8Bv8evKylzs3BXzzufLiO27xuPs0=
674+
k8s.io/client-go v0.25.3/go.mod h1:t39LPczAIMwycjcXkVc+CB+PZV69jQuNx4um5ORDjQA=
675+
k8s.io/component-base v0.25.3 h1:UrsxciGdrCY03ULT1h/S/gXFCOPnLhUVwSyx+hM/zq4=
676+
k8s.io/component-base v0.25.3/go.mod h1:WYoS8L+IlTZgU7rhAl5Ctpw0WdMxDfCC5dkxcEFa/TI=
677+
k8s.io/component-helpers v0.25.3 h1:Ldwi2U50KohMVDKBcVT3zDpIOKFP4bPEy/4Dj4NsoYU=
678+
k8s.io/component-helpers v0.25.3/go.mod h1:yu9zgPm9pf5jpmUzOZA9PMHY16Eu8ymt8AnSL0Xwbgw=
679679
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
680680
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
681681
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
682682
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA=
683683
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
684-
k8s.io/kubectl v0.25.2 h1:2993lTeVimxKSWx/7z2PiJxUILygRa3tmC4QhFaeioA=
685-
k8s.io/kubectl v0.25.2/go.mod h1:eoBGJtKUj7x38KXelz+dqVtbtbKwCqyKzJWmBHU0prg=
686-
k8s.io/kubelet v0.25.2 h1:L0PXLc2kTfIf6bm+wv4/1dIWwgXWDRTxTErxqFR4nqc=
687-
k8s.io/kubelet v0.25.2/go.mod h1:/ASc/pglUA3TeRMG4hRKSjTa7arT0D6yqLzwqSxwMlY=
688-
k8s.io/kubernetes v1.25.2 h1:khlfsw0tr0YIbs0fs4uNAy4TcQJuBwhjpyHpkrCNWvs=
689-
k8s.io/kubernetes v1.25.2/go.mod h1:OlhMy4mww2SLr1KtdV1vC014/MwfYlts/C66gtnDkKE=
690-
k8s.io/pod-security-admission v0.25.2 h1:sR3cU0fkfPQIXYIZllukBjLu8iElRl8R0Bskxsi15EU=
691-
k8s.io/pod-security-admission v0.25.2/go.mod h1:v3wLmYecYm4nJB/w2Qu2jBcmI3OaMwsUmcks7vibDnA=
684+
k8s.io/kubectl v0.25.3 h1:HnWJziEtmsm4JaJiKT33kG0kadx68MXxUE8UEbXnN4U=
685+
k8s.io/kubectl v0.25.3/go.mod h1:glU7PiVj/R6Ud4A9FJdTcJjyzOtCJyc0eO7Mrbh3jlI=
686+
k8s.io/kubelet v0.25.3 h1:PjT3Xo0VL1BpRilBpZrRN8pSy6w5pGQ0YDQQeQWSHvQ=
687+
k8s.io/kubelet v0.25.3/go.mod h1:YopVc6vLhveZb22I7AzcoWPap+t3/KJKqRZDa2MZmyE=
688+
k8s.io/kubernetes v1.25.3 h1:Ljx/Ew9+dt7rN9ob3V+N/aoDy7nDSbmr35IbYGRTyqE=
689+
k8s.io/kubernetes v1.25.3/go.mod h1:lvEY+3iJhh+sGIK1LorGkI56rW0eLGsfalnp68wQwYU=
690+
k8s.io/pod-security-admission v0.25.3 h1:2HnXWKUIDSez2sWtvxeGgGVUFvYnJJHutL4AI1MIuwk=
691+
k8s.io/pod-security-admission v0.25.3/go.mod h1:xSaLkcMPD6cGKrZ//ZUrCNs0BewZzQdOEcC9LuXBGR4=
692692
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
693693
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
694694
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
695695
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
696696
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
697-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 h1:2WjukG7txtEsbXsSKWtTibCdsyYAhcu6KFnttyDdZOQ=
698-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
697+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 h1:LYqFq+6Cj2D0gFfrJvL7iElD4ET6ir3VDdhDdTK7rgc=
698+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0=
699699
sigs.k8s.io/controller-runtime v0.13.0 h1:iqa5RNciy7ADWnIc8QxCbOX5FEKVR3uxVxKHRMc2WIQ=
700700
sigs.k8s.io/controller-runtime v0.13.0/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
701701
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

0 commit comments

Comments
 (0)