Merge pull request #94 from turkenh/upgrade-helm-lib

Upgrade helm to 3.6.3
crossplane-contrib · Jul 27, 2021 · 003a021 · 003a021
2 parents fee38cf + dc261f0
commit 003a021
Show file tree

Hide file tree

Showing 25 changed files with 999 additions and 526 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -22,7 +22,7 @@ Fixes #
 I have:
 
 - [ ] Read and followed Crossplane's [contribution process].
-- [ ] Run `make reviewable test` to ensure this PR is ready for review.
+- [ ] Run `make reviewable` to ensure this PR is ready for review.
 
 ### How has this code been tested
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,14 +67,21 @@ jobs:
       - name: Vendor Dependencies
         run: make vendor vendor.check
 
-      # This action uses its own setup-go, which always seems to use the latest
-      # stable version of Go. We could run 'make lint' to ensure our desired Go
-      # version, but we prefer this action because it leaves 'annotations' (i.e.
-      # it comments on PRs to point out linter violations).
+      # Go version coming with golangci-lint-action may not be our desired
+      # go version. We deploy our desired go version and then skip go
+      # installation in golangci-lint-action in the next step as suggested
+      # in https://github.com/golangci/golangci-lint-action/issues/183
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      # We could run 'make lint' to ensure our desired Go version, but we
+      # prefer this action because it leaves 'annotations' (i.e. it comments
+      # on PRs to point out linter violations).
       - name: Lint
         uses: golangci/golangci-lint-action@v2
         with:
           version: ${{ env.GOLANGCI_VERSION }}
+          skip-go-installation: true
 
   check-diff:
     runs-on: ubuntu-18.04

diff --git a/Makefile b/Makefile
@@ -73,17 +73,7 @@ crds.clean:
 	@find package/crds -name *.yaml.sed -delete || $(FAIL)
 	@$(OK) cleaned generated CRDs
 
-generate: crds.clean
-
-# Ensure a PR is ready for review.
-reviewable: generate lint
-	@go mod tidy
-
-# Ensure branch is clean.
-check-diff: reviewable
-	@$(INFO) checking that branch is clean
-	@test -z "$$(git status --porcelain)" || $(FAIL)
-	@$(OK) branch is clean
+generate.done: crds.clean
 
 # integration tests
 e2e.run: test-integration
@@ -110,4 +100,4 @@ run: $(KUBECTL) generate
 manifests:
 	@$(INFO) Deprecated. Run make generate instead.
 
