Skip to content

Commit 4c87d13

Browse files
ChunyiLyuChunyiLyu
authored
Merge pull request #388 from rabbitmq/rename-admin-to-defaultuser
Rename admin to default user
2 parents 162eb6b + a3ab4b0 commit 4c87d13

18 files changed

+164
-161
lines changed

‎api/v1beta1/rabbitmqcluster_types.go

+2-2
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

+24-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/kubectl-rabbitmq

+3-3
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

+13-13
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

+29-29
Original file line numberDiff line numberDiff line change
@@ -3779,35 +3779,6 @@ spec:
37793779
status:
37803780
description: Status presents the observed state of RabbitmqCluster
37813781
properties:
3782-
admin:
3783-
description: Identifying information on internal resources
3784-
properties:
3785-
secretReference:
3786-
properties:
3787-
keys:
3788-
additionalProperties:
3789-
type: string
3790-
type: object
3791-
name:
3792-
type: string
3793-
namespace:
3794-
type: string
3795-
required:
3796-
- keys
3797-
- name
3798-
- namespace
3799-
type: object
3800-
serviceReference:
3801-
properties:
3802-
name:
3803-
type: string
3804-
namespace:
3805-
type: string
3806-
required:
3807-
- name
3808-
- namespace
3809-
type: object
3810-
type: object
38113782
clusterStatus:
38123783
type: string
38133784
conditions:
@@ -3838,6 +3809,35 @@ spec:
38383809
- type
38393810
type: object
38403811
type: array
3812+
defaultUser:
3813+
description: Identifying information on internal resources
3814+
properties:
3815+
secretReference:
3816+
properties:
3817+
keys:
3818+
additionalProperties:
3819+
type: string
3820+
type: object
3821+
name:
3822+
type: string
3823+
namespace:
3824+
type: string
3825+
required:
3826+
- keys
3827+
- name
3828+
- namespace
3829+
type: object
3830+
serviceReference:
3831+
properties:
3832+
name:
3833+
type: string
3834+
namespace:
3835+
type: string
3836+
required:
3837+
- name
3838+
- namespace
3839+
type: object
3840+
type: object
38413841
required:
38423842
- conditions
38433843
type: object

‎controllers/rabbitmqcluster_controller.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, er
210210
"name", rabbitmqCluster.Name)
211211
}
212212

213-
if err := r.setAdminStatus(ctx, rabbitmqCluster); err != nil {
213+
if err := r.setDefaultUserStatus(ctx, rabbitmqCluster); err != nil {
214214
return ctrl.Result{}, err
215215
}
216216

@@ -279,28 +279,28 @@ func (r *RabbitmqClusterReconciler) checkTLSSecrets(ctx context.Context, rabbitm
279279
return ctrl.Result{}, nil
280280
}
281281

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

284-
adminStatus := &rabbitmqv1beta1.RabbitmqClusterAdmin{}
284+
defaultUserStatus := &rabbitmqv1beta1.RabbitmqClusterDefaultUser{}
285285

286286
serviceRef := &rabbitmqv1beta1.RabbitmqClusterServiceReference{
287287
Name: rmq.ChildResourceName("client"),
288288
Namespace: rmq.Namespace,
289289
}
290-
adminStatus.ServiceReference = serviceRef
290+
defaultUserStatus.ServiceReference = serviceRef
291291

292292
secretRef := &rabbitmqv1beta1.RabbitmqClusterSecretReference{
293-
Name: rmq.ChildResourceName(resource.AdminSecretName),
293+
Name: rmq.ChildResourceName(resource.DefaultUserSecretName),
294294
Namespace: rmq.Namespace,
295295
Keys: map[string]string{
296296
"username": "username",
297297
"password": "password",
298298
},
299299
}
300-
adminStatus.SecretReference = secretRef
300+
defaultUserStatus.SecretReference = secretRef
301301

302-
if !reflect.DeepEqual(rmq.Status.Admin, adminStatus) {
303-
rmq.Status.Admin = adminStatus
302+
if !reflect.DeepEqual(rmq.Status.DefaultUser, defaultUserStatus) {
303+
rmq.Status.DefaultUser = defaultUserStatus
304304
if err := r.Status().Update(ctx, rmq); err != nil {
305305
return err
306306
}

‎controllers/rabbitmqcluster_controller_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ var _ = Describe("RabbitmqClusterController", func() {
114114
Expect(configMap.OwnerReferences[0].Name).To(Equal(cluster.Name))
115115
})
116116

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

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

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

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

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

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

@@ -804,7 +804,7 @@ var _ = Describe("RabbitmqClusterController", func() {
804804

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

0 commit comments

Comments
 (0)