Skip to content

Commit 48e70ba

Browse files
ndkndk
committed
labels, annotations:"grafana.integreatly.org" -> "operator.grafana.com"
1 parent ef9a62a commit 48e70ba

File tree

10 files changed

+151
-182
lines changed

10 files changed

+151
-182
lines changed

‎controllers/serviceaccount_controller.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -781,10 +781,9 @@ func isEqualExpirationTime(a, b *metav1.Time) bool {
781781

782782
func buildSecretLabels(cr *v1beta1.GrafanaServiceAccount) map[string]string {
783783
return map[string]string{
784-
"app": "grafana-serviceaccount-token",
785-
"grafana.integreatly.org/service-account-instance": cr.Spec.InstanceName,
786-
"grafana.integreatly.org/service-account-name": cr.Name,
787-
"grafana.integreatly.org/service-account-uid": string(cr.UID),
784+
"operator.grafana.com/service-account-instance": cr.Spec.InstanceName,
785+
"operator.grafana.com/service-account-name": cr.Name,
786+
"operator.grafana.com/service-account-uid": string(cr.UID),
788787
}
789788
}
790789

@@ -797,7 +796,7 @@ func extractTokenNameFromSecret(secret *corev1.Secret) (string, bool) {
797796
return "", false
798797
}
799798

800-
tokenName, ok := secret.Annotations["grafana.integreatly.org/service-account-token-name"]
799+
tokenName, ok := secret.Annotations["operator.grafana.com/service-account-token-name"]
801800

802801
return tokenName, ok
803802
}
@@ -816,9 +815,9 @@ func buildTokenSecret(
816815
Namespace: cr.Namespace,
817816
Labels: buildSecretLabels(cr),
818817
Annotations: map[string]string{
819-
"grafana.integreatly.org/service-account-spec-name": cr.Spec.Name,
820-
"grafana.integreatly.org/service-account-uid": string(cr.UID),
821-
"grafana.integreatly.org/service-account-token-name": tokenStatus.Name,
818+
"operator.grafana.com/service-account-spec-name": cr.Spec.Name,
819+
"operator.grafana.com/service-account-uid": string(cr.UID),
820+
"operator.grafana.com/service-account-token-name": tokenStatus.Name,
822821
},
823822
},
824823
Type: corev1.SecretTypeOpaque,
@@ -830,7 +829,7 @@ func buildTokenSecret(
830829
}
831830

832831
if tokenStatus.Expires != nil {
833-
secret.Annotations["grafana.integreatly.org/service-account-token-expiry"] = tokenStatus.Expires.Format(time.RFC3339)
832+
secret.Annotations["operator.grafana.com/service-account-token-expiry"] = tokenStatus.Expires.Format(time.RFC3339)
834833
}
835834

836835
model2.SetInheritedLabels(secret, cr.Labels)
@@ -860,7 +859,7 @@ func renewSecret(
860859
secret.Annotations = map[string]string{}
861860
}
862861

863-
secret.Annotations["grafana.integreatly.org/service-account-token-id"] = strconv.FormatInt(tokenStatus.ID, 10)
862+
secret.Annotations["operator.grafana.com/service-account-token-id"] = strconv.FormatInt(tokenStatus.ID, 10)
864863
}
865864

866865
// SetupWithManager sets up the controller with the Manager.

