Skip to content

Commit f41c60c

Browse files
ThoSapThoSap
committed
the namespace should come always first
1 parent 4f0adcc commit f41c60c

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎operator/src/main/java/it/aboutbits/postgresql/crd/clusterconnection/ClusterConnectionReconciler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public UpdateControl<ClusterConnection> reconcile(
2626
) {
2727
var status = initializeStatus(resource);
2828

29-
var name = resource.getMetadata().getName();
3029
var namespace = resource.getMetadata().getNamespace();
30+
var name = resource.getMetadata().getName();
3131

3232
log.info(
3333
"Reconciling ClusterConnection [resource={}/{}, status.phase={}]",

‎operator/src/main/java/it/aboutbits/postgresql/crd/database/DatabaseReconciler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public UpdateControl<Database> reconcile(
3838
var spec = resource.getSpec();
3939
var status = initializeStatus(resource);
4040

41-
var name = resource.getMetadata().getName();
4241
var namespace = resource.getMetadata().getNamespace();
42+
var name = resource.getMetadata().getName();
4343

4444
log.info(
4545
"Reconciling Database [resource={}/{}, status.phase={}]",
@@ -97,8 +97,8 @@ public DeleteControl cleanup(
9797
var spec = resource.getSpec();
9898
var status = initializeStatus(resource);
9999

100-
var name = resource.getMetadata().getName();
101100
var namespace = resource.getMetadata().getNamespace();
101+
var name = resource.getMetadata().getName();
102102

103103
log.info(
104104
"{}ing Database [resource={}/{}, spec.name={}, status.phase={}]",
@@ -183,8 +183,8 @@ private UpdateControl<Database> reconcile(
183183
Database resource,
184184
CRStatus status
185185
) {
186-
var name = resource.getMetadata().getName();
187186
var namespace = resource.getMetadata().getNamespace();
187+
var name = resource.getMetadata().getName();
188188

189189
var spec = resource.getSpec();
190190

‎operator/src/main/java/it/aboutbits/postgresql/crd/defaultprivilege/DefaultPrivilegeReconciler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public UpdateControl<DefaultPrivilege> reconcile(
4141
var spec = resource.getSpec();
4242
var status = initializeStatus(resource);
4343

44-
var name = resource.getMetadata().getName();
4544
var namespace = resource.getMetadata().getNamespace();
45+
var name = resource.getMetadata().getName();
4646

4747
log.info(
4848
"Reconciling DefaultPrivilege [resource={}/{}, status.phase={}]",
@@ -124,8 +124,8 @@ public DeleteControl cleanup(
124124
var spec = resource.getSpec();
125125
var status = initializeStatus(resource);
126126

127-
var name = resource.getMetadata().getName();
128127
var namespace = resource.getMetadata().getNamespace();
128+
var name = resource.getMetadata().getName();
129129

130130
log.info(
131131
"Deleting DefaultPrivilege [resource={}/{}, status.phase={}]",
@@ -213,8 +213,8 @@ private UpdateControl<DefaultPrivilege> reconcileInTransaction(
213213
) {
214214
var spec = resource.getSpec();
215215

216-
var name = resource.getMetadata().getName();
217216
var namespace = resource.getMetadata().getNamespace();
217+
var name = resource.getMetadata().getName();
218218

219219
var expectedPrivileges = Set.copyOf(spec.getPrivileges());
220220

‎operator/src/main/java/it/aboutbits/postgresql/crd/grant/GrantReconciler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public UpdateControl<Grant> reconcile(
4646
var spec = resource.getSpec();
4747
var status = initializeStatus(resource);
4848

49-
var name = resource.getMetadata().getName();
5049
var namespace = resource.getMetadata().getNamespace();
50+
var name = resource.getMetadata().getName();
5151

5252
log.info(
5353
"Reconciling Grant [resource={}/{}, status.phase={}]",
@@ -129,8 +129,8 @@ public DeleteControl cleanup(
129129
var spec = resource.getSpec();
130130
var status = initializeStatus(resource);
131131

132-
var name = resource.getMetadata().getName();
133132
var namespace = resource.getMetadata().getNamespace();
133+
var name = resource.getMetadata().getName();
134134

135135
log.info(
136136
"Deleting Grant [resource={}/{}, status.phase={}]",
@@ -220,8 +220,8 @@ private UpdateControl<Grant> reconcileInTransaction(
220220
Grant resource,
221221
CRStatus status
222222
) {
223-
var name = resource.getMetadata().getName();
224223
var namespace = resource.getMetadata().getNamespace();
224+
var name = resource.getMetadata().getName();
225225

226226
var spec = resource.getSpec();
227227

‎operator/src/main/java/it/aboutbits/postgresql/crd/role/RoleReconciler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public UpdateControl<Role> reconcile(
6060
var spec = resource.getSpec();
6161
var status = initializeStatus(resource);
6262

63-
var name = resource.getMetadata().getName();
6463
var namespace = resource.getMetadata().getNamespace();
64+
var name = resource.getMetadata().getName();
6565

6666
log.info(
6767
"Reconciling Role [resource={}/{}, status.phase={}]",
@@ -140,8 +140,8 @@ public DeleteControl cleanup(
140140
var spec = resource.getSpec();
141141
var status = initializeStatus(resource);
142142

143-
var name = resource.getMetadata().getName();
144143
var namespace = resource.getMetadata().getNamespace();
144+
var name = resource.getMetadata().getName();
145145

146146
log.info(
147147
"Deleting Role [resource={}/{}, spec.name={}, status.phase={}]",
@@ -249,8 +249,8 @@ private UpdateControl<Role> reconcileInTransaction(
249249
CRStatus status,
250250
@Nullable String password
251251
) {
252-
var name = resource.getMetadata().getName();
253252
var namespace = resource.getMetadata().getNamespace();
253+
var name = resource.getMetadata().getName();
254254

255255
var spec = resource.getSpec();
256256
var expectedFlags = spec.getFlags();

‎operator/src/main/java/it/aboutbits/postgresql/crd/schema/SchemaReconciler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public UpdateControl<Schema> reconcile(
3838
var spec = resource.getSpec();
3939
var status = initializeStatus(resource);
4040

41-
var name = resource.getMetadata().getName();
4241
var namespace = resource.getMetadata().getNamespace();
42+
var name = resource.getMetadata().getName();
4343

4444
log.info(
4545
"Reconciling Schema [resource={}/{}, status.phase={}]",
@@ -100,8 +100,8 @@ public DeleteControl cleanup(
100100
var spec = resource.getSpec();
101101
var status = initializeStatus(resource);
102102

103-
var name = resource.getMetadata().getName();
104103
var namespace = resource.getMetadata().getNamespace();
104+
var name = resource.getMetadata().getName();
105105

106106
log.info(
107107
"{}ing Schema [resource={}/{}, spec.name={}, status.phase={}]",
@@ -187,8 +187,8 @@ private UpdateControl<Schema> reconcileInTransaction(
187187
Schema resource,
188188
CRStatus status
189189
) {
190-
var name = resource.getMetadata().getName();
191190
var namespace = resource.getMetadata().getNamespace();
191+
var name = resource.getMetadata().getName();
192192

193193
var spec = resource.getSpec();
194194

0 commit comments

Comments
 (0)