diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e8d4409f..9b6da970 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -58,7 +58,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.49.0 + version: v1.50.0 args: -v --timeout 5m build: diff --git a/Jenkinsfile b/Jenkinsfile index 3b215644..c7131103 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { GO111MODULE="on" REG="cloud-native-image-registry.westus.cloudapp.azure.com/" K8S_VERSION="1.25.0" - GOLANGCI_LINT_VERSION="v1.49.0" + GOLANGCI_LINT_VERSION="v1.50.0" GO_VERSION="1.19" GO_TAR="go${GO_VERSION}.linux-amd64.tar.gz" GOROOT="/usr/local/go" diff --git a/Makefile b/Makefile index 9ffb5c27..3dd72929 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ EXTRA_BUILD_ARGS ?= "" CERT_MANAGER_VERSION ?= v1.9.1 CONTROLLER_GEN_VERSION ?= v0.10.0 -GOLANGCI_LINT_VERSION ?= v1.49.0 +GOLANGCI_LINT_VERSION ?= v1.50.0 KIND_VERSION ?= v0.16.0 GOLICENSES_VERSION ?= v1.4.0 # Current Operator version diff --git a/go.mod b/go.mod index 8fc1ea2b..2cb67cf1 100644 --- a/go.mod +++ b/go.mod @@ -15,13 +15,13 @@ require ( golang.org/x/sys v0.0.0-20220908164124-27713097b956 golang.org/x/text v0.3.8 google.golang.org/grpc v1.50.0 - k8s.io/api v0.25.2 - k8s.io/apimachinery v0.25.2 + k8s.io/api v0.25.3 + k8s.io/apimachinery v0.25.3 k8s.io/client-go v1.5.2 - k8s.io/component-base v0.25.2 + k8s.io/component-base v0.25.3 k8s.io/klog/v2 v2.70.1 - k8s.io/kubelet v1.25.2 - k8s.io/kubernetes v1.25.2 + k8s.io/kubelet v1.25.3 + k8s.io/kubernetes v1.25.3 k8s.io/pod-security-admission v0.0.0 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed sigs.k8s.io/controller-runtime v0.13.0 @@ -91,42 +91,42 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect - k8s.io/apiserver v0.25.2 // indirect - k8s.io/component-helpers v0.25.2 // indirect + k8s.io/apiserver v0.25.3 // indirect + k8s.io/component-helpers v0.25.3 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/kubectl v0.0.0 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) replace ( - k8s.io/api => k8s.io/api v0.25.2 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.2 - k8s.io/apimachinery => k8s.io/apimachinery v0.25.3-rc.0 - k8s.io/apiserver => k8s.io/apiserver v0.25.2 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.2 - k8s.io/client-go => k8s.io/client-go v0.25.2 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.2 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.2 - k8s.io/code-generator => k8s.io/code-generator v0.25.3-rc.0 - k8s.io/component-base => k8s.io/component-base v0.25.2 - k8s.io/component-helpers => k8s.io/component-helpers v0.25.2 - k8s.io/controller-manager => k8s.io/controller-manager v0.25.2 - k8s.io/cri-api => k8s.io/cri-api v0.25.3-rc.0 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.2 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.2 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.2 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.2 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.2 - k8s.io/kubectl => k8s.io/kubectl v0.25.2 - k8s.io/kubelet => k8s.io/kubelet v0.25.2 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.2 - k8s.io/metrics => k8s.io/metrics v0.25.2 - k8s.io/mount-utils => k8s.io/mount-utils v0.25.3-rc.0 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.2 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.2 - k8s.io/sample-controller => k8s.io/sample-controller v0.25.2 + k8s.io/api => k8s.io/api v0.25.3 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3 + k8s.io/apimachinery => k8s.io/apimachinery v0.25.4-rc.0 + k8s.io/apiserver => k8s.io/apiserver v0.25.3 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3 + k8s.io/client-go => k8s.io/client-go v0.25.3 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.3 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.3 + k8s.io/code-generator => k8s.io/code-generator v0.25.4-rc.0 + k8s.io/component-base => k8s.io/component-base v0.25.3 + k8s.io/component-helpers => k8s.io/component-helpers v0.25.3 + k8s.io/controller-manager => k8s.io/controller-manager v0.25.3 + k8s.io/cri-api => k8s.io/cri-api v0.25.4-rc.0 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.3 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.3 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.3 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.3 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.3 + k8s.io/kubectl => k8s.io/kubectl v0.25.3 + k8s.io/kubelet => k8s.io/kubelet v0.25.3 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.3 + k8s.io/metrics => k8s.io/metrics v0.25.3 + k8s.io/mount-utils => k8s.io/mount-utils v0.25.4-rc.0 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.3 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.3 + k8s.io/sample-controller => k8s.io/sample-controller v0.25.3 ) -replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.2 +replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.3 diff --git a/go.sum b/go.sum index ae59bfd3..b9a2592f 100644 --- a/go.sum +++ b/go.sum @@ -306,8 +306,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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 go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= 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 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.25.2 h1:v6G8RyFcwf0HR5jQGIAYlvtRNrxMJQG1xJzaSeVnIS8= -k8s.io/api v0.25.2/go.mod h1:qP1Rn4sCVFwx/xIhe+we2cwBLTXNcheRyYXwajonhy0= -k8s.io/apiextensions-apiserver v0.25.2 h1:8uOQX17RE7XL02ngtnh3TgifY7EhekpK+/piwzQNnBo= -k8s.io/apiextensions-apiserver v0.25.2/go.mod h1:iRwwRDlWPfaHhuBfQ0WMa5skdQfrE18QXJaJvIDLvE8= -k8s.io/apimachinery v0.25.3-rc.0 h1:nhztVhLsZuw2xENfIrVXcsNUiemnlH/r+Bb8hbl/1gA= -k8s.io/apimachinery v0.25.3-rc.0/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA= -k8s.io/apiserver v0.25.2 h1:YePimobk187IMIdnmsMxsfIbC5p4eX3WSOrS9x6FEYw= -k8s.io/apiserver v0.25.2/go.mod h1:30r7xyQTREWCkG2uSjgjhQcKVvAAlqoD+YyrqR6Cn+I= -k8s.io/client-go v0.25.2 h1:SUPp9p5CwM0yXGQrwYurw9LWz+YtMwhWd0GqOsSiefo= -k8s.io/client-go v0.25.2/go.mod h1:i7cNU7N+yGQmJkewcRD2+Vuj4iz7b30kI8OcL3horQ4= -k8s.io/component-base v0.25.2 h1:Nve/ZyHLUBHz1rqwkjXm/Re6IniNa5k7KgzxZpTfSQY= -k8s.io/component-base v0.25.2/go.mod h1:90W21YMr+Yjg7MX+DohmZLzjsBtaxQDDwaX4YxDkl60= -k8s.io/component-helpers v0.25.2 h1:A4xQEFq7tbnhB3CTwZTLcQtyEhFFZN2TyQjNgziuSEI= -k8s.io/component-helpers v0.25.2/go.mod h1:iuyfZG2jGWYvR5F/yGFUYNdL/IFz2smcwpNaOqP+YNM= +k8s.io/api v0.25.3 h1:Q1v5UFfYe87vi5H7NU0p4RXC26PPMT8KOpr1TLQbCMQ= +k8s.io/api v0.25.3/go.mod h1:o42gKscFrEVjHdQnyRenACrMtbuJsVdP+WVjqejfzmI= +k8s.io/apiextensions-apiserver v0.25.3 h1:bfI4KS31w2f9WM1KLGwnwuVlW3RSRPuIsfNF/3HzR0k= +k8s.io/apiextensions-apiserver v0.25.3/go.mod h1:ZJqwpCkxIx9itilmZek7JgfUAM0dnTsA48I4krPqRmo= +k8s.io/apimachinery v0.25.4-rc.0 h1:UT6bguD+eHoAZRxI/A7EIhMjkmnRvsINLWPOV1CbH94= +k8s.io/apimachinery v0.25.4-rc.0/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= +k8s.io/apiserver v0.25.3 h1:m7+xGuG5+KYAnEsqaFtDyWMkmMMEOFYlu+NlWv5qSBI= +k8s.io/apiserver v0.25.3/go.mod h1:9bT47iM2fzRuhICJpM/RcQR9sqDDfZ7Yw60h0p3JW08= +k8s.io/client-go v0.25.3 h1:oB4Dyl8d6UbfDHD8Bv8evKylzs3BXzzufLiO27xuPs0= +k8s.io/client-go v0.25.3/go.mod h1:t39LPczAIMwycjcXkVc+CB+PZV69jQuNx4um5ORDjQA= +k8s.io/component-base v0.25.3 h1:UrsxciGdrCY03ULT1h/S/gXFCOPnLhUVwSyx+hM/zq4= +k8s.io/component-base v0.25.3/go.mod h1:WYoS8L+IlTZgU7rhAl5Ctpw0WdMxDfCC5dkxcEFa/TI= +k8s.io/component-helpers v0.25.3 h1:Ldwi2U50KohMVDKBcVT3zDpIOKFP4bPEy/4Dj4NsoYU= +k8s.io/component-helpers v0.25.3/go.mod h1:yu9zgPm9pf5jpmUzOZA9PMHY16Eu8ymt8AnSL0Xwbgw= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/kubectl v0.25.2 h1:2993lTeVimxKSWx/7z2PiJxUILygRa3tmC4QhFaeioA= -k8s.io/kubectl v0.25.2/go.mod h1:eoBGJtKUj7x38KXelz+dqVtbtbKwCqyKzJWmBHU0prg= -k8s.io/kubelet v0.25.2 h1:L0PXLc2kTfIf6bm+wv4/1dIWwgXWDRTxTErxqFR4nqc= -k8s.io/kubelet v0.25.2/go.mod h1:/ASc/pglUA3TeRMG4hRKSjTa7arT0D6yqLzwqSxwMlY= -k8s.io/kubernetes v1.25.2 h1:khlfsw0tr0YIbs0fs4uNAy4TcQJuBwhjpyHpkrCNWvs= -k8s.io/kubernetes v1.25.2/go.mod h1:OlhMy4mww2SLr1KtdV1vC014/MwfYlts/C66gtnDkKE= -k8s.io/pod-security-admission v0.25.2 h1:sR3cU0fkfPQIXYIZllukBjLu8iElRl8R0Bskxsi15EU= -k8s.io/pod-security-admission v0.25.2/go.mod h1:v3wLmYecYm4nJB/w2Qu2jBcmI3OaMwsUmcks7vibDnA= +k8s.io/kubectl v0.25.3 h1:HnWJziEtmsm4JaJiKT33kG0kadx68MXxUE8UEbXnN4U= +k8s.io/kubectl v0.25.3/go.mod h1:glU7PiVj/R6Ud4A9FJdTcJjyzOtCJyc0eO7Mrbh3jlI= +k8s.io/kubelet v0.25.3 h1:PjT3Xo0VL1BpRilBpZrRN8pSy6w5pGQ0YDQQeQWSHvQ= +k8s.io/kubelet v0.25.3/go.mod h1:YopVc6vLhveZb22I7AzcoWPap+t3/KJKqRZDa2MZmyE= +k8s.io/kubernetes v1.25.3 h1:Ljx/Ew9+dt7rN9ob3V+N/aoDy7nDSbmr35IbYGRTyqE= +k8s.io/kubernetes v1.25.3/go.mod h1:lvEY+3iJhh+sGIK1LorGkI56rW0eLGsfalnp68wQwYU= +k8s.io/pod-security-admission v0.25.3 h1:2HnXWKUIDSez2sWtvxeGgGVUFvYnJJHutL4AI1MIuwk= +k8s.io/pod-security-admission v0.25.3/go.mod h1:xSaLkcMPD6cGKrZ//ZUrCNs0BewZzQdOEcC9LuXBGR4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= 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/apiserver-network-proxy/konnectivity-client v0.0.32 h1:2WjukG7txtEsbXsSKWtTibCdsyYAhcu6KFnttyDdZOQ= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 h1:LYqFq+6Cj2D0gFfrJvL7iElD4ET6ir3VDdhDdTK7rgc= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0= sigs.k8s.io/controller-runtime v0.13.0 h1:iqa5RNciy7ADWnIc8QxCbOX5FEKVR3uxVxKHRMc2WIQ= sigs.k8s.io/controller-runtime v0.13.0/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=