Merge pull request #692 from rawmind0/go116

Updated golang to v1.16.5 and Rancher to v2.5.9

Author: rawmind0

.drone.yml

@@ -20,7 +20,7 @@ steps:
   privileged: true
 
 - name: build-all-binaries
-  image: golang:1.14.9
+  image: golang:1.16.5
   environment:
     CROSS: 1
     VERSION: ${DRONE_TAG}

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 1.16.0 (Unreleased)
+## 1.16.0 (July 15, 2021)
 
 FEATURES:
 
@@ -14,6 +14,8 @@ ENHANCEMENTS:
 * Updated `rancher2_cluster` resource to replace RKE cluster API info instead of update, if `rancher2_cluster.rke_config` has been updated
 * Updated `rancher2_project` resource to replace project API info instead of update
 * Updated `rancher2_node_template.engine_install_url` argument to be `computed`
+* Updated Rancher to v2.5.9
+* Updated golang to v1.16.5 and added darwin arm64 build
 
 BUG FIXES:
 

go.mod

@@ -1,27 +1,27 @@
 module github.com/terraform-providers/terraform-provider-rancher2
 
-go 1.14
+go 1.16
 
 require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/terraform-plugin-sdk v1.14.0
 	github.com/rancher/norman v0.0.0-20210225010917-c7fd1e24145b
-	github.com/rancher/rancher v0.0.0-20210505234332-cf16ca13d023
+	github.com/rancher/rancher v0.0.0-20210714221037-3c54189441fd
 	github.com/rancher/rancher/pkg/apis v0.0.0
 	github.com/rancher/rancher/pkg/client v0.0.0
-	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
+	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	gopkg.in/yaml.v2 v2.3.0
-	k8s.io/api v0.20.0
-	k8s.io/apimachinery v0.20.0
-	k8s.io/apiserver v0.20.0
+	k8s.io/api v0.20.6
+	k8s.io/apimachinery v0.20.6
+	k8s.io/apiserver v0.20.6
 )
 
 replace (
 	github.com/crewjam/saml => github.com/crewjam/saml v0.4.1
-	github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20210505234332-cf16ca13d023
-	github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20210505234332-cf16ca13d023
+	github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20210714221037-3c54189441fd
+	github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20210714221037-3c54189441fd
 	k8s.io/api => k8s.io/api v0.20.0
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
 	k8s.io/apimachinery => k8s.io/apimachinery v0.20.0

go.sum

@@ -46,7 +46,7 @@ resource "rancher2_namespace" "testacc" {
   project_id = rancher2_cluster_sync.testacc.default_project_id
 }
 `
-	testAccCheckRancher2UpgradeVersion = []string{"v2.3.6", "v2.4.13", "v2.5.8"}
+	testAccCheckRancher2UpgradeVersion = []string{"v2.3.6", "v2.4.13", "v2.5.9"}
 	testAccCheckRancher2RunningVersionIndex = 0
 	testAccCheckRancher2UpgradeCluster = os.Getenv("RANCHER_ACC_CLUSTER_NAME")
 	testAccCheckRancher2UpgradeCatalogV24 = testAccRancher2CatalogGlobal + testAccRancher2CatalogCluster + testAccRancher2CatalogProject

rancher2/0_provider_upgrade_test.go

@@ -1,3 +1,3 @@
-FROM golang:1.14.9-alpine3.12
+FROM golang:1.16.5-alpine3.13
 RUN apk -U add bash git gcc musl-dev make docker-cli curl ca-certificates
 WORKDIR /go/src/github.com/terraform-providers/terraform-provider-rancher2

scripts/Dockerfile.builder

@@ -11,7 +11,7 @@ declare -A OS_ARCH_ARG
 OS_PLATFORM_ARG=(linux windows darwin freebsd openbsd)
 OS_ARCH_ARG[linux]="amd64 arm arm64"
 OS_ARCH_ARG[windows]="386 amd64"
-OS_ARCH_ARG[darwin]="amd64"
+OS_ARCH_ARG[darwin]="amd64 arm64"
 OS_ARCH_ARG[freebsd]="386 amd64 arm"
 OS_ARCH_ARG[openbsd]="386 amd64"
 

scripts/gobuild.sh

@@ -20,7 +20,7 @@ CERTMANAGER_CRD=${CERTMANAGER_CRD:-"https://github.com/jetstack/cert-manager/rel
 CERTMANAGER_NS=${CERTMANAGER_NS:-"cert-manager"}
 
 ## rancher
-RANCHER_VERSION=${RANCHER_VERSION:-"v2.5.6"}
+RANCHER_VERSION=${RANCHER_VERSION:-"v2.5.9"}
 RANCHER_NS=${RANCHER_NS:-"cattle-system"}
 RANCHER_DNS_DOMAIN="nip.io"
 export RANCHER_HOSTNAME="rancher.${K3S_SERVER_IP}.${RANCHER_DNS_DOMAIN}"