Skip to content

Commit 795d9a4

Browse files
authored
Merge pull request #70 from fluxcd/crd-v1
Upgrade CRDs to apiextensions.k8s.io/v1
2 parents 68add1e + 3459cc3 commit 795d9a4

File tree

11 files changed

+264
-223
lines changed

11 files changed

+264
-223
lines changed

.github/workflows/e2e.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
- name: Check if working tree is dirty
3939
run: |
4040
if [[ $(git diff --stat) != '' ]]; then
41+
git --no-pager diff
4142
echo 'run make test and commit changes'
4243
exit 1
4344
fi

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13 as builder
1+
FROM golang:1.14 as builder
22

33
WORKDIR /workspace
44

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Image URL to use all building/pushing image targets
22
IMG ?= fluxcd/kustomize-controller:latest
3-
# Produce CRDs that work back to Kubernetes 1.13
4-
CRD_OPTIONS ?= crd
5-
SOURCE_VER ?= v0.0.5
3+
# Produce CRDs that work back to Kubernetes 1.16
4+
CRD_OPTIONS ?= crd:crdVersions=v1
5+
SOURCE_VER ?= v0.0.6
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -92,7 +92,7 @@ ifeq (, $(shell which controller-gen))
9292
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
9393
cd $$CONTROLLER_GEN_TMP_DIR ;\
9494
go mod init tmp ;\
95-
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 ;\
95+
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
9696
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
9797
}
9898
CONTROLLER_GEN=$(GOBIN)/controller-gen

0 commit comments

Comments
 (0)