Merge pull request #565 from rabbitmq/1-20-compatible-tests

Bump controller-runtime to v0.8.0
rabbitmq · Jan 19, 2021 · 0bba785 · 0bba785
2 parents 8a75409 + b720cb5
commit 0bba785
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 49 deletions.
diff --git a/config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml b/config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml
@@ -419,8 +419,15 @@ spec:
                           type: object
                         spec:
                           properties:
+                            allocateLoadBalancerNodePorts:
+                              type: boolean
                             clusterIP:
                               type: string
+                            clusterIPs:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
                             externalIPs:
                               items:
                                 type: string
@@ -432,7 +439,12 @@ spec:
                             healthCheckNodePort:
                               format: int32
                               type: integer
-                            ipFamily:
+                            ipFamilies:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            ipFamilyPolicy:
                               type: string
                             loadBalancerIP:
                               type: string
@@ -3217,8 +3229,6 @@ spec:
                                                       type: object
                                                   type: object
                                                 type: array
-                                            required:
-                                              - sources
                                             type: object
                                           quobyte:
                                             properties:

diff --git a/go.mod b/go.mod
@@ -14,15 +14,14 @@ require (
 	github.com/onsi/gomega v1.10.4
 	github.com/pelletier/go-toml v1.8.1 // indirect
 	github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
-	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
 	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
 	gopkg.in/ini.v1 v1.62.0
-	k8s.io/api v0.19.2
-	k8s.io/apimachinery v0.19.2
-	k8s.io/client-go v0.19.2
-	k8s.io/utils v0.0.0-20200912215256-4140de9c8800
-	sigs.k8s.io/controller-runtime v0.7.0
+	k8s.io/api v0.20.1
+	k8s.io/apimachinery v0.20.1
+	k8s.io/client-go v0.20.1
+	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
+	sigs.k8s.io/controller-runtime v0.8.0
 	sigs.k8s.io/controller-tools v0.4.1
 	sigs.k8s.io/kind v0.9.0
 	sigs.k8s.io/kustomize/kustomize/v3 v3.9.1