From f7d5fe729e50424bfa44642101c081db9d5b285b Mon Sep 17 00:00:00 2001 From: Jonathan Yu Date: Tue, 21 Sep 2021 11:15:40 +0000 Subject: [PATCH 1/2] chore: update kubernetes deps from 0.19.4 to 0.19.5 * Update Kubernetes libraries from 0.19.4 to 0.19.5 * Configure dependabot to ignore major and minor releases for k8s.io/kubectl, as we upgrade everything in coordination with our Kubernetes version support strategy * Add k8s.io/kubectl to recommended in gomodguard --- .github/dependabot.yml | 4 ++++ .golangci.yml | 7 +++++++ go.mod | 8 ++++---- go.sum | 24 ++++++++++++------------ 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ba93873..efa6667 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -40,6 +40,10 @@ updates: update-types: - version-update:semver-major - version-update:semver-minor + - dependency-name: k8s.io/kubectl + update-types: + - version-update:semver-major + - version-update:semver-minor - dependency-name: k8s.io/metrics update-types: - version-update:semver-major diff --git a/.golangci.yml b/.golangci.yml index 457fa69..e4f2f60 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -13,6 +13,7 @@ linters-settings: - k8s.io/api - k8s.io/apimachinery - k8s.io/client-go + - k8s.io/kubectl - k8s.io/metrics - k8s.io/utils reason: >- @@ -39,6 +40,12 @@ linters-settings: Coder commits to supporting the newest patch release of the two prior minor releases and current release. For details, see https://www.notion.so/Kubernetes-version-support-strategy-82ecd5c9761e411e9dab61a7a1484418 + - k8s.io/kubectl: + version: "< 0.19 || > 0.20" + reason: >- + Coder commits to supporting the newest patch release of the + two prior minor releases and current release. For details, see + https://www.notion.so/Kubernetes-version-support-strategy-82ecd5c9761e411e9dab61a7a1484418 - k8s.io/metrics: version: "< 0.19 || > 0.20" reason: >- diff --git a/go.mod b/go.mod index a0512a5..9035c70 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/fatih/color v1.12.0 github.com/spf13/cobra v1.2.1 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 - k8s.io/api v0.19.14 - k8s.io/apimachinery v0.19.14 - k8s.io/client-go v0.19.14 + k8s.io/api v0.19.15 + k8s.io/apimachinery v0.19.15 + k8s.io/client-go v0.19.15 k8s.io/klog/v2 v2.10.0 // indirect - k8s.io/kubectl v0.19.14 + k8s.io/kubectl v0.19.15 ) diff --git a/go.sum b/go.sum index 3defb19..98beb13 100644 --- a/go.sum +++ b/go.sum @@ -852,15 +852,15 @@ 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.19.14 h1:P1TzVeuLsnKbp+LTtIa5IyEtSnU0yj4LqiKKRp1NU9Y= -k8s.io/api v0.19.14/go.mod h1:5IAteKHunZAtX2SeMM705TybJtUDVhUKJj2atAuT4rQ= -k8s.io/apimachinery v0.19.14 h1:AxDxCm6P0xR45VfPjO2BVDGfjRWZ4GMdcib8aoG2rxI= -k8s.io/apimachinery v0.19.14/go.mod h1:RMyblyny2ZcDQ/oVE+lC31u7XTHUaSXEK2IhgtwGxfc= -k8s.io/cli-runtime v0.19.14/go.mod h1:obUy3c6PnZOUt/PXQOjn12y2FLoxnZUTNB8JV6VJoHI= -k8s.io/client-go v0.19.14 h1:D3V4mC6lQN3ZaABhOznxZXSsxMR5cdChjeMP4/pY4H8= -k8s.io/client-go v0.19.14/go.mod h1:iWwXK/etTTPyssCycvgdQ9d6i0k93HXLtksUQ6A67WE= -k8s.io/code-generator v0.19.14/go.mod h1:ADrDvaUQWGn4a8lX0ONtzb7uFmDRQOMSYIMk1qWIAx8= -k8s.io/component-base v0.19.14/go.mod h1:dkf3fsrikjDxMMlYHpOGtCbkuLGtoojXmBX0L8FAyUA= +k8s.io/api v0.19.15 h1:i22aQYrQ9gaBHEAS9XvyR5ZfrTDAd+Q+JwWM+xIBv30= +k8s.io/api v0.19.15/go.mod h1:rMRWjnIJQmurd/FdLobht6dCSbJQ+UDpyOwPaoFS7lI= +k8s.io/apimachinery v0.19.15 h1:P37ni6/yFxRMrqgM75k/vt5xq9vnNiR3rJPTmWXrNho= +k8s.io/apimachinery v0.19.15/go.mod h1:RMyblyny2ZcDQ/oVE+lC31u7XTHUaSXEK2IhgtwGxfc= +k8s.io/cli-runtime v0.19.15/go.mod h1:/Q88OJOwmmNScAhuVl6/sWLwUHA/ZcHLx+xOZTc6/Mo= +k8s.io/client-go v0.19.15 h1:lDBvFBjDIExh0mFS6JbG+5B7ghuPhqXjBzlaxG81ToU= +k8s.io/client-go v0.19.15/go.mod h1:OJMQWgHQJRDtO2BVtpkHUQOq/e5WHpXc02lSdPI0S/k= +k8s.io/code-generator v0.19.15/go.mod h1:ADrDvaUQWGn4a8lX0ONtzb7uFmDRQOMSYIMk1qWIAx8= +k8s.io/component-base v0.19.15/go.mod h1:ef4XsJKwByOprOcXNXLK9plTUCc4sQgc+SKFHudFKnA= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -869,9 +869,9 @@ k8s.io/klog/v2 v2.10.0 h1:R2HDMDJsHVTHA2n4RjwbeYXdOcBymXdX/JRb1v0VGhE= k8s.io/klog/v2 v2.10.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= -k8s.io/kubectl v0.19.14 h1:rD29ka9MY4tTGXC584a+kl7y0zA6T5XhIJ5vj1iQP2Q= -k8s.io/kubectl v0.19.14/go.mod h1:e1wReuwCVS2kbxli1Ncz6Ia6DQ8Bvp4mxj/j0G+QDKg= -k8s.io/metrics v0.19.14/go.mod h1:0lhJMMjYpGozExXi3/uCPpladC/XQugUgh/PS5ciEu4= +k8s.io/kubectl v0.19.15 h1:Wz1/vZcvwvRPTZB0twdZed7mvc4muc5ClM1CAD9JRKc= +k8s.io/kubectl v0.19.15/go.mod h1:NwVasz7la1/yGmuz9dUNlooN6x1TVos4ARdKoWBclUM= +k8s.io/metrics v0.19.15/go.mod h1:xHMgIwqMBSRW+tQ+R1zc21iahbqd0OQpXk20inwVW1c= k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From eaa8de904b8f05f8277a9732c9f15d67ed4a6420 Mon Sep 17 00:00:00 2001 From: Jonathan Yu Date: Tue, 21 Sep 2021 11:38:33 +0000 Subject: [PATCH 2/2] link to official docs --- .github/dependabot.yml | 2 +- .golangci.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index efa6667..a969005 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -27,7 +27,7 @@ updates: ignore: # Ignore major and minor updates to Kubernetes packages, as we # manage these versions manually according to our version policy: - # https://www.notion.so/coderhq/Kubernetes-version-support-strategy-82ecd5c9761e411e9dab61a7a1484418 + # https://coder.com/docs/coder/latest/setup/kubernetes#supported-kubernetes-versions - dependency-name: k8s.io/api update-types: - version-update:semver-major diff --git a/.golangci.yml b/.golangci.yml index e4f2f60..a9605f5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -27,31 +27,31 @@ linters-settings: reason: >- Coder commits to supporting the newest patch release of the two prior minor releases and current release. For details, see - https://www.notion.so/Kubernetes-version-support-strategy-82ecd5c9761e411e9dab61a7a1484418 + https://coder.com/docs/coder/latest/setup/kubernetes#supported-kubernetes-versions - k8s.io/apimachinery: version: "< 0.19 || > 0.20" reason: >- Coder commits to supporting the newest patch release of the two prior minor releases and current release. For details, see - https://www.notion.so/Kubernetes-version-support-strategy-82ecd5c9761e411e9dab61a7a1484418 + https://coder.com/docs/coder/latest/setup/kubernetes#supported-kubernetes-versions - k8s.io/client-go: version: "< 0.19 || > 0.20" reason: >- Coder commits to supporting the newest patch release of the two prior minor releases and current release. For details, see - https://www.notion.so/Kubernetes-version-support-strategy-82ecd5c9761e411e9dab61a7a1484418 + https://coder.com/docs/coder/latest/setup/kubernetes#supported-kubernetes-versions - k8s.io/kubectl: version: "< 0.19 || > 0.20" reason: >- Coder commits to supporting the newest patch release of the two prior minor releases and current release. For details, see - https://www.notion.so/Kubernetes-version-support-strategy-82ecd5c9761e411e9dab61a7a1484418 + https://coder.com/docs/coder/latest/setup/kubernetes#supported-kubernetes-versions - k8s.io/metrics: version: "< 0.19 || > 0.20" reason: >- Coder commits to supporting the newest patch release of the two prior minor releases and current release. For details, see - https://www.notion.so/Kubernetes-version-support-strategy-82ecd5c9761e411e9dab61a7a1484418 + https://coder.com/docs/coder/latest/setup/kubernetes#supported-kubernetes-versions local_replace_directives: true importas: