Skip to content

Commit 95864a0

Browse files
rawmind0rawmind0
authored
Merge pull request #773 from rawmind0/rancher26
Updated go modules and acceptance tests to support rancher v2.6.1
2 parents c0cf425 + 00884ae commit 95864a0

5 files changed

Lines changed: 24 additions & 23 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.21.0 (Unreleased)
1+
## 1.21.0 (October 18, 2021)
22

33
FEATURES:
44

@@ -29,6 +29,7 @@ FEATURES:
2929

3030
ENHANCEMENTS:
3131

32+
* Updated go modules and acceptance tests to support rancher v2.6.1
3233
* Updated `waitForRancherLocalActive` function to allow `rancher2_bootstrap` works when using Rancher [restricted-admin](https://rancher.com/docs/rancher/v2.6/en/admin-settings/rbac/global-permissions/#restricted-admin) at Rancher 2.6.x
3334
* Updated `rancher2_cluster.aks_config_v2` schema and structure to fix aks cluster import errors https://github.com/rancher/terraform-provider-rancher2/issues/757 https://github.com/rancher/terraform-provider-rancher2/issues/771
3435

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ require (
77
github.com/hashicorp/go-version v1.2.0
88
github.com/hashicorp/terraform-plugin-sdk v1.14.0
99
github.com/rancher/norman v0.0.0-20210608202517-59b3523c3133
10-
github.com/rancher/rancher v0.0.0-20210830223634-df2432ad895c
10+
github.com/rancher/rancher v0.0.0-20211008225128-9801a059cf23
1111
github.com/rancher/rancher/pkg/apis v0.0.0
1212
github.com/rancher/rancher/pkg/client v0.0.0
1313
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
1414
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.21.2
17-
k8s.io/apimachinery v0.21.2
16+
k8s.io/api v0.21.3
17+
k8s.io/apimachinery v0.21.3
1818
k8s.io/apiserver v0.21.0
1919
)
2020

2121
replace (
2222
github.com/crewjam/saml => github.com/crewjam/saml v0.4.1
2323
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
2424
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
25-
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20210830223634-df2432ad895c
26-
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20210830223634-df2432ad895c
25+
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20211008225128-9801a059cf23
26+
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20211008225128-9801a059cf23
2727
helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.5.4-rancher.1
2828
k8s.io/api => k8s.io/api v0.21.0
2929
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0

‎go.sum‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -942,19 +942,19 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
942942
github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA=
943943
github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
944944
github.com/rackspace/gophercloud v0.0.0-20150408191457-ce0f487f6747/go.mod h1:4bJ1FwuaBZ6dt1VcDX5/O662mwR8GWqS4l68H6hkoYQ=
945-
github.com/rancher/aks-operator v1.0.1-rc18 h1:kXJEOUKBbjM1mT4DGFHO+hhqwxai/Fl0Tb6DlFD4xKI=
946-
github.com/rancher/aks-operator v1.0.1-rc18/go.mod h1:Nafxvj+HQOMXb418Oj6eFVOUf0fnq8e4RBqi9S+Q5WQ=
945+
github.com/rancher/aks-operator v1.0.2 h1:R6niUq/IlhzKpzRFmRR9YMiMePJh1flEqFO86us7OMY=
946+
github.com/rancher/aks-operator v1.0.2/go.mod h1:Nafxvj+HQOMXb418Oj6eFVOUf0fnq8e4RBqi9S+Q5WQ=
947947
github.com/rancher/apiserver v0.0.0-20201023000256-1a0a904f9197/go.mod h1:8W0EwaR9dH5NDFw6mpAX437D0q+EZqKWbZyX71+z2WI=
948-
github.com/rancher/apiserver v0.0.0-20210818221223-fb33444dfae8/go.mod h1:8W0EwaR9dH5NDFw6mpAX437D0q+EZqKWbZyX71+z2WI=
948+
github.com/rancher/apiserver v0.0.0-20210922180056-297b6df8d714/go.mod h1:8W0EwaR9dH5NDFw6mpAX437D0q+EZqKWbZyX71+z2WI=
949949
github.com/rancher/channelserver v0.5.1-0.20210618172430-5cbefd383369/go.mod h1:1/9aBa8mXEIinRiT6Qlv/zbt6Nv9uorv+kFVNYvpmiI=
950950
github.com/rancher/client-go v0.21.0-rancher.1 h1:WVy7jpVmdjIRVkgXpBRlNx4jnGkLCFS1Qu/hUFCOGN4=
951951
github.com/rancher/client-go v0.21.0-rancher.1/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA=
952952
github.com/rancher/dynamiclistener v0.2.1-0.20200714201033-9c1939da3af9/go.mod h1:qr0QfhwzcVCR+Ao9WyfnE+jmOpfEAdRhXtNOZGJ3nCQ=
953953
github.com/rancher/dynamiclistener v0.3.1-0.20210616080009-9865ae859c7f/go.mod h1:xbxyiF1/UaPrOrFUOZeYMQW82RPgZIe5UfiT9CyE3Ks=
954954
github.com/rancher/eks-operator v1.1.1 h1:wuvztSSA78qmtngQap5dESNJGhhjUTlSbQYc+obj9rc=
955955
github.com/rancher/eks-operator v1.1.1/go.mod h1:MIgvBMHO0MqPuvehwAGxpg7Zcg20GhYO1dXjh9BAHqs=
956-
github.com/rancher/fleet/pkg/apis v0.0.0-20210608014113-99e848822739 h1:EjFWJZH42LoYCRV56ZPNzaiIPO6cfFDP7+LlyY3b20Y=
957-
github.com/rancher/fleet/pkg/apis v0.0.0-20210608014113-99e848822739/go.mod h1:RKVnqsx+c9juaMp74p54zxCvQfMZw2KVCzkowaLtUmQ=
956+
github.com/rancher/fleet/pkg/apis v0.0.0-20210918015053-5a141a6b18f0 h1:2A92uT1+4GUdZolQg5wfOSLa6RFRkfpnc3Iw7+Z/Bk8=
957+
github.com/rancher/fleet/pkg/apis v0.0.0-20210918015053-5a141a6b18f0/go.mod h1:fiKjX1CsAZhe2u1h/GWNDSc5Ol4+5Q3roWxq9cMbgHk=
958958
github.com/rancher/gke-operator v1.1.1 h1:xJF9tikW4fayMuX4YaPHGLmX8/1AOow4DnAKSKi95tk=
959959
github.com/rancher/gke-operator v1.1.1/go.mod h1:o2EC1q3xO3gq0vRid1CbaEvvXnWdptT7wiGPRPwUJqY=
960960
github.com/rancher/helm/v3 v3.5.4-rancher.1/go.mod h1:6eTBYLWEHt3JqXZPyHoYvb9/B7wPKHT3tjWnMfjen9w=
@@ -970,24 +970,24 @@ github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08 h1:NxR8Fh0eE7/5/5Zvl
970970
github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08/go.mod h1:9qZd/S8DqWzfKtjKGgSoHqGEByYmUE3qRaBaaAHwfEM=
971971
github.com/rancher/lasso/controller-runtime v0.0.0-20210608205930-775fcaf2f523/go.mod h1:+0JeyzD5Cb1eavAbVF1+7SfQUItne0C+UxsTk+PU1Ms=
972972
github.com/rancher/machine v0.15.0-rancher63/go.mod h1:qXYNumxy0J08MO/mh/jNjyRuEc2QKDLUOZIBE5vxaZE=
973-
github.com/rancher/machine v0.15.0-rancher69/go.mod h1:oLdls3rqV7V626NgBL7lWFNCgRpoHMXNBgCpBanuzpo=
973+
github.com/rancher/machine v0.15.0-rancher70/go.mod h1:oLdls3rqV7V626NgBL7lWFNCgRpoHMXNBgCpBanuzpo=
974974
github.com/rancher/norman v0.0.0-20200517050325-f53cae161640/go.mod h1:92rz/7QN7DOeLQZlJY/8aFBOmF085igIVguR0wpxLas=
975975
github.com/rancher/norman v0.0.0-20200820172041-261460ee9088/go.mod h1:W9LfZ96OfjkWSGTy2DUqYPt47Jpzrs7eM0i3AAx6fOI=
976976
github.com/rancher/norman v0.0.0-20210423002317-8e6ffc77a819/go.mod h1:hhnf77V2lmZD7cvUqi4vTBpIs3KpHNL/AmuN0MqEClI=
977977
github.com/rancher/norman v0.0.0-20210608202517-59b3523c3133 h1:X1Tn2q3iDekvqajJCbY2QYkEUJ51rJC9BuxS3os6nX4=
978978
github.com/rancher/norman v0.0.0-20210608202517-59b3523c3133/go.mod h1:hhnf77V2lmZD7cvUqi4vTBpIs3KpHNL/AmuN0MqEClI=
979-
github.com/rancher/rancher v0.0.0-20210830223634-df2432ad895c h1:9HXAlLH1KK7dw/opUzoeEmEmgnIA+bjX7QStDmUKHaY=
980-
github.com/rancher/rancher v0.0.0-20210830223634-df2432ad895c/go.mod h1:c3kjlM09BNTzwKvtU72wuf6AzoK9Flg5XlrdAorR9j0=
981-
github.com/rancher/rancher/pkg/apis v0.0.0-20210830223634-df2432ad895c h1:M/OeTwDFZWOgKTfGUWqUvv7JTr7yw/qEUCbmjiEblaU=
982-
github.com/rancher/rancher/pkg/apis v0.0.0-20210830223634-df2432ad895c/go.mod h1:VSrtqkZbHt9898ja/Rc1m8Kcju/k1oiTqGccDG9YwbQ=
983-
github.com/rancher/rancher/pkg/client v0.0.0-20210830223634-df2432ad895c h1:UI4rTxVT+sDcTiujSjjnhEjo3ejXnAcB3YkJVIhDI8M=
984-
github.com/rancher/rancher/pkg/client v0.0.0-20210830223634-df2432ad895c/go.mod h1:UKAFuyRUIHtnss0+u3/21KZzsD4F/1IaHCBazsHKaww=
979+
github.com/rancher/rancher v0.0.0-20211008225128-9801a059cf23 h1:pxEIy8yA6C6I67/aLAClaGPF5NO0ALgH9fBbmdwnxuw=
980+
github.com/rancher/rancher v0.0.0-20211008225128-9801a059cf23/go.mod h1:pZAV7ZvYNa2pAVtPCn/YCAecEN1gzCDWvUq1mWUY13I=
981+
github.com/rancher/rancher/pkg/apis v0.0.0-20211008225128-9801a059cf23 h1:83QGun5H3GeO1WLf0UB0qQ+bj2dG6jqBu7lfv/LzzCE=
982+
github.com/rancher/rancher/pkg/apis v0.0.0-20211008225128-9801a059cf23/go.mod h1:s8AiDrXi79bkul6CPjyaqoib1Reb+YK9TfCYJ0EUM+0=
983+
github.com/rancher/rancher/pkg/client v0.0.0-20211008225128-9801a059cf23 h1:3FvhoFSaAg1efYY69ng0uMJ5p+dd5vn3xG2AgweKOzg=
984+
github.com/rancher/rancher/pkg/client v0.0.0-20211008225128-9801a059cf23/go.mod h1:UKAFuyRUIHtnss0+u3/21KZzsD4F/1IaHCBazsHKaww=
985985
github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a/go.mod h1:YW8wJ/coee2n9ed937uPBWQArBaVlxs+5wkkS9KiyDc=
986986
github.com/rancher/remotedialer v0.2.6-0.20210318171128-d1ebd5202be4/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk=
987-
github.com/rancher/rke v1.3.0 h1:p3fhPVq0wbbxzdwyG+6F7pHexwveTHzxeZF9AYJvG/g=
988-
github.com/rancher/rke v1.3.0/go.mod h1:HAdRKAo7OI5YvFSSP40ezrad1pXA7IuJgAW7S5PYg6Y=
987+
github.com/rancher/rke v1.3.1 h1:98Jd1XdWxnw8h6coFz/zp2RPEE1oQlHpisBCrNv2QiE=
988+
github.com/rancher/rke v1.3.1/go.mod h1:HAdRKAo7OI5YvFSSP40ezrad1pXA7IuJgAW7S5PYg6Y=
989989
github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168/go.mod h1:WlLAocVyVQs5J8r0IiQXsp0ajVZO6hYi/Vo6zxjo73s=
990-
github.com/rancher/steve v0.0.0-20210819001752-8ecda307ee49/go.mod h1:BJ+n0Cqb9QD8S6O644VkLEaBWQnyqYcJdf8fDzFXarQ=
990+
github.com/rancher/steve v0.0.0-20210922195510-7224dc21013d/go.mod h1:60OOlkj1sIEBL9V+3ZTW/kwrLm7ZW/gUmrlazlqIhIU=
991991
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007/go.mod h1:Ja346o44aTPWADc/5Jm93+KgctT6KtftuOosgz0F2AM=
992992
github.com/rancher/wrangler v0.6.1/go.mod h1:L4HtjPeX8iqLgsxfJgz+JjKMcX2q3qbRXSeTlC/CSd4=
993993
github.com/rancher/wrangler v0.6.2-0.20200427172034-da9b142ae061/go.mod h1:n5Du/gGD7WoiqnEo0SHnPirDIp1V9Zu+6guc8lXS2dk=

‎rancher2/0_provider_upgrade_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ resource "rancher2_namespace" "testacc" {
4747
project_id = rancher2_cluster_sync.testacc.default_project_id
4848
}
4949
`
50-
testAccCheckRancher2UpgradeVersion = []string{"v2.3.6", "v2.4.13", "v2.5.9", "v2.6.0"}
50+
testAccCheckRancher2UpgradeVersion = []string{"v2.3.6", "v2.4.13", "v2.5.9", "v2.6.1"}
5151
testAccCheckRancher2RunningVersionIndex = 0
5252
testAccCheckRancher2UpgradeCluster = os.Getenv("RANCHER_ACC_CLUSTER_NAME")
5353
testAccCheckRancher2UpgradeCatalogV24 = testAccRancher2CatalogGlobal + testAccRancher2CatalogCluster + testAccRancher2CatalogProject

‎scripts/start_rancher.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CERTMANAGER_CRD=${CERTMANAGER_CRD:-"https://github.com/jetstack/cert-manager/rel
2020
CERTMANAGER_NS=${CERTMANAGER_NS:-"cert-manager"}
2121

2222
## rancher
23-
RANCHER_VERSION=${RANCHER_VERSION:-"v2.6.0"}
23+
RANCHER_VERSION=${RANCHER_VERSION:-"v2.6.1"}
2424
RANCHER_NS=${RANCHER_NS:-"cattle-system"}
2525
RANCHER_DNS_DOMAIN="nip.io"
2626
export RANCHER_HOSTNAME="rancher.${K3S_SERVER_IP}.${RANCHER_DNS_DOMAIN}"

0 commit comments

Comments
 (0)