Skip to content

Commit adac80b

Browse files
MirahImageMirahImage
authored
Merge pull request #1938 from rabbitmq/bump-tools
Bump tools and deps. Fix broken system test (was relying on a bug in RabbitMQ that has been fixed).
2 parents 8c9e107 + 0e8c0e7 commit adac80b

File tree

5 files changed

+282
-41
lines changed

5 files changed

+282
-41
lines changed

‎Makefile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@ unit-tests::vuln
6565
unit-tests::manifests
6666
unit-tests::just-unit-tests ## Run unit tests
6767

68+
GINKGO ?= go run github.com/onsi/ginkgo/v2/ginkgo
69+
6870
.PHONY: just-unit-tests
6971
just-unit-tests:
70-
ginkgo -r --randomize-all api/ internal/ pkg/
72+
$(GINKGO) -r --randomize-all api/ internal/ pkg/
7173

7274
.PHONY: integration-tests
7375
integration-tests::install-tools
@@ -81,7 +83,7 @@ integration-tests::just-integration-tests ## Run integration tests
8183

8284
.PHONY: just-integration-tests
8385
just-integration-tests:
84-
ginkgo -r controllers/
86+
$(GINKGO) -r controllers/
8587

8688
manifests: install-tools ## Generate manifests e.g. CRD, RBAC etc.
8789
controller-gen crd rbac:roleName=operator-role paths="./api/...;./controllers/..." output:crd:artifacts:config=config/crd/bases
@@ -232,7 +234,7 @@ cert-manager-rm:
232234
kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/v$(CERT_MANAGER_VERSION)/cert-manager.yaml --ignore-not-found
233235

234236
system-tests: install-tools ## Run end-to-end tests against Kubernetes cluster defined in ~/.kube/config
235-
NAMESPACE="$(SYSTEM_TEST_NAMESPACE)" K8S_OPERATOR_NAMESPACE="$(K8S_OPERATOR_NAMESPACE)" ginkgo -nodes=3 --randomize-all -r system_tests/
237+
NAMESPACE="$(SYSTEM_TEST_NAMESPACE)" K8S_OPERATOR_NAMESPACE="$(K8S_OPERATOR_NAMESPACE)" $(GINKGO) -nodes=3 --randomize-all -r system_tests/
236238

237239
kubectl-plugin-tests: ## Run kubectl-rabbitmq tests
238240
@echo "running kubectl plugin tests"

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

