From 597053a08e0081dfc4a4e9f2877467d28de91bb9 Mon Sep 17 00:00:00 2001 From: Vivek Lakshmanan Date: Fri, 2 Jul 2021 10:16:13 -0700 Subject: [PATCH] Prep v0.0.14 (#160) * Prep 0.0.14 release * Install ginkgo outside the tree to avoid change to go.sum * Install controller-gen separately as well * Use bash as default shell * Bump image to in deployment template 0.0.14 --- .github/workflows/master.yaml | 4 +++- .github/workflows/release.yaml | 4 +++- .github/workflows/run-acceptance-tests.yaml | 4 +++- CHANGELOG.md | 1 + Makefile | 6 +++++- deploy/crds/pulumi.com_stacks.yaml | 3 ++- deploy/yaml/operator.yaml | 2 +- scripts/generate_crds.sh | 4 +++- scripts/generate_k8s.sh | 2 +- 9 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml index b94d756f..72e6c78b 100644 --- a/.github/workflows/master.yaml +++ b/.github/workflows/master.yaml @@ -35,7 +35,9 @@ jobs: with: go-version: 1.16.x - name: Install Ginkgo testing framework - run: go install github.com/onsi/ginkgo/ginkgo + run: | + # Do the install from outside the code tree to avoid messing with go.sum + cd /tmp; go install github.com/onsi/ginkgo/ginkgo@v1.16.4 - name: Setup gcloud CLI for GKE testing cluster uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ca582b56..92290f0a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,7 +18,9 @@ jobs: with: go-version: "1.16.2" - name: Install Ginkgo testing framework - run: go install github.com/onsi/ginkgo/ginkgo + run: | + # Do the install from outside the code tree to avoid messing with go.sum + cd /tmp; go install github.com/onsi/ginkgo/ginkgo@v1.16.4 - name: Setup gcloud CLI for GKE testing cluster uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: diff --git a/.github/workflows/run-acceptance-tests.yaml b/.github/workflows/run-acceptance-tests.yaml index 90909011..1b12ceab 100644 --- a/.github/workflows/run-acceptance-tests.yaml +++ b/.github/workflows/run-acceptance-tests.yaml @@ -51,7 +51,9 @@ jobs: with: go-version: 1.16.x - name: Install Ginkgo testing framework - run: go install github.com/onsi/ginkgo/ginkgo + run: | + # Do the install from outside the code tree to avoid messing with go.sum + cd /tmp; go install github.com/onsi/ginkgo/ginkgo@v1.16.4 - name: Setup gcloud CLI for GKE testing cluster uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: diff --git a/CHANGELOG.md b/CHANGELOG.md index a2d25413..7051d049 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG ## HEAD (Unreleased) (None) +## 0.0.14 (2021-07-01) - Update deployment manifests & code for pulumi v3.6.0 [#159](https://github.com/pulumi/pulumi-kubernetes-operator/pull/159) --- diff --git a/Makefile b/Makefile index 23bc4e41..58dd70ba 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +SHELL := /bin/bash GIT_COMMIT := $(shell git rev-parse --short HEAD) VERSION := $(GIT_COMMIT) PUBLISH_IMAGE_NAME := pulumi/pulumi-kubernetes-operator @@ -9,7 +10,10 @@ default: build install-crds: kubectl apply -f deploy/crds/pulumi.com_stacks.yaml -codegen: generate-k8s generate-crds +codegen: install-controller-gen generate-k8s generate-crds + +install-controller-gen: + @echo "Installing controller-gen to GOPATH/bin"; pushd /tmp >& /dev/null && go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ; popd >& /dev/null generate-crds: ./scripts/generate_crds.sh diff --git a/deploy/crds/pulumi.com_stacks.yaml b/deploy/crds/pulumi.com_stacks.yaml index d1074fb8..6e0d63bb 100644 --- a/deploy/crds/pulumi.com_stacks.yaml +++ b/deploy/crds/pulumi.com_stacks.yaml @@ -1,9 +1,10 @@ + --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.3.0 + controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null name: stacks.pulumi.com spec: diff --git a/deploy/yaml/operator.yaml b/deploy/yaml/operator.yaml index ecc3f7c6..fd5ebbde 100644 --- a/deploy/yaml/operator.yaml +++ b/deploy/yaml/operator.yaml @@ -20,7 +20,7 @@ spec: emptyDir: {} containers: - name: pulumi-kubernetes-operator - image: pulumi/pulumi-kubernetes-operator:v0.0.13 + image: pulumi/pulumi-kubernetes-operator:v0.0.14 args: - "--zap-level=error" volumeMounts: diff --git a/scripts/generate_crds.sh b/scripts/generate_crds.sh index f20049ee..c1ae86b0 100755 --- a/scripts/generate_crds.sh +++ b/scripts/generate_crds.sh @@ -7,9 +7,11 @@ deploy_dir="$cwd/../deploy/crds" echo "Generating CRD API types..." -go run sigs.k8s.io/controller-tools/cmd/controller-gen crd paths="$apis_dir/..." crd:crdVersions=v1 output:crd:dir="$deploy_dir" +controller-gen crd paths="$apis_dir/..." crd:crdVersions=v1 output:crd:dir="$deploy_dir" # Manually overwrite until issue is resolved in controller-tools: # https://git.io/JJsjs +# Requires gnu-sed. On Macs you might have to do the following: +# export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH" sed -i "s#conditions: null#conditions: []#g" "$deploy_dir/pulumi.com_stacks.yaml" sed -i "s#storedVersions: null#storedVersions: []#g" "$deploy_dir/pulumi.com_stacks.yaml" diff --git a/scripts/generate_k8s.sh b/scripts/generate_k8s.sh index 93b27cae..187ec138 100755 --- a/scripts/generate_k8s.sh +++ b/scripts/generate_k8s.sh @@ -5,4 +5,4 @@ cwd=$(dirname "$0") apis_dir="$cwd/../pkg/apis" echo "Updating the CRD k8s deepcopy code..." -go run sigs.k8s.io/controller-tools/cmd/controller-gen object crd:crdVersions=v1 paths="$apis_dir/..." +controller-gen object crd:crdVersions=v1 paths="$apis_dir/..."