-.PHONY: cobertura reviewable submodules fallthrough test-integration run manifests crds.clean
+.PHONY: cobertura submodules fallthrough test-integration run manifests crds.clean
diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go
@@ -24,7 +24,17 @@ import (
 
 // A ProviderConfigSpec defines the desired state of a Provider.
 type ProviderConfigSpec struct {
-	xpv1.ProviderConfigSpec `json:",inline"`
+	// Credentials required to authenticate to this provider.
+	Credentials ProviderCredentials `json:"credentials"`
+}
+
+// ProviderCredentials required to authenticate.
+type ProviderCredentials struct {
+	// Source of the provider credentials.
+	// +kubebuilder:validation:Enum=None;Secret;InjectedIdentity;Environment;Filesystem
+	Source xpv1.CredentialsSource `json:"source"`
+
+	xpv1.CommonCredentialSelectors `json:",inline"`
 }
 
 // A ProviderConfigStatus defines the status of a Provider.

diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/v1beta1/types.go b/apis/v1beta1/types.go
@@ -24,7 +24,17 @@ import (
 
 // A ProviderConfigSpec defines the desired state of a Provider.
 type ProviderConfigSpec struct {
-	xpv1.ProviderConfigSpec `json:",inline"`
+	// Credentials required to authenticate to this provider.
+	Credentials ProviderCredentials `json:"credentials"`
+}
+
+// ProviderCredentials required to authenticate.
+type ProviderCredentials struct {
+	// Source of the provider credentials.
+	// +kubebuilder:validation:Enum=None;Secret;InjectedIdentity;Environment;Filesystem
+	Source xpv1.CredentialsSource `json:"source"`
+
+	xpv1.CommonCredentialSelectors `json:",inline"`
 }
 
 // A ProviderConfigStatus defines the status of a Provider.

diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go
diff --git a/build b/build
diff --git a/cluster/integration/integration_tests.sh b/cluster/integration/integration_tests.sh
@@ -137,9 +137,9 @@ eval $(make --no-print-directory -C ${projectdir} build.vars)
 
 # ------------------------------
 
-HOSTARCH="${HOSTARCH:-amd64}"
-BUILD_IMAGE="${BUILD_REGISTRY}/${PROJECT_NAME}-${HOSTARCH}"
-CONTROLLER_IMAGE="${BUILD_REGISTRY}/${PROJECT_NAME}-controller-${HOSTARCH}"
+SAFEHOSTARCH="${SAFEHOSTARCH:-amd64}"
+BUILD_IMAGE="${BUILD_REGISTRY}/${PROJECT_NAME}-${SAFEHOSTARCH}"
+CONTROLLER_IMAGE="${BUILD_REGISTRY}/${PROJECT_NAME}-controller-${SAFEHOSTARCH}"
 
 version_tag="$(cat ${projectdir}/_output/version)"
 # tag as latest version to load into kind cluster

diff --git a/cluster/local/config/config.env b/cluster/local/config/config.env
@@ -1 +1 @@
-CROSSPLANE_VERSION="0.14.0"
+CROSSPLANE_VERSION="1.3.0"
diff --git a/cluster/local/config/crossplane/config.env b/cluster/local/config/crossplane/config.env
@@ -1,7 +1,7 @@
 REQUIRED_IMAGES+=("crossplane/crossplane:v${CROSSPLANE_VERSION}")
 
-HELM_REPOSITORY_NAME=crossplane-master
-HELM_REPOSITORY_URL=https://charts.crossplane.io/master
+HELM_REPOSITORY_NAME=crossplane-stable
+HELM_REPOSITORY_URL=https://charts.crossplane.io/stable
 HELM_CHART_VERSION="${CROSSPLANE_VERSION}"
 HELM_RELEASE_NAME=crossplane
 HELM_RELEASE_NAMESPACE=crossplane-system

diff --git a/go.mod b/go.mod
@@ -3,24 +3,21 @@ module github.com/crossplane-contrib/provider-helm
 go 1.16
 
 require (
-	github.com/crossplane/crossplane-runtime v0.12.0
-	github.com/crossplane/crossplane-tools v0.0.0-20201007233256-88b291e145bb
-	github.com/go-logr/zapr v0.1.1 // indirect
-	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
-	github.com/google/go-cmp v0.4.0
+	github.com/crossplane/crossplane-runtime v0.14.1-0.20210713194031-85b19c28ea88
+	github.com/crossplane/crossplane-tools v0.0.0-20210320162312-1baca298c527
+	github.com/google/go-cmp v0.5.6
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.1.0 // indirect
-	golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	helm.sh/helm/v3 v3.2.4
-	k8s.io/api v0.18.8
-	k8s.io/apimachinery v0.18.8
-	k8s.io/client-go v0.18.8
-	rsc.io/letsencrypt v0.0.3 // indirect
-	sigs.k8s.io/controller-runtime v0.6.2
-	sigs.k8s.io/controller-tools v0.3.0
-	sigs.k8s.io/kustomize/api v0.5.1
+	helm.sh/helm/v3 v3.6.3
+	k8s.io/api v0.21.2
+	k8s.io/apimachinery v0.21.2
+	k8s.io/client-go v0.21.2
+	sigs.k8s.io/controller-runtime v0.9.2
+	sigs.k8s.io/controller-tools v0.6.1
+	sigs.k8s.io/kustomize/api v0.8.11
+	sigs.k8s.io/kustomize/kyaml v0.11.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible
+// See https://github.com/helm/helm/blob/v3.6.3/go.mod#L50
+replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d