Skip to content

Commit

Permalink
Prep v0.0.14 (#160)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Vivek Lakshmanan authored Jul 2, 2021
1 parent 9a62c7c commit 597053a
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- name: Setup gcloud CLI for GKE testing cluster
uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- name: Setup gcloud CLI for GKE testing cluster
uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/run-acceptance-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- name: Setup gcloud CLI for GKE testing cluster
uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

---
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/[email protected] ; popd >& /dev/null

generate-crds:
./scripts/generate_crds.sh
Expand Down
3 changes: 2 additions & 1 deletion deploy/crds/pulumi.com_stacks.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/yaml/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion scripts/generate_crds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion scripts/generate_k8s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/..."

0 comments on commit 597053a

Please sign in to comment.