‎controllers/serviceaccount_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ var _ = Describe("ServiceAccount Controller: Integration Tests", func() {
8181

8282
Expect(secret).To(PointTo(MatchFields(IgnoreExtras, Fields{
8383
"ObjectMeta": MatchFields(IgnoreExtras, Fields{
84-
"Labels": HaveKeyWithValue("grafana.integreatly.org/service-account-name", name),
85-
"Annotations": HaveKeyWithValue("grafana.integreatly.org/service-account-token-name", "test-token"),
84+
"Labels": HaveKeyWithValue("operator.grafana.com/service-account-name", name),
85+
"Annotations": HaveKeyWithValue("operator.grafana.com/service-account-token-name", "test-token"),
8686
}),
8787
"Data": HaveKeyWithValue("token", Not(BeEmpty())),
8888
})))

‎tests/e2e/grafanaserviceaccount/090-assert.yaml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,14 @@ data:
6565
kind: Secret
6666
metadata:
6767
annotations:
68-
grafana.integreatly.org/service-account-spec-name: sa2
69-
grafana.integreatly.org/service-account-token-id: '1'
70-
grafana.integreatly.org/service-account-token-name: token1
68+
operator.grafana.com/service-account-spec-name: sa2
69+
operator.grafana.com/service-account-token-id: '1'
70+
operator.grafana.com/service-account-token-name: token1
7171
generateName: grafana1-sa2-token1-
7272
labels:
73-
app: grafana-serviceaccount-token
7473
app.kubernetes.io/managed-by: grafana-operator
75-
grafana.integreatly.org/service-account-instance: grafana1
76-
grafana.integreatly.org/service-account-name: grafana1-sa2
74+
operator.grafana.com/service-account-instance: grafana1
75+
operator.grafana.com/service-account-name: grafana1-sa2
7776
(starts_with(name, 'grafana1-sa2-token1')): true
7877
namespace: ($NAMESPACE)
7978
ownerReferences:
@@ -90,15 +89,14 @@ data:
9089
kind: Secret
9190
metadata:
9291
annotations:
93-
grafana.integreatly.org/service-account-spec-name: sa2
94-
grafana.integreatly.org/service-account-token-id: '2'
95-
grafana.integreatly.org/service-account-token-name: token2
92+
operator.grafana.com/service-account-spec-name: sa2
93+
operator.grafana.com/service-account-token-id: '2'
94+
operator.grafana.com/service-account-token-name: token2
9695
generateName: grafana1-sa2-token2-
9796
labels:
98-
app: grafana-serviceaccount-token
9997
app.kubernetes.io/managed-by: grafana-operator
100-
grafana.integreatly.org/service-account-instance: grafana1
101-
grafana.integreatly.org/service-account-name: grafana1-sa2
98+
operator.grafana.com/service-account-instance: grafana1
99+
operator.grafana.com/service-account-name: grafana1-sa2
102100
(starts_with(name, 'grafana1-sa2-token2')): true
103101
namespace: ($NAMESPACE)
104102
ownerReferences:
@@ -115,14 +113,13 @@ data:
115113
kind: Secret
116114
metadata:
117115
annotations:
118-
grafana.integreatly.org/service-account-spec-name: sa2
119-
grafana.integreatly.org/service-account-token-id: '3'
120-
grafana.integreatly.org/service-account-token-name: token3
116+
operator.grafana.com/service-account-spec-name: sa2
117+
operator.grafana.com/service-account-token-id: '3'
118+
operator.grafana.com/service-account-token-name: token3
121119
labels:
122-
app: grafana-serviceaccount-token
123120
app.kubernetes.io/managed-by: grafana-operator
124-
grafana.integreatly.org/service-account-instance: grafana1
125-
grafana.integreatly.org/service-account-name: grafana1-sa2
121+
operator.grafana.com/service-account-instance: grafana1
122+
operator.grafana.com/service-account-name: grafana1-sa2
126123
name: ccc
127124
namespace: ($NAMESPACE)
128125
ownerReferences:
@@ -139,14 +136,13 @@ data:
139136
kind: Secret
140137
metadata:
141138
annotations:
142-
grafana.integreatly.org/service-account-spec-name: sa2
143-
grafana.integreatly.org/service-account-token-id: '4'
144-
grafana.integreatly.org/service-account-token-name: token4
139+
operator.grafana.com/service-account-spec-name: sa2
140+
operator.grafana.com/service-account-token-id: '4'
141+
operator.grafana.com/service-account-token-name: token4
145142
labels:
146-
app: grafana-serviceaccount-token
147143
app.kubernetes.io/managed-by: grafana-operator
148-
grafana.integreatly.org/service-account-instance: grafana1
149-
grafana.integreatly.org/service-account-name: grafana1-sa2
144+
operator.grafana.com/service-account-instance: grafana1
145+
operator.grafana.com/service-account-name: grafana1-sa2
150146
name: ddd
151147
namespace: ($NAMESPACE)
152148
ownerReferences:

‎tests/e2e/grafanaserviceaccount/100-assert.yaml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,14 @@ data:
6565
kind: Secret
6666
metadata:
6767
annotations:
68-
grafana.integreatly.org/service-account-spec-name: sa2
69-
grafana.integreatly.org/service-account-token-id: '1'
70-
grafana.integreatly.org/service-account-token-name: token1
68+
operator.grafana.com/service-account-spec-name: sa2
69+
operator.grafana.com/service-account-token-id: '1'
70+
operator.grafana.com/service-account-token-name: token1
7171
generateName: grafana1-sa2-token1-
7272
labels:
73-
app: grafana-serviceaccount-token
7473
app.kubernetes.io/managed-by: grafana-operator
75-
grafana.integreatly.org/service-account-instance: grafana1
76-
grafana.integreatly.org/service-account-name: grafana1-sa2
74+
operator.grafana.com/service-account-instance: grafana1
75+
operator.grafana.com/service-account-name: grafana1-sa2
7776
(starts_with(name, 'grafana1-sa2-token1')): true
7877
namespace: ($NAMESPACE)
7978
ownerReferences:
@@ -90,14 +89,13 @@ data:
9089
kind: Secret
9190
metadata:
9291
annotations:
93-
grafana.integreatly.org/service-account-spec-name: sa2
94-
grafana.integreatly.org/service-account-token-id: '5'
95-
grafana.integreatly.org/service-account-token-name: token2
92+
operator.grafana.com/service-account-spec-name: sa2
93+
operator.grafana.com/service-account-token-id: '5'
94+
operator.grafana.com/service-account-token-name: token2
9695
labels:
97-
app: grafana-serviceaccount-token
9896
app.kubernetes.io/managed-by: grafana-operator
99-
grafana.integreatly.org/service-account-instance: grafana1
100-
grafana.integreatly.org/service-account-name: grafana1-sa2
97+
operator.grafana.com/service-account-instance: grafana1
98+
operator.grafana.com/service-account-name: grafana1-sa2
10199
name: fff
102100
namespace: ($NAMESPACE)
103101
ownerReferences:
@@ -114,14 +112,13 @@ data:
114112
kind: Secret
115113
metadata:
116114
annotations:
117-
grafana.integreatly.org/service-account-spec-name: sa2
118-
grafana.integreatly.org/service-account-token-id: '6'
119-
grafana.integreatly.org/service-account-token-name: token3
115+
operator.grafana.com/service-account-spec-name: sa2
116+
operator.grafana.com/service-account-token-id: '6'
117+
operator.grafana.com/service-account-token-name: token3
120118
labels:
121-
app: grafana-serviceaccount-token
122119
app.kubernetes.io/managed-by: grafana-operator
123-
grafana.integreatly.org/service-account-instance: grafana1
124-
grafana.integreatly.org/service-account-name: grafana1-sa2
120+
operator.grafana.com/service-account-instance: grafana1
121+
operator.grafana.com/service-account-name: grafana1-sa2
125122
name: eee
126123
namespace: ($NAMESPACE)
127124
ownerReferences:
@@ -138,15 +135,14 @@ data:
138135
kind: Secret
139136
metadata:
140137
annotations:
141-
grafana.integreatly.org/service-account-spec-name: sa2
142-
grafana.integreatly.org/service-account-token-id: '7'
143-
grafana.integreatly.org/service-account-token-name: token4
138+
operator.grafana.com/service-account-spec-name: sa2
139+
operator.grafana.com/service-account-token-id: '7'
140+
operator.grafana.com/service-account-token-name: token4
144141
generateName: grafana1-sa2-token4-
145142
labels:
146-
app: grafana-serviceaccount-token
147143
app.kubernetes.io/managed-by: grafana-operator
148-
grafana.integreatly.org/service-account-instance: grafana1
149-
grafana.integreatly.org/service-account-name: grafana1-sa2
144+
operator.grafana.com/service-account-instance: grafana1
145+
operator.grafana.com/service-account-name: grafana1-sa2
150146
(starts_with(name, 'grafana1-sa2-token4')): true
151147
namespace: ($NAMESPACE)
152148
ownerReferences:

‎tests/e2e/grafanaserviceaccount/110-assert.yaml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,14 @@ data:
6565
kind: Secret
6666
metadata:
6767
annotations:
68-
grafana.integreatly.org/service-account-spec-name: sa2
69-
grafana.integreatly.org/service-account-token-id: '8'
70-
grafana.integreatly.org/service-account-token-name: token1
68+
operator.grafana.com/service-account-spec-name: sa2
69+
operator.grafana.com/service-account-token-id: '8'
70+
operator.grafana.com/service-account-token-name: token1
7171
generateName: grafana1-sa2-token1-
7272
labels:
73-
app: grafana-serviceaccount-token
7473
app.kubernetes.io/managed-by: grafana-operator
75-
grafana.integreatly.org/service-account-instance: grafana1
76-
grafana.integreatly.org/service-account-name: grafana1-sa2
74+
operator.grafana.com/service-account-instance: grafana1
75+
operator.grafana.com/service-account-name: grafana1-sa2
7776
(starts_with(name, 'grafana1-sa2-token1')): true
7877
namespace: ($NAMESPACE)
7978
ownerReferences:
@@ -90,14 +89,13 @@ data:
9089
kind: Secret
9190
metadata:
9291
annotations:
93-
grafana.integreatly.org/service-account-spec-name: sa2
94-
grafana.integreatly.org/service-account-token-id: '9'
95-
grafana.integreatly.org/service-account-token-name: token2
92+
operator.grafana.com/service-account-spec-name: sa2
93+
operator.grafana.com/service-account-token-id: '9'
94+
operator.grafana.com/service-account-token-name: token2
9695
labels:
97-
app: grafana-serviceaccount-token
9896
app.kubernetes.io/managed-by: grafana-operator
99-
grafana.integreatly.org/service-account-instance: grafana1
100-
grafana.integreatly.org/service-account-name: grafana1-sa2
97+
operator.grafana.com/service-account-instance: grafana1
98+
operator.grafana.com/service-account-name: grafana1-sa2
10199
name: fff
102100
namespace: ($NAMESPACE)
103101
ownerReferences:
@@ -114,14 +112,13 @@ data:
114112
kind: Secret
115113
metadata:
116114
annotations:
117-
grafana.integreatly.org/service-account-spec-name: sa2
118-
grafana.integreatly.org/service-account-token-id: '10'
119-
grafana.integreatly.org/service-account-token-name: token3
115+
operator.grafana.com/service-account-spec-name: sa2
116+
operator.grafana.com/service-account-token-id: '10'
117+
operator.grafana.com/service-account-token-name: token3
120118
labels:
121-
app: grafana-serviceaccount-token
122119
app.kubernetes.io/managed-by: grafana-operator
123-
grafana.integreatly.org/service-account-instance: grafana1
124-
grafana.integreatly.org/service-account-name: grafana1-sa2
120+
operator.grafana.com/service-account-instance: grafana1
121+
operator.grafana.com/service-account-name: grafana1-sa2
125122
name: eee
126123
namespace: ($NAMESPACE)
127124
ownerReferences:
@@ -138,15 +135,12 @@ data:
138135
kind: Secret
139136
metadata:
140137
annotations:
141-
grafana.integreatly.org/service-account-spec-name: sa2
142-
grafana.integreatly.org/service-account-token-id: '7'
143-
grafana.integreatly.org/service-account-token-name: token4
138+
operator.grafana.com/service-account-token-name: token4
144139
generateName: grafana1-sa2-token4-
145140
labels:
146-
app: grafana-serviceaccount-token
147141
app.kubernetes.io/managed-by: grafana-operator
148-
grafana.integreatly.org/service-account-instance: grafana1
149-
grafana.integreatly.org/service-account-name: grafana1-sa2
142+
operator.grafana.com/service-account-instance: grafana1
143+
operator.grafana.com/service-account-name: grafana1-sa2
150144
(starts_with(name, 'grafana1-sa2-token4')): true
151145
namespace: ($NAMESPACE)
152146
ownerReferences:

‎tests/e2e/grafanaserviceaccount/120-assert.yaml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,14 @@ data:
6363
kind: Secret
6464
metadata:
6565
annotations:
66-
grafana.integreatly.org/service-account-spec-name: sa2
67-
grafana.integreatly.org/service-account-token-id: '11'
68-
grafana.integreatly.org/service-account-token-name: token1
66+
operator.grafana.com/service-account-spec-name: sa2
67+
operator.grafana.com/service-account-token-id: '11'
68+
operator.grafana.com/service-account-token-name: token1
6969
generateName: grafana1-sa2-token1-
7070
labels:
71-
app: grafana-serviceaccount-token
7271
app.kubernetes.io/managed-by: grafana-operator
73-
grafana.integreatly.org/service-account-instance: grafana1
74-
grafana.integreatly.org/service-account-name: grafana1-sa2
72+
operator.grafana.com/service-account-instance: grafana1
73+
operator.grafana.com/service-account-name: grafana1-sa2
7574
(starts_with(name, 'grafana1-sa2-token1')): true
7675
namespace: ($NAMESPACE)
7776
ownerReferences:
@@ -88,14 +87,13 @@ data:
8887
kind: Secret
8988
metadata:
9089
annotations:
91-
grafana.integreatly.org/service-account-spec-name: sa2
92-
grafana.integreatly.org/service-account-token-id: '12'
93-
grafana.integreatly.org/service-account-token-name: token2
90+
operator.grafana.com/service-account-spec-name: sa2
91+
operator.grafana.com/service-account-token-id: '12'
92+
operator.grafana.com/service-account-token-name: token2
9493
labels:
95-
app: grafana-serviceaccount-token
9694
app.kubernetes.io/managed-by: grafana-operator
97-
grafana.integreatly.org/service-account-instance: grafana1
98-
grafana.integreatly.org/service-account-name: grafana1-sa2
95+
operator.grafana.com/service-account-instance: grafana1
96+
operator.grafana.com/service-account-name: grafana1-sa2
9997
name: fff
10098
namespace: ($NAMESPACE)
10199
ownerReferences:
@@ -112,14 +110,13 @@ data:
112110
kind: Secret
113111
metadata:
114112
annotations:
115-
grafana.integreatly.org/service-account-spec-name: sa2
116-
grafana.integreatly.org/service-account-token-id: '10'
117-
grafana.integreatly.org/service-account-token-name: token3
113+
operator.grafana.com/service-account-spec-name: sa2
114+
operator.grafana.com/service-account-token-id: '10'
115+
operator.grafana.com/service-account-token-name: token3
118116
labels:
119-
app: grafana-serviceaccount-token
120117
app.kubernetes.io/managed-by: grafana-operator
121-
grafana.integreatly.org/service-account-instance: grafana1
122-
grafana.integreatly.org/service-account-name: grafana1-sa2
118+
operator.grafana.com/service-account-instance: grafana1
119+
operator.grafana.com/service-account-name: grafana1-sa2
123120
name: eee
124121
namespace: ($NAMESPACE)
125122
ownerReferences:
@@ -136,15 +133,14 @@ data:
136133
kind: Secret
137134
metadata:
138135
annotations:
139-
grafana.integreatly.org/service-account-spec-name: sa2
140-
grafana.integreatly.org/service-account-token-id: '7'
141-
grafana.integreatly.org/service-account-token-name: token4
136+
operator.grafana.com/service-account-spec-name: sa2
137+
operator.grafana.com/service-account-token-id: '7'
138+
operator.grafana.com/service-account-token-name: token4
142139
generateName: grafana1-sa2-token4-
143140
labels:
144-
app: grafana-serviceaccount-token
145141
app.kubernetes.io/managed-by: grafana-operator
146-
grafana.integreatly.org/service-account-instance: grafana1
147-
grafana.integreatly.org/service-account-name: grafana1-sa2
142+
operator.grafana.com/service-account-instance: grafana1
143+
operator.grafana.com/service-account-name: grafana1-sa2
148144
(starts_with(name, 'grafana1-sa2-token4')): true
149145
namespace: ($NAMESPACE)
150146
ownerReferences:

0 commit comments

Comments
 (0)