Skip to content

Commit

Permalink
Merge pull request #91 from fluxcd/k8s.io/api-v0.20.2
Browse files Browse the repository at this point in the history
Update Kubernetes packages
  • Loading branch information
stefanprodan authored Jan 18, 2021
2 parents f64ef67 + db94176 commit c1c2039
Show file tree
Hide file tree
Showing 5 changed files with 297 additions and 185 deletions.
13 changes: 9 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ IMG ?= fluxcd/image-automation-controller:latest
# Produce CRDs that work back to Kubernetes 1.16
CRD_OPTIONS ?= crd:crdVersions=v1

# Version of the Toolkit from which to get CRDs. Change this if you
# bump the go module version.
TOOLKIT_VERSION:=v0.6.1
# Version of the source-controller from which to get the GitRepository CRD.
# Change this if you bump the source-controller/api version in go.mod.
SOURCE_VER ?= v0.6.2

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand All @@ -26,7 +26,7 @@ clean_test_deps:

${TEST_CRDS}/gitrepositories.yaml:
mkdir -p ${TEST_CRDS}
curl -s --fail https://raw.githubusercontent.com/fluxcd/source-controller/${TOOLKIT_VERSION}/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml \
curl -s --fail https://raw.githubusercontent.com/fluxcd/source-controller/${SOURCE_VER}/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml \
-o ${TEST_CRDS}/gitrepositories.yaml

${TEST_CRDS}/imagepolicies.yaml:
Expand Down Expand Up @@ -74,6 +74,11 @@ manifests: controller-gen
api-docs: gen-crd-api-reference-docs
$(API_REF_GEN) -api-dir=./api/v1alpha1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/image-automation.md

# Run go mod tidy
tidy:
cd api; rm -f go.sum; go mod tidy
rm -f go.sum; go mod tidy

# Run go fmt against code
fmt:
go fmt ./...
Expand Down
8 changes: 4 additions & 4 deletions api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/fluxcd/image-automation-controller/api
go 1.15

require (
github.com/fluxcd/pkg/apis/meta v0.5.0
k8s.io/api v0.19.4
k8s.io/apimachinery v0.19.4
sigs.k8s.io/controller-runtime v0.7.0
github.com/fluxcd/pkg/apis/meta v0.6.0
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
sigs.k8s.io/controller-runtime v0.8.0
)
Loading

0 comments on commit c1c2039

Please sign in to comment.