Lines changed: 145 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
annotations:
13-
controller-gen.kubebuilder.io/version: v0.18.0
13+
controller-gen.kubebuilder.io/version: v0.19.0
1414
name: rabbitmqclusters.rabbitmq.com
1515
spec:
1616
group: rabbitmq.com
@@ -605,8 +605,8 @@ spec:
605605
most preferred is the one with the greatest sum of weights, i.e.
606606
for each node that meets all of the scheduling requirements (resource
607607
request, requiredDuringScheduling anti-affinity expressions, etc.),
608-
compute a sum by iterating through the elements of this field and adding
609-
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
608+
compute a sum by iterating through the elements of this field and subtracting
609+
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
610610
node(s) with the highest sum are the most preferred.
611611
items:
612612
description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
@@ -1653,6 +1653,23 @@ spec:
16531653
- fieldPath
16541654
type: object
16551655
x-kubernetes-map-type: atomic
1656+
fileKeyRef:
1657+
properties:
1658+
key:
1659+
type: string
1660+
optional:
1661+
default: false
1662+
type: boolean
1663+
path:
1664+
type: string
1665+
volumeName:
1666+
type: string
1667+
required:
1668+
- key
1669+
- path
1670+
- volumeName
1671+
type: object
1672+
x-kubernetes-map-type: atomic
16561673
resourceFieldRef:
16571674
properties:
16581675
containerName:
@@ -2081,6 +2098,29 @@ spec:
20812098
type: object
20822099
restartPolicy:
20832100
type: string
2101+
restartPolicyRules:
2102+
items:
2103+
properties:
2104+
action:
2105+
type: string
2106+
exitCodes:
2107+
properties:
2108+
operator:
2109+
type: string
2110+
values:
2111+
items:
2112+
format: int32
2113+
type: integer
2114+
type: array
2115+
x-kubernetes-list-type: set
2116+
required:
2117+
- operator
2118+
type: object
2119+
required:
2120+
- action
2121+
type: object
2122+
type: array
2123+
x-kubernetes-list-type: atomic
20842124
securityContext:
20852125
properties:
20862126
allowPrivilegeEscalation:
@@ -2365,6 +2405,23 @@ spec:
23652405
- fieldPath
23662406
type: object
23672407
x-kubernetes-map-type: atomic
2408+
fileKeyRef:
2409+
properties:
2410+
key:
2411+
type: string
2412+
optional:
2413+
default: false
2414+
type: boolean
2415+
path:
2416+
type: string
2417+
volumeName:
2418+
type: string
2419+
required:
2420+
- key
2421+
- path
2422+
- volumeName
2423+
type: object
2424+
x-kubernetes-map-type: atomic
23682425
resourceFieldRef:
23692426
properties:
23702427
containerName:
@@ -2793,6 +2850,29 @@ spec:
27932850
type: object
27942851
restartPolicy:
27952852
type: string
2853+
restartPolicyRules:
2854+
items:
2855+
properties:
2856+
action:
2857+
type: string
2858+
exitCodes:
2859+
properties:
2860+
operator:
2861+
type: string
2862+
values:
2863+
items:
2864+
format: int32
2865+
type: integer
2866+
type: array
2867+
x-kubernetes-list-type: set
2868+
required:
2869+
- operator
2870+
type: object
2871+
required:
2872+
- action
2873+
type: object
2874+
type: array
2875+
x-kubernetes-list-type: atomic
27962876
securityContext:
27972877
properties:
27982878
allowPrivilegeEscalation:
@@ -3034,6 +3114,8 @@ spec:
30343114
type: boolean
30353115
hostname:
30363116
type: string
3117+
hostnameOverride:
3118+
type: string
30373119
imagePullSecrets:
30383120
items:
30393121
properties:
@@ -3091,6 +3173,23 @@ spec:
30913173
- fieldPath
30923174
type: object
30933175
x-kubernetes-map-type: atomic
3176+
fileKeyRef:
3177+
properties:
3178+
key:
3179+
type: string
3180+
optional:
3181+
default: false
3182+
type: boolean
3183+
path:
3184+
type: string
3185+
volumeName:
3186+
type: string
3187+
required:
3188+
- key
3189+
- path
3190+
- volumeName
3191+
type: object
3192+
x-kubernetes-map-type: atomic
30943193
resourceFieldRef:
30953194
properties:
30963195
containerName:
@@ -3519,6 +3618,29 @@ spec:
35193618
type: object
35203619
restartPolicy:
35213620
type: string
3621+
restartPolicyRules:
3622+
items:
3623+
properties:
3624+
action:
3625+
type: string
3626+
exitCodes:
3627+
properties:
3628+
operator:
3629+
type: string
3630+
values:
3631+
items:
3632+
format: int32
3633+
type: integer
3634+
type: array
3635+
x-kubernetes-list-type: set
3636+
required:
3637+
- operator
3638+
type: object
3639+
required:
3640+
- action
3641+
type: object
3642+
type: array
3643+
x-kubernetes-list-type: atomic
35223644
securityContext:
35233645
properties:
35243646
allowPrivilegeEscalation:
@@ -4598,6 +4720,25 @@ spec:
45984720
type: array
45994721
x-kubernetes-list-type: atomic
46004722
type: object
4723+
podCertificate:
4724+
properties:
4725+
certificateChainPath:
4726+
type: string
4727+
credentialBundlePath:
4728+
type: string
4729+
keyPath:
4730+
type: string
4731+
keyType:
4732+
type: string
4733+
maxExpirationSeconds:
4734+
format: int32
4735+
type: integer
4736+
signerName:
4737+
type: string
4738+
required:
4739+
- keyType
4740+
- signerName
4741+
type: object
46014742
secret:
46024743
properties:
46034744
items:
@@ -5005,7 +5146,7 @@ spec:
50055146
Claims lists the names of resources, defined in spec.resourceClaims,
50065147
that are used by this container.
50075148
5008-
This is an alpha field and requires enabling the
5149+
This field depends on the
50095150
DynamicResourceAllocation feature gate.
50105151
50115152
This field is immutable. It can only be set for containers.

0 commit comments

Comments
 (0)