Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a3ab4b0

Browse files
ansdansd
committedOct 9, 2020
Rename admin to default user
Closes #350
1 parent c6c8ccf commit a3ab4b0

18 files changed

+132
-129
lines changed
 

‎api/v1beta1/rabbitmqcluster_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,10 @@ type RabbitmqClusterStatus struct {
286286
Conditions []status.RabbitmqClusterCondition `json:"conditions"`
287287

288288
// Identifying information on internal resources
289-
Admin *RabbitmqClusterAdmin `json:"admin,omitempty"`
289+
DefaultUser *RabbitmqClusterDefaultUser `json:"defaultUser,omitempty"`
290290
}
291291

292-
type RabbitmqClusterAdmin struct {
292+
type RabbitmqClusterDefaultUser struct {
293293
SecretReference *RabbitmqClusterSecretReference `json:"secretReference,omitempty"`
294294
ServiceReference *RabbitmqClusterServiceReference `json:"serviceReference,omitempty"`
295295
}

‎api/v1beta1/zz_generated.deepcopy.go

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/kubectl-rabbitmq

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ usage() {
2323
echo " Open Management UI for an instance"
2424
echo " kubectl rabbitmq manage INSTANCE"
2525
echo
26-
echo " Print admin secrets for an instance"
26+
echo " Print default-user secrets for an instance"
2727
echo " kubectl rabbitmq secrets INSTANCE"
2828
echo
2929
echo " List all RabbitMQ clusters"
@@ -67,8 +67,8 @@ usage() {
6767

6868
get_instance_details() {
6969
instance=${1}
70-
username=$(kubectl get secret "${instance}-rabbitmq-admin" -o jsonpath="{.data.username}" | base64 --decode)
71-
password=$(kubectl get secret "${instance}-rabbitmq-admin" -o jsonpath="{.data.password}" | base64 --decode)
70+
username=$(kubectl get secret "${instance}-rabbitmq-default-user" -o jsonpath="{.data.username}" | base64 --decode)
71+
password=$(kubectl get secret "${instance}-rabbitmq-default-user" -o jsonpath="{.data.password}" | base64 --decode)
7272
service=${instance}-rabbitmq-client
7373
}
7474

‎charts/tsmgr/bind.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
template: |
1010
local clientFilterFunc(j) = std.length(std.findSubstr("rabbitmq-client", j.name)) > 0;
1111
local clientService = std.filter(clientFilterFunc, $.services)[0];
12-
local secretFilterFunc(j) = std.length(std.findSubstr("rabbitmq-admin", j.name)) > 0;
13-
local admin = std.filter(secretFilterFunc, $.secrets);
12+
local secretFilterFunc(j) = std.length(std.findSubstr("rabbitmq-default-user", j.name)) > 0;
13+
local defaultUser = std.filter(secretFilterFunc, $.secrets);
1414
1515
local vhost = "%2F";
1616
local ingress = if clientService.spec.type == "LoadBalancer" then
@@ -20,15 +20,15 @@ template: |
2020
clientService.status.loadBalancer.ingress[0].ip
2121
else
2222
clientService.spec.clusterIP;
23-
local adminUsername = admin[0].data['username'];
24-
local adminPassword = admin[0].data['password'];
25-
local mgmtURI = "http://" + ingress + ":15672/#/login/" + adminUsername + "/" + adminPassword;
26-
local apiURI = "http://" + adminUsername + ":" + adminPassword + "@" + ingress + ":15672/api/";
27-
local amqpURI = "amqp://" + adminUsername + ":" + adminPassword + "@" + ingress + "/" + vhost;
23+
local defaultUserUsername = defaultUser[0].data['username'];
24+
local defaultUserPassword = defaultUser[0].data['password'];
25+
local mgmtURI = "http://" + ingress + ":15672";
26+
local apiURI = "http://" + defaultUserUsername + ":" + defaultUserPassword + "@" + ingress + ":15672/api/";
27+
local amqpURI = "amqp://" + defaultUserUsername + ":" + defaultUserPassword + "@" + ingress + "/" + vhost;
2828
{
2929
"hostname": ingress,
30-
"username": adminUsername,
31-
"password": adminPassword,
30+
"username": defaultUserUsername,
31+
"password": defaultUserPassword,
3232
"dashboard_url": mgmtURI,
3333
"hostnames": [
3434
ingress
@@ -49,30 +49,30 @@ template: |
4949
"hosts": [
5050
ingress
5151
],
52-
"password": adminPassword,
52+
"password": defaultUserPassword,
5353
"port": 5672,
5454
"ssl": false,
5555
"uri": amqpURI,
5656
"uris": [
5757
amqpURI
5858
],
59-
"username": adminUsername,
59+
"username": defaultUserUsername,
6060
"vhost": vhost
6161
},
6262
"management": {
6363
"host": ingress,
6464
"hosts": [
6565
ingress
6666
],
67-
"password": adminPassword,
67+
"password": defaultUserPassword,
6868
"path": "/api/",
6969
"port": 15672,
7070
"ssl": false,
7171
"uri": apiURI,
7272
"uris": [
7373
apiURI
7474
],
75-
"username": adminUsername
75+
"username": defaultUserUsername
7676
}
7777
},
7878
}

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3758,35 +3758,6 @@ spec:
37583758
status:
37593759
description: Status presents the observed state of RabbitmqCluster
37603760
properties:
3761-
admin:
3762-
description: Identifying information on internal resources
3763-
properties:
3764-
secretReference:
3765-
properties:
3766-
keys:
3767-
additionalProperties:
3768-
type: string
3769-
type: object
3770-
name:
3771-
type: string
3772-
namespace:
3773-
type: string
3774-
required:
3775-
- keys
3776-
- name
3777-
- namespace
3778-
type: object
3779-
serviceReference:
3780-
properties:
3781-
name:
3782-
type: string
3783-
namespace:
3784-
type: string
3785-
required:
3786-
- name
3787-
- namespace
3788-
type: object
3789-
type: object
37903761
clusterStatus:
37913762
type: string
37923763
conditions:
@@ -3817,6 +3788,35 @@ spec:
38173788
- type
38183789
type: object
38193790
type: array
3791+
defaultUser:
3792+
description: Identifying information on internal resources
3793+
properties:
3794+
secretReference:
3795+
properties:
3796+
keys:
3797+
additionalProperties:
3798+
type: string
3799+
type: object
3800+
name:
3801+
type: string
3802+
namespace:
3803+
type: string
3804+
required:
3805+
- keys
3806+
- name
3807+
- namespace
3808+
type: object
3809+
serviceReference:
3810+
properties:
3811+
name:
3812+
type: string
3813+
namespace:
3814+
type: string
3815+
required:
3816+
- name
3817+
- namespace
3818+
type: object
3819+
type: object
38203820
required:
38213821
- conditions
38223822
type: object

‎controllers/rabbitmqcluster_controller.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, er
205205
"name", rabbitmqCluster.Name)
206206
}
207207

208-
if err := r.setAdminStatus(ctx, rabbitmqCluster); err != nil {
208+
if err := r.setDefaultUserStatus(ctx, rabbitmqCluster); err != nil {
209209
return ctrl.Result{}, err
210210
}
211211

@@ -272,28 +272,28 @@ func (r *RabbitmqClusterReconciler) checkTLSSecrets(ctx context.Context, rabbitm
272272
return ctrl.Result{}, nil
273273
}
274274

275-
func (r *RabbitmqClusterReconciler) setAdminStatus(ctx context.Context, rmq *rabbitmqv1beta1.RabbitmqCluster) error {
275+
func (r *RabbitmqClusterReconciler) setDefaultUserStatus(ctx context.Context, rmq *rabbitmqv1beta1.RabbitmqCluster) error {
276276

277-
adminStatus := &rabbitmqv1beta1.RabbitmqClusterAdmin{}
277+
defaultUserStatus := &rabbitmqv1beta1.RabbitmqClusterDefaultUser{}
278278

279279
serviceRef := &rabbitmqv1beta1.RabbitmqClusterServiceReference{
280280
Name: rmq.ChildResourceName("client"),
281281
Namespace: rmq.Namespace,
282282
}
283-
adminStatus.ServiceReference = serviceRef
283+
defaultUserStatus.ServiceReference = serviceRef
284284

285285
secretRef := &rabbitmqv1beta1.RabbitmqClusterSecretReference{
286-
Name: rmq.ChildResourceName(resource.AdminSecretName),
286+
Name: rmq.ChildResourceName(resource.DefaultUserSecretName),
287287
Namespace: rmq.Namespace,
288288
Keys: map[string]string{
289289
"username": "username",
290290
"password": "password",
291291
},
292292
}
293-
adminStatus.SecretReference = secretRef
293+
defaultUserStatus.SecretReference = secretRef
294294

295-
if !reflect.DeepEqual(rmq.Status.Admin, adminStatus) {
296-
rmq.Status.Admin = adminStatus
295+
if !reflect.DeepEqual(rmq.Status.DefaultUser, defaultUserStatus) {
296+
rmq.Status.DefaultUser = defaultUserStatus
297297
if err := r.Status().Update(ctx, rmq); err != nil {
298298
return err
299299
}

‎controllers/rabbitmqcluster_controller_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ var _ = Describe("RabbitmqClusterController", func() {
113113
Expect(configMap.OwnerReferences[0].Name).To(Equal(cluster.Name))
114114
})
115115

116-
By("creating a rabbitmq admin secret", func() {
117-
secretName := cluster.ChildResourceName("admin")
116+
By("creating a rabbitmq default-user secret", func() {
117+
secretName := cluster.ChildResourceName("default-user")
118118
secret, err := clientSet.CoreV1().Secrets(cluster.Namespace).Get(ctx, secretName, metav1.GetOptions{})
119119
Expect(err).NotTo(HaveOccurred())
120120
Expect(secret.Name).To(Equal(secretName))
@@ -173,7 +173,7 @@ var _ = Describe("RabbitmqClusterController", func() {
173173
Expect(allEventMsgs).To(ContainSubstring("created resource %s of Type *v1.ConfigMap", cluster.ChildResourceName("plugins-conf")))
174174
Expect(allEventMsgs).To(ContainSubstring("created resource %s of Type *v1.ConfigMap", cluster.ChildResourceName("server-conf")))
175175
Expect(allEventMsgs).To(ContainSubstring("created resource %s of Type *v1.Secret", cluster.ChildResourceName("erlang-cookie")))
176-
Expect(allEventMsgs).To(ContainSubstring("created resource %s of Type *v1.Secret", cluster.ChildResourceName("admin")))
176+
Expect(allEventMsgs).To(ContainSubstring("created resource %s of Type *v1.Secret", cluster.ChildResourceName("default-user")))
177177
Expect(allEventMsgs).To(ContainSubstring("created resource %s of Type *v1.ServiceAccount", cluster.ChildResourceName("server")))
178178
Expect(allEventMsgs).To(ContainSubstring("created resource %s of Type *v1.Role", cluster.ChildResourceName("peer-discovery")))
179179
Expect(allEventMsgs).To(ContainSubstring("created resource %s of Type *v1.RoleBinding", cluster.ChildResourceName("server")))
@@ -194,7 +194,7 @@ var _ = Describe("RabbitmqClusterController", func() {
194194
}, 5).Should(Equal("deletion.finalizers.rabbitmqclusters.rabbitmq.com"))
195195
})
196196

197-
By("setting the admin secret details in the custom resource status", func() {
197+
By("setting the default-user secret details in the custom resource status", func() {
198198
rmq := &rabbitmqv1beta1.RabbitmqCluster{}
199199
secretRef := &rabbitmqv1beta1.RabbitmqClusterSecretReference{}
200200
Eventually(func() *rabbitmqv1beta1.RabbitmqClusterSecretReference {
@@ -203,15 +203,15 @@ var _ = Describe("RabbitmqClusterController", func() {
203203
return nil
204204
}
205205

206-
if rmq.Status.Admin != nil && rmq.Status.Admin.SecretReference != nil {
207-
secretRef = rmq.Status.Admin.SecretReference
206+
if rmq.Status.DefaultUser != nil && rmq.Status.DefaultUser.SecretReference != nil {
207+
secretRef = rmq.Status.DefaultUser.SecretReference
208208
return secretRef
209209
}
210210

211211
return nil
212212
}, 5).ShouldNot(BeNil())
213213

214-
Expect(secretRef.Name).To(Equal(rmq.ChildResourceName(resource.AdminSecretName)))
214+
Expect(secretRef.Name).To(Equal(rmq.ChildResourceName(resource.DefaultUserSecretName)))
215215
Expect(secretRef.Namespace).To(Equal(rmq.Namespace))
216216
Expect(secretRef.Keys).To(HaveKeyWithValue("username", "username"))
217217
Expect(secretRef.Keys).To(HaveKeyWithValue("password", "password"))
@@ -226,8 +226,8 @@ var _ = Describe("RabbitmqClusterController", func() {
226226
return nil
227227
}
228228

229-
if rmq.Status.Admin != nil && rmq.Status.Admin.ServiceReference != nil {
230-
serviceRef = rmq.Status.Admin.ServiceReference
229+
if rmq.Status.DefaultUser != nil && rmq.Status.DefaultUser.ServiceReference != nil {
230+
serviceRef = rmq.Status.DefaultUser.ServiceReference
231231
return serviceRef
232232
}
233233

@@ -803,7 +803,7 @@ var _ = Describe("RabbitmqClusterController", func() {
803803

804804
It("updates annotations for secrets", func() {
805805
Eventually(func() map[string]string {
806-
roleBinding, err := clientSet.CoreV1().Secrets(cluster.Namespace).Get(ctx, cluster.ChildResourceName("admin"), metav1.GetOptions{})
806+
roleBinding, err := clientSet.CoreV1().Secrets(cluster.Namespace).Get(ctx, cluster.ChildResourceName("default-user"), metav1.GetOptions{})
807807
Expect(err).NotTo(HaveOccurred())
808808
return roleBinding.Annotations
809809
}, 3).Should(HaveKeyWithValue(annotationKey, annotationValue))
@@ -1220,7 +1220,7 @@ var _ = Describe("RabbitmqClusterController", func() {
12201220
{
12211221
Secret: &corev1.SecretProjection{
12221222
LocalObjectReference: corev1.LocalObjectReference{
1223-
Name: "rabbitmq-sts-override-rabbitmq-admin",
1223+
Name: "rabbitmq-sts-override-rabbitmq-default-user",
12241224
},
12251225
Items: []corev1.KeyToPath{
12261226
{

‎docs/examples/federation-over-tls/setup.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ sleep 2
88
kubectl wait --for=condition=Ready pod/upstream-rabbitmq-server-0
99
kubectl wait --for=condition=Ready pod/downstream-rabbitmq-server-0
1010

11-
UPSTREAM_USERNAME=$(kubectl get secret upstream-rabbitmq-admin -o jsonpath="{.data.username}" | base64 --decode)
12-
UPSTREAM_PASSWORD=$(kubectl get secret upstream-rabbitmq-admin -o jsonpath="{.data.password}" | base64 --decode)
13-
DOWNSTREAM_USERNAME=$(kubectl get secret downstream-rabbitmq-admin -o jsonpath="{.data.username}" | base64 --decode)
14-
DOWNSTREAM_PASSWORD=$(kubectl get secret downstream-rabbitmq-admin -o jsonpath="{.data.password}" | base64 --decode)
11+
UPSTREAM_USERNAME=$(kubectl get secret upstream-rabbitmq-default-user -o jsonpath="{.data.username}" | base64 --decode)
12+
UPSTREAM_PASSWORD=$(kubectl get secret upstream-rabbitmq-default-user -o jsonpath="{.data.password}" | base64 --decode)
13+
DOWNSTREAM_USERNAME=$(kubectl get secret downstream-rabbitmq-default-user -o jsonpath="{.data.username}" | base64 --decode)
14+
DOWNSTREAM_PASSWORD=$(kubectl get secret downstream-rabbitmq-default-user -o jsonpath="{.data.password}" | base64 --decode)
1515

1616
kubectl exec downstream-rabbitmq-server-0 -- rabbitmqctl set_parameter federation-upstream my-upstream "{\"uri\":\"amqps://${UPSTREAM_USERNAME}:${UPSTREAM_PASSWORD}@upstream-rabbitmq-client\",\"expires\":3600001}"
1717

@@ -26,8 +26,8 @@ read
2626
UPSTREAM_RABBITMQADMIN="rabbitmqadmin -U http://upstream-rabbitmq-client/ -u ${UPSTREAM_USERNAME} -p ${UPSTREAM_PASSWORD} -V /"
2727
DOWNSTREAM_RABBITMQADMIN="rabbitmqadmin -U http://downstream-rabbitmq-client/ -u ${DOWNSTREAM_USERNAME} -p ${DOWNSTREAM_PASSWORD} -V /"
2828

29-
$RABBITMQADMIN_UPSTREAM declare queue name=test.queue queue_type=quorum
30-
$RABBITMQADMIN_UPSTREAM declare binding source=amq.fanout destination=test.queue
29+
$UPSTREAM_RABBITMQADMIN declare queue name=test.queue queue_type=quorum
30+
$UPSTREAM_RABBITMQADMIN declare binding source=amq.fanout destination=test.queue
3131

3232
$DOWNSTREAM_RABBITMQADMIN declare queue name=test.queue queue_type=quorum
3333
$DOWNSTREAM_RABBITMQADMIN declare binding source=amq.fanout destination=test.queue

‎docs/examples/import-definitions/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ kubectl create configmap definitions --from-file='def.json=/my/path/to/definitio
2121

2222
Then, leverage the StatefulSet Override to mount this additional ConfigMap `definitions` to your rabbitmqcluster instance. Check out `rabbitmq.yaml` as an example.
2323

24-
Keep in mind that exported definitions contain all broker objects, including users. This means that the admin user credentials will be imported from the definitions, and will not be the one which is generated at the creation of the deployment as a kubernetes secret object.
24+
Keep in mind that exported definitions contain all broker objects, including users. This means that the default-user credentials will be imported from the definitions, and will not be the one which is generated at the creation of the deployment as a kubernetes secret object.

‎docs/proposals/implemented/20200310-crd-spec-configurability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ In our team roadmap we decided to coup the lack of user feedbacks by offering [d
5858

5959
## Proposal
6060

61-
This proposal adds the ability to override statefulSet and client service template directly through the CRD spec. Our operator creates 9 kubernetes child recourses directly for each `RabbitmqCluster`: client Service, headless Service, StatefulSet, ConfigMap, erlang cookie secret, admin secret, rbac role, role binding, service account. Among these resources, we allow users to partially configure the StatefulSet, the client Service, and the pods that StatefulSet creates. The proposal focuses on 2 child recourses: client Service and StatefulSet to increase configurability, since there is no obvious use case for now that involves configuring any of the other child resources. We can add overrides for other resources when we see fit in the future.
61+
This proposal adds the ability to override statefulSet and client service template directly through the CRD spec. Our operator creates 9 kubernetes child recourses directly for each `RabbitmqCluster`: client Service, headless Service, StatefulSet, ConfigMap, erlang cookie secret, default user secret, rbac role, role binding, service account. Among these resources, we allow users to partially configure the StatefulSet, the client Service, and the pods that StatefulSet creates. The proposal focuses on 2 child recourses: client Service and StatefulSet to increase configurability, since there is no obvious use case for now that involves configuring any of the other child resources. We can add overrides for other resources when we see fit in the future.
6262

6363
A brief summary of the proposed plan:
6464
* Add an override section to CRD spec which supports statefulSetOverride and clientServiceOverride

‎internal/resource/admin_secret.go renamed to ‎internal/resource/default_user_secret.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ import (
2424
)
2525

2626
const (
27-
AdminSecretName = "admin"
27+
DefaultUserSecretName = "default-user"
2828
)
2929

30-
type AdminSecretBuilder struct {
30+
type DefaultUserSecretBuilder struct {
3131
Instance *rabbitmqv1beta1.RabbitmqCluster
3232
Scheme *runtime.Scheme
3333
}
3434

35-
func (builder *RabbitmqResourceBuilder) AdminSecret() *AdminSecretBuilder {
36-
return &AdminSecretBuilder{
35+
func (builder *RabbitmqResourceBuilder) DefaultUserSecret() *DefaultUserSecretBuilder {
36+
return &DefaultUserSecretBuilder{
3737
Instance: builder.Instance,
3838
Scheme: builder.Scheme,
3939
}
4040
}
4141

42-
func (builder *AdminSecretBuilder) Build() (runtime.Object, error) {
42+
func (builder *DefaultUserSecretBuilder) Build() (runtime.Object, error) {
4343
username, err := randomEncodedString(24)
4444
if err != nil {
4545
return nil, err
@@ -57,7 +57,7 @@ func (builder *AdminSecretBuilder) Build() (runtime.Object, error) {
5757

5858
return &corev1.Secret{
5959
ObjectMeta: metav1.ObjectMeta{
60-
Name: builder.Instance.ChildResourceName(AdminSecretName),
60+
Name: builder.Instance.ChildResourceName(DefaultUserSecretName),
6161
Namespace: builder.Instance.Namespace,
6262
},
6363
Type: corev1.SecretTypeOpaque,
@@ -69,7 +69,7 @@ func (builder *AdminSecretBuilder) Build() (runtime.Object, error) {
6969
}, nil
7070
}
7171

72-
func (builder *AdminSecretBuilder) Update(object runtime.Object) error {
72+
func (builder *DefaultUserSecretBuilder) Update(object runtime.Object) error {
7373
secret := object.(*corev1.Secret)
7474
secret.Labels = metadata.GetLabels(builder.Instance.Name, builder.Instance.Labels)
7575
secret.Annotations = metadata.ReconcileAndFilterAnnotations(secret.GetAnnotations(), builder.Instance.Annotations)
@@ -81,7 +81,7 @@ func (builder *AdminSecretBuilder) Update(object runtime.Object) error {
8181
return nil
8282
}
8383

84-
func (builder *AdminSecretBuilder) UpdateRequiresStsRestart() bool {
84+
func (builder *DefaultUserSecretBuilder) UpdateRequiresStsRestart() bool {
8585
return false
8686
}
8787

‎internal/resource/admin_secret_test.go renamed to ‎internal/resource/default_user_secret_test.go

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package resource_test
1111

1212
import (
1313
b64 "encoding/base64"
14+
1415
"gopkg.in/ini.v1"
1516
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1617
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -24,13 +25,13 @@ import (
2425
corev1 "k8s.io/api/core/v1"
2526
)
2627

27-
var _ = Describe("AdminSecret", func() {
28+
var _ = Describe("DefaultUserSecret", func() {
2829
var (
29-
secret *corev1.Secret
30-
instance rabbitmqv1beta1.RabbitmqCluster
31-
builder *resource.RabbitmqResourceBuilder
32-
adminSecretBuilder *resource.AdminSecretBuilder
33-
scheme *runtime.Scheme
30+
secret *corev1.Secret
31+
instance rabbitmqv1beta1.RabbitmqCluster
32+
builder *resource.RabbitmqResourceBuilder
33+
defaultUserSecretBuilder *resource.DefaultUserSecretBuilder
34+
scheme *runtime.Scheme
3435
)
3536

3637
BeforeEach(func() {
@@ -47,21 +48,21 @@ var _ = Describe("AdminSecret", func() {
4748
Instance: &instance,
4849
Scheme: scheme,
4950
}
50-
adminSecretBuilder = builder.AdminSecret()
51+
defaultUserSecretBuilder = builder.DefaultUserSecret()
5152
})
5253

5354
Context("Build with defaults", func() {
54-
It("creates the necessary admin secret", func() {
55+
It("creates the necessary default-user secret", func() {
5556
var username []byte
5657
var password []byte
5758
var ok bool
5859

59-
obj, err := adminSecretBuilder.Build()
60+
obj, err := defaultUserSecretBuilder.Build()
6061
Expect(err).NotTo(HaveOccurred())
6162
secret = obj.(*corev1.Secret)
6263

6364
By("creating the secret with correct name and namespace", func() {
64-
Expect(secret.Name).To(Equal(instance.ChildResourceName("admin")))
65+
Expect(secret.Name).To(Equal(instance.ChildResourceName("default-user")))
6566
Expect(secret.Namespace).To(Equal("a namespace"))
6667
})
6768

@@ -124,7 +125,7 @@ var _ = Describe("AdminSecret", func() {
124125
},
125126
},
126127
}
127-
err := adminSecretBuilder.Update(secret)
128+
err := defaultUserSecretBuilder.Update(secret)
128129
Expect(err).NotTo(HaveOccurred())
129130

130131
By("adding new labels from the CR", func() {
@@ -172,10 +173,10 @@ var _ = Describe("AdminSecret", func() {
172173
},
173174
},
174175
}
175-
err := adminSecretBuilder.Update(secret)
176+
err := defaultUserSecretBuilder.Update(secret)
176177
Expect(err).NotTo(HaveOccurred())
177178

178-
By("updating secret annotations on admin secret", func() {
179+
By("updating secret annotations on default-user secret", func() {
179180
expectedAnnotations := map[string]string{
180181
"my-annotation": "i-like-this",
181182
"i-was-here-already": "please-dont-delete-me",
@@ -197,7 +198,7 @@ var _ = Describe("AdminSecret", func() {
197198
Name: "rabbit1",
198199
},
199200
}
200-
Expect(adminSecretBuilder.Update(secret)).NotTo(HaveOccurred())
201+
Expect(defaultUserSecretBuilder.Update(secret)).NotTo(HaveOccurred())
201202
Expect(secret.OwnerReferences[0].Name).To(Equal(instance.Name))
202203
})
203204
})

‎internal/resource/erlang_cookie_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package resource_test
1111

1212
import (
1313
b64 "encoding/base64"
14+
1415
"k8s.io/apimachinery/pkg/runtime"
1516
defaultscheme "k8s.io/client-go/kubernetes/scheme"
1617

@@ -102,7 +103,7 @@ var _ = Describe("ErlangCookie", func() {
102103
Expect(err).NotTo(HaveOccurred())
103104
})
104105

105-
It("adds labels from the CRD on the admin secret", func() {
106+
It("adds labels from the CRD on the default-user secret", func() {
106107
testLabels(secret.Labels)
107108
})
108109

‎internal/resource/rabbitmq_resource_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (builder *RabbitmqResourceBuilder) ResourceBuilders() ([]ResourceBuilder, e
3030
builder.HeadlessService(),
3131
builder.ClientService(),
3232
builder.ErlangCookie(),
33-
builder.AdminSecret(),
33+
builder.DefaultUserSecret(),
3434
builder.RabbitmqPluginsConfigMap(),
3535
builder.ServerConfigMap(),
3636
builder.ServiceAccount(),

‎internal/resource/rabbitmq_resource_builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var _ = Describe("RabbitmqResourceBuilder", func() {
5555
&HeadlessServiceBuilder{},
5656
&ClientServiceBuilder{},
5757
&ErlangCookieBuilder{},
58-
&AdminSecretBuilder{},
58+
&DefaultUserSecretBuilder{},
5959
&RabbitmqPluginsConfigMapBuilder{},
6060
&ServerConfigMapBuilder{},
6161
&ServiceAccountBuilder{},

‎internal/resource/statefulset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func (builder *StatefulSetBuilder) podTemplateSpec(annotations, labels map[strin
286286
{
287287
Secret: &corev1.SecretProjection{
288288
LocalObjectReference: corev1.LocalObjectReference{
289-
Name: builder.Instance.ChildResourceName(AdminSecretName),
289+
Name: builder.Instance.ChildResourceName(DefaultUserSecretName),
290290
},
291291
Items: []corev1.KeyToPath{
292292
{

‎internal/resource/statefulset_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ var _ = Describe("StatefulSet", func() {
855855
{
856856
Secret: &corev1.SecretProjection{
857857
LocalObjectReference: corev1.LocalObjectReference{
858-
Name: builder.Instance.ChildResourceName("admin"),
858+
Name: builder.Instance.ChildResourceName("default-user"),
859859
},
860860
Items: []corev1.KeyToPath{
861861
{

‎system_tests/utils.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"fmt"
1919
"io"
2020
"io/ioutil"
21-
k8sresource "k8s.io/apimachinery/pkg/api/resource"
2221
"log"
2322
"net/http"
2423
"os"
@@ -28,6 +27,8 @@ import (
2827
"strings"
2928
"time"
3029

30+
k8sresource "k8s.io/apimachinery/pkg/api/resource"
31+
3132
"sigs.k8s.io/controller-runtime/pkg/client"
3233

3334
"github.com/cloudflare/cfssl/csr"
@@ -357,19 +358,19 @@ type HealthcheckResponse struct {
357358
}
358359

359360
func getUsernameAndPassword(ctx context.Context, clientset *kubernetes.Clientset, namespace, instanceName string) (string, string, error) {
360-
secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, fmt.Sprintf("%s-rabbitmq-admin", instanceName), metav1.GetOptions{})
361+
secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, fmt.Sprintf("%s-rabbitmq-default-user", instanceName), metav1.GetOptions{})
361362
if err != nil {
362363
return "", "", err
363364
}
364365

365366
username, ok := secret.Data["username"]
366367
if !ok {
367-
return "", "", fmt.Errorf("cannot find 'username' in %s-rabbitmq-admin", instanceName)
368+
return "", "", fmt.Errorf("cannot find 'username' in %s-rabbitmq-default-user", instanceName)
368369
}
369370

370371
password, ok := secret.Data["password"]
371372
if !ok {
372-
return "", "", fmt.Errorf("cannot find 'password' in %s-rabbitmq-admin", instanceName)
373+
return "", "", fmt.Errorf("cannot find 'password' in %s-rabbitmq-default-user", instanceName)
373374
}
374375
return string(username), string(password), nil
375376
}

0 commit comments

Comments
 (0)
Please sign in to comment.