Skip to content

Commit

Permalink
Bump direct dependencies to their latest releases (#1685)
Browse files Browse the repository at this point in the history
This changes the Kubernetes client API to 0.19.2.
Furthermore, 'controller-tools' has been updated. This version creates V1 CRDs by default, but its configuration has been changed to still create v1beta1 CRDs, as some clusters might have components that don't support V1 CRDs yet.
Go 1.15 is used for builds.

Signed-off-by: Jan Schlicht <jan@d2iq.com>
  • Loading branch information
Jan Schlicht committed Oct 2, 2020
1 parent 25586ee commit 2f7c6c2
Show file tree
Hide file tree
Showing 21 changed files with 274 additions and 121 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

lint:
docker:
- image: kudobuilder/golang:1.14
- image: kudobuilder/golang:1.15
working_directory: /go/src/github.com/kudobuilder/kudo
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion Dispatchfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ task("lint", inputs=["git"], steps=[k8s.corev1.Container(

task("integration-test", inputs=["git"], steps=[k8s.corev1.Container(
name="integration-test",
image="kudobuilder/golang:1.14",
image="kudobuilder/golang:1.15",
command=[ "make", "integration-test" ],
env=[
k8s.corev1.EnvVar(name="INTEGRATION_OUTPUT_JUNIT", value="true"),
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.14 as builder
FROM golang:1.15 as builder

# Setting arguments
ARG ldflags_arg
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ ifneq ($(shell go list -f '{{.Version}}' -m sigs.k8s.io/controller-tools), $(she
@echo "(Re-)installing controller-gen. Current version: $(controller-gen --version 2>/dev/null | cut -b 10-). Need $(go list -f '{{.Version}}' -m sigs.k8s.io/controller-tools)"
go get sigs.k8s.io/controller-tools/cmd/controller-gen@$$(go list -f '{{.Version}}' -m sigs.k8s.io/controller-tools)
endif
controller-gen crd paths=./pkg/apis/... output:crd:dir=config/crds output:stdout
controller-gen crd:crdVersions=v1beta1 paths=./pkg/apis/... output:crd:dir=config/crds output:stdout
ifeq (, $(shell which go-bindata))
go get github.com/go-bindata/go-bindata/v3/go-bindata@$$(go list -f '{{.Version}}' -m github.com/go-bindata/go-bindata/v3)
endif
Expand Down
4 changes: 2 additions & 2 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG GOLANG_VERSION=1.14
ARG GOLANG_VERSION=1.15
FROM golang:${GOLANG_VERSION}
ARG KUBEBUILDER_VERSION=2.1.0
ARG KUBEBUILDER_VERSION=2.3.1

# Download and install Kubebuilder

Expand Down
4 changes: 2 additions & 2 deletions build/test-images.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

docker build --build-arg GOLANG_VERSION=1.14 -t kudobuilder/golang:1.14 .
docker push kudobuilder/golang:1.14
docker build --build-arg GOLANG_VERSION=1.15 -t kudobuilder/golang:1.15 .
docker push kudobuilder/golang:1.15

docker build --build-arg GOLANG_VERSION=latest -t kudobuilder/golang:latest .
docker push kudobuilder/golang:latest
2 changes: 1 addition & 1 deletion config/crds/kudo.dev_instances.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
controller-gen.kubebuilder.io/version: v0.4.0
creationTimestamp: null
name: instances.kudo.dev
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crds/kudo.dev_operators.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
controller-gen.kubebuilder.io/version: v0.4.0
creationTimestamp: null
name: operators.kudo.dev
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crds/kudo.dev_operatorversions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
controller-gen.kubebuilder.io/version: v0.4.0
creationTimestamp: null
name: operatorversions.kudo.dev
spec:
Expand Down
47 changes: 24 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,43 +1,44 @@
module github.com/kudobuilder/kudo

go 1.14
go 1.15

require (
github.com/Masterminds/goutils v1.1.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/semver/v3 v3.1.0
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/go-bindata/go-bindata/v3 v3.1.3
github.com/google/go-cmp v0.5.1
github.com/go-logr/logr v0.2.1 // indirect
github.com/google/go-cmp v0.5.2
github.com/gosuri/uitable v0.0.4
github.com/huandu/xstrings v1.3.1 // indirect
github.com/kisielk/errcheck v1.4.0 // indirect
github.com/kudobuilder/kuttl v0.6.0
github.com/manifoldco/promptui v0.7.0
github.com/huandu/xstrings v1.3.2 // indirect
github.com/kudobuilder/kuttl v0.6.1
github.com/manifoldco/promptui v0.8.0
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/onsi/ginkgo v1.14.0
github.com/onsi/gomega v1.10.1
github.com/spf13/afero v1.3.2
github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2 // indirect
github.com/onsi/ginkgo v1.14.1
github.com/onsi/gomega v1.10.2
github.com/spf13/afero v1.4.0
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
github.com/thoas/go-funk v0.7.0
github.com/xlab/treeprint v1.0.0
github.com/yourbasic/graph v0.0.0-20170921192928-40eb135c0b26
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/tools v0.0.0-20200723000907-a7c6fd066f6d // indirect
google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 // indirect
golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
golang.org/x/sync v0.0.0-20200930132711-30421366ff76
golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.18.6
k8s.io/apiextensions-apiserver v0.18.6
k8s.io/apimachinery v0.18.6
k8s.io/cli-runtime v0.18.6
k8s.io/client-go v0.18.6
k8s.io/code-generator v0.18.6
k8s.io/component-base v0.18.6
k8s.io/kubectl v0.18.6
sigs.k8s.io/controller-runtime v0.6.1
sigs.k8s.io/controller-tools v0.3.0
k8s.io/api v0.19.2
k8s.io/apiextensions-apiserver v0.19.2
k8s.io/apimachinery v0.19.2
k8s.io/cli-runtime v0.19.2
k8s.io/client-go v0.19.2
k8s.io/code-generator v0.19.2
k8s.io/component-base v0.19.2
k8s.io/kubectl v0.19.2
sigs.k8s.io/controller-runtime v0.6.3
sigs.k8s.io/controller-tools v0.4.0
sigs.k8s.io/yaml v1.2.0
)
Loading

0 comments on commit 2f7c6c2

Please sign in to comment.