Merge pull request #6 from stefanprodan/toolkit-updates

Update source API to v0.0.9

Author: stefanprodan

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.13 as builder
+FROM golang:1.15 as builder
 
 WORKDIR /workspace
 
@@ -11,7 +11,6 @@ RUN go mod download
 
 # copy source code
 COPY main.go main.go
-COPY api/ api/
 COPY controllers/ controllers/
 
 # build

Makefile

@@ -1,8 +1,8 @@
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
-# Produce CRDs that work back to Kubernetes 1.13
-CRD_OPTIONS ?= "crd"
+# Produce CRDs that work back to Kubernetes 1.16
+CRD_OPTIONS ?= crd:crdVersions=v1
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -71,7 +71,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

go.mod

@@ -1,12 +1,12 @@
 module github.com/stefanprodan/source-watcher
 
-go 1.13
+go 1.15
 
 require (
-	github.com/fluxcd/pkg v0.0.3
-	github.com/fluxcd/source-controller v0.0.7
+	github.com/fluxcd/pkg/untar v0.0.5
+	github.com/fluxcd/source-controller/api v0.0.9
 	github.com/go-logr/logr v0.1.0
-	go.uber.org/zap v1.10.0
+	go.uber.org/zap v1.13.0
 	k8s.io/apimachinery v0.18.4
 	k8s.io/client-go v0.18.4
 	sigs.k8s.io/controller-runtime v0.6.1