Skip to content

Commit 062296d

Browse files
authored
Merge pull request #532 from sbueringer/pr-upgrade-deps
🏃 Update to cluster-api v0.3.3, controller-tools v0.2.8 and controller-runtime v0.5.2
2 parents 101a9de + 85aaaa9 commit 062296d

7 files changed

+15
-15
lines changed

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.2.6
7+
controller-gen.kubebuilder.io/version: v0.2.8
88
creationTimestamp: null
99
name: openstackclusters.infrastructure.cluster.x-k8s.io
1010
spec:

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.2.6
7+
controller-gen.kubebuilder.io/version: v0.2.8
88
creationTimestamp: null
99
name: openstackmachines.infrastructure.cluster.x-k8s.io
1010
spec:

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.2.6
7+
controller-gen.kubebuilder.io/version: v0.2.8
88
creationTimestamp: null
99
name: openstackmachinetemplates.infrastructure.cluster.x-k8s.io
1010
spec:

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ require (
1515
k8s.io/client-go v0.17.2
1616
k8s.io/klog v1.0.0
1717
k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab
18-
sigs.k8s.io/cluster-api v0.3.2
19-
sigs.k8s.io/controller-runtime v0.5.1
18+
sigs.k8s.io/cluster-api v0.3.3
19+
sigs.k8s.io/controller-runtime v0.5.2
2020
)

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,10 +620,10 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
620620
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
621621
modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
622622
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
623-
sigs.k8s.io/cluster-api v0.3.2 h1:+oiclIxk1PthGCBbYLEdfZi1u2qFTjK+wwIrtLNlBXA=
624-
sigs.k8s.io/cluster-api v0.3.2/go.mod h1:PkmtV10dmmSmBSpR28c5UxDvWRszTxj+p9KLrb8JVZ8=
625-
sigs.k8s.io/controller-runtime v0.5.1 h1:TNidCfVoU/cs2i+9xoTcL/l7yhl0bDhYXU0NCG6wmiE=
626-
sigs.k8s.io/controller-runtime v0.5.1/go.mod h1:Uojny7gvg55YLQnEGnPzRE3dC4ik2tRlZJgOUCWXAV4=
623+
sigs.k8s.io/cluster-api v0.3.3 h1:pNuvC6cm67SbxOaPriK8ZfLl1RSjmu/KX2GJiNQH3dU=
624+
sigs.k8s.io/cluster-api v0.3.3/go.mod h1:lgztyeCWCve8YB4DN6QeLR0blNYBvFX9+ATHrxs+zKU=
625+
sigs.k8s.io/controller-runtime v0.5.2 h1:pyXbUfoTo+HA3jeIfr0vgi+1WtmNh0CwlcnQGLXwsSw=
626+
sigs.k8s.io/controller-runtime v0.5.2/go.mod h1:JZUwSMVbxDupo0lTJSSFP5pimEyxGynROImSsqIOx1A=
627627
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802/go.mod h1:HIZ3PWUezpklcjkqpFbnYOqaqsAE1JeCTEwkgvPLXjk=
628628
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
629629
sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=

hack/tools/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/golangci/golangci-lint v1.23.8
99
github.com/onsi/ginkgo v1.12.0
1010
k8s.io/code-generator v0.18.0-alpha.2.0.20200130061103-7dfd5e9157ef
11-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20200311152736-bfcc6f37fe12
12-
sigs.k8s.io/controller-tools v0.2.6
11+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20200327221353-ecff70af1b83
12+
sigs.k8s.io/controller-tools v0.2.8
1313
sigs.k8s.io/kustomize/kustomize/v3 v3.5.4
1414
sigs.k8s.io/testing_frameworks v0.1.2
1515
)

hack/tools/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -801,10 +801,10 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphD
801801
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
802802
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f h1:Cq7MalBHYACRd6EesksG1Q8EoIAKOsiZviGKbOLIej4=
803803
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
804-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20200311152736-bfcc6f37fe12 h1:oRsyG+v4hme6VxjqeRpFPJ6y7glydtwNsI2/xH0cIUk=
805-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20200311152736-bfcc6f37fe12/go.mod h1:8aibHfbqxNthBN4KKnk8UV9xTHKB3TE5nzxeNkH9xrU=
806-
sigs.k8s.io/controller-tools v0.2.6 h1:4Fo36alFw5+Fffz7HhNd2EFBFvckqVkb4ePnIj0uLUc=
807-
sigs.k8s.io/controller-tools v0.2.6/go.mod h1:9VKHPszmf2DHz/QmHkcfZoewO6BL7pPs9uAiBVsaJSE=
804+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20200327221353-ecff70af1b83 h1:Aq4lnCRJ/efgrniMiCnLTN2GGA4Imv9UwulXo98ScAI=
805+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20200327221353-ecff70af1b83/go.mod h1:m/FOz1TvBnR5wZpsjGL0UzTqLZgU6Kqbx4Er6eXRQhU=
806+
sigs.k8s.io/controller-tools v0.2.8 h1:UmYsnu89dn8/wBhjKL3lkGyaDGRnPDYUx2+iwXRnylA=
807+
sigs.k8s.io/controller-tools v0.2.8/go.mod h1:9VKHPszmf2DHz/QmHkcfZoewO6BL7pPs9uAiBVsaJSE=
808808
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20200226075303-ed8438ec10a4/go.mod h1:nyAxPBUS04gN3IRuEQ0elG4mVeto/d/qQRsW2PsyAy4=
809809
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
810810
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=

0 commit comments

Comments
 (0)