Skip to content

Commit 75e85ab

Browse files
ChunyiLyuChunyiLyu
committed
Bump controller-runtime 0.7; k8s dependencies to 0.19
1 parent a7d9c2b commit 75e85ab

File tree

3 files changed

+422
-11
lines changed

3 files changed

+422
-11
lines changed

‎config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,6 +1239,15 @@ spec:
12391239
user:
12401240
type: string
12411241
type: object
1242+
seccompProfile:
1243+
properties:
1244+
localhostProfile:
1245+
type: string
1246+
type:
1247+
type: string
1248+
required:
1249+
- type
1250+
type: object
12421251
windowsOptions:
12431252
properties:
12441253
gmsaCredentialSpec:
@@ -1796,6 +1805,15 @@ spec:
17961805
user:
17971806
type: string
17981807
type: object
1808+
seccompProfile:
1809+
properties:
1810+
localhostProfile:
1811+
type: string
1812+
type:
1813+
type: string
1814+
required:
1815+
- type
1816+
type: object
17991817
windowsOptions:
18001818
properties:
18011819
gmsaCredentialSpec:
@@ -2361,6 +2379,15 @@ spec:
23612379
user:
23622380
type: string
23632381
type: object
2382+
seccompProfile:
2383+
properties:
2384+
localhostProfile:
2385+
type: string
2386+
type:
2387+
type: string
2388+
required:
2389+
- type
2390+
type: object
23642391
windowsOptions:
23652392
properties:
23662393
gmsaCredentialSpec:
@@ -2546,6 +2573,15 @@ spec:
25462573
user:
25472574
type: string
25482575
type: object
2576+
seccompProfile:
2577+
properties:
2578+
localhostProfile:
2579+
type: string
2580+
type:
2581+
type: string
2582+
required:
2583+
- type
2584+
type: object
25492585
supplementalGroups:
25502586
items:
25512587
format: int64
@@ -2577,6 +2613,8 @@ spec:
25772613
type: string
25782614
serviceAccountName:
25792615
type: string
2616+
setHostnameAsFQDN:
2617+
type: boolean
25802618
shareProcessNamespace:
25812619
type: boolean
25822620
subdomain:
@@ -2826,6 +2864,85 @@ spec:
28262864
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
28272865
x-kubernetes-int-or-string: true
28282866
type: object
2867+
ephemeral:
2868+
properties:
2869+
readOnly:
2870+
type: boolean
2871+
volumeClaimTemplate:
2872+
properties:
2873+
metadata:
2874+
type: object
2875+
spec:
2876+
properties:
2877+
accessModes:
2878+
items:
2879+
type: string
2880+
type: array
2881+
dataSource:
2882+
properties:
2883+
apiGroup:
2884+
type: string
2885+
kind:
2886+
type: string
2887+
name:
2888+
type: string
2889+
required:
2890+
- kind
2891+
- name
2892+
type: object
2893+
resources:
2894+
properties:
2895+
limits:
2896+
additionalProperties:
2897+
anyOf:
2898+
- type: integer
2899+
- type: string
2900+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2901+
x-kubernetes-int-or-string: true
2902+
type: object
2903+
requests:
2904+
additionalProperties:
2905+
anyOf:
2906+
- type: integer
2907+
- type: string
2908+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2909+
x-kubernetes-int-or-string: true
2910+
type: object
2911+
type: object
2912+
selector:
2913+
properties:
2914+
matchExpressions:
2915+
items:
2916+
properties:
2917+
key:
2918+
type: string
2919+
operator:
2920+
type: string
2921+
values:
2922+
items:
2923+
type: string
2924+
type: array
2925+
required:
2926+
- key
2927+
- operator
2928+
type: object
2929+
type: array
2930+
matchLabels:
2931+
additionalProperties:
2932+
type: string
2933+
type: object
2934+
type: object
2935+
storageClassName:
2936+
type: string
2937+
volumeMode:
2938+
type: string
2939+
volumeName:
2940+
type: string
2941+
type: object
2942+
required:
2943+
- spec
2944+
type: object
2945+
type: object
28292946
fc:
28302947
properties:
28312948
fsType:

‎go.mod‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,27 @@ module github.com/rabbitmq/cluster-operator
33
go 1.15
44

55
require (
6-
github.com/Azure/go-autorest/autorest v0.9.2 // indirect
7-
github.com/Azure/go-autorest/autorest/adal v0.8.0 // indirect
86
github.com/cespare/xxhash/v2 v2.1.1 // indirect
97
github.com/cloudflare/cfssl v1.5.0
108
github.com/eclipse/paho.mqtt.golang v1.3.1
119
github.com/go-delve/delve v1.5.1
12-
github.com/go-logr/logr v0.1.0
13-
github.com/go-logr/zapr v0.1.1 // indirect
10+
github.com/go-logr/logr v0.3.0
1411
github.com/go-stomp/stomp v2.1.0+incompatible
1512
github.com/gophercloud/gophercloud v0.5.0 // indirect
1613
github.com/michaelklishin/rabbit-hole/v2 v2.6.0
1714
github.com/onsi/ginkgo v1.14.2
1815
github.com/onsi/gomega v1.10.4
1916
github.com/pelletier/go-toml v1.8.1 // indirect
20-
github.com/prometheus/client_golang v1.2.1 // indirect
2117
github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
2218
github.com/smartystreets/goconvey v1.6.4 // indirect
2319
github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
24-
go.uber.org/multierr v1.2.0 // indirect
2520
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb
2621
gopkg.in/ini.v1 v1.62.0
27-
k8s.io/api v0.18.10
28-
k8s.io/apimachinery v0.18.10
29-
k8s.io/client-go v0.18.10
30-
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
31-
sigs.k8s.io/controller-runtime v0.6.4
22+
k8s.io/api v0.19.2
23+
k8s.io/apimachinery v0.19.2
24+
k8s.io/client-go v0.19.2
25+
k8s.io/utils v0.0.0-20200912215256-4140de9c8800
26+
sigs.k8s.io/controller-runtime v0.7.0
3227
sigs.k8s.io/controller-tools v0.4.1
3328
sigs.k8s.io/kind v0.9.0
3429
sigs.k8s.io/kustomize/kustomize/v3 v3.8.8

0 commit comments

Comments
 (0)