Skip to content

Commit 870c6af

Browse files
authored
Make rabbitmq image configurable (#481)
Make rabbitmq image configurable by setting environment variables so that we can run system tests using the commercial rabbitmq image as well as using the OSS rabbitmq image.
1 parent 7824d1e commit 870c6af

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

system_tests/system_tests.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import (
2222
"gopkg.in/ini.v1"
2323

2424
rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
25-
corev1 "k8s.io/api/core/v1"
26-
k8sresource "k8s.io/apimachinery/pkg/api/resource"
2725
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2826
"k8s.io/utils/pointer"
2927
)
@@ -441,10 +439,6 @@ CONSOLE_LOG=new`
441439
BeforeEach(func() {
442440
instanceName := "mqtt-stomp-rabbit"
443441
cluster = newRabbitmqCluster(namespace, instanceName)
444-
cluster.Spec.Resources = &corev1.ResourceRequirements{
445-
Requests: map[corev1.ResourceName]k8sresource.Quantity{},
446-
Limits: map[corev1.ResourceName]k8sresource.Quantity{},
447-
}
448442
cluster.Spec.Service.Type = "NodePort"
449443
cluster.Spec.Rabbitmq.AdditionalPlugins = []rabbitmqv1beta1.Plugin{
450444
"rabbitmq_mqtt",

system_tests/utils.go

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ type featureFlag struct {
6363
func MustHaveEnv(name string) string {
6464
value := os.Getenv(name)
6565
if value == "" {
66-
panic(fmt.Sprintf("Value '%s' not found", name))
66+
panic(fmt.Sprintf("Environment variable '%s' not found", name))
6767
}
6868
return value
6969
}
@@ -404,7 +404,7 @@ func getUsernameAndPassword(ctx context.Context, clientset *kubernetes.Clientset
404404
}
405405

406406
func newRabbitmqCluster(namespace, instanceName string) *rabbitmqv1beta1.RabbitmqCluster {
407-
return &rabbitmqv1beta1.RabbitmqCluster{
407+
cluster := &rabbitmqv1beta1.RabbitmqCluster{
408408
ObjectMeta: metav1.ObjectMeta{
409409
Name: instanceName,
410410
Namespace: namespace,
@@ -413,12 +413,30 @@ func newRabbitmqCluster(namespace, instanceName string) *rabbitmqv1beta1.Rabbitm
413413
Service: rabbitmqv1beta1.RabbitmqClusterServiceSpec{
414414
Type: "NodePort",
415415
},
416+
// run system tests with low resources so that they can run on GitHub actions
416417
Resources: &corev1.ResourceRequirements{
417-
Requests: map[corev1.ResourceName]k8sresource.Quantity{},
418-
Limits: map[corev1.ResourceName]k8sresource.Quantity{},
418+
Requests: map[corev1.ResourceName]k8sresource.Quantity{
419+
corev1.ResourceCPU: k8sresource.MustParse("100m"),
420+
corev1.ResourceMemory: k8sresource.MustParse("500M"),
421+
},
422+
Limits: map[corev1.ResourceName]k8sresource.Quantity{
423+
corev1.ResourceCPU: k8sresource.MustParse("1000m"),
424+
corev1.ResourceMemory: k8sresource.MustParse("500M"),
425+
},
419426
},
420427
},
421428
}
429+
430+
if image := os.Getenv("RABBITMQ_IMAGE"); image != "" {
431+
cluster.Spec.Image = image
432+
}
433+
if secret := os.Getenv("RABBITMQ_IMAGE_PULL_SECRET"); secret != "" {
434+
cluster.Spec.ImagePullSecrets = []corev1.LocalObjectReference{
435+
corev1.LocalObjectReference{Name: secret},
436+
}
437+
}
438+
439+
return cluster
422440
}
423441

424442
//the updateFn can change properties of the RabbitmqCluster CR

0 commit comments

Comments
 (0)