Skip to content

Commit c5155c4

Browse files
authored
Merge pull request #6 from kenfinnigan/remove-debugging
Remove debugging statements
2 parents 18da054 + 0ea236b commit c5155c4

1 file changed

Lines changed: 3 additions & 19 deletions

File tree

src/main/java/com/redhat/MeterController.java

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.redhat;
22

33
import java.util.Map;
4-
import java.util.concurrent.atomic.AtomicBoolean;
54

65
import org.eclipse.microprofile.config.inject.ConfigProperty;
76
import org.jboss.logging.Logger;
@@ -110,7 +109,6 @@ public UpdateControl<Meter> createOrUpdateResource(Meter resource, Context<Meter
110109

111110
void createServiceMonitor() {
112111
if (serviceMonitor().get() != null) {
113-
System.out.println("SKIPPED INSTALL");
114112
// Don't repeat the install
115113
return;
116114
}
@@ -129,18 +127,13 @@ void createServiceMonitor() {
129127
.build();
130128
role = client.rbac().roles().createOrReplace(role);
131129

132-
// TODO remove
133-
System.out.println("ROLE RESOURCE VERSION: " + role.getMetadata().getResourceVersion());
134-
System.out.println("ROLE NAMESPACE: " + role.getMetadata().getNamespace());
135-
System.out.println("ROLE NAME: " + role.getMetadata().getName());
136130
if (role.getMetadata().getResourceVersion() == null) {
137131
// No exception, but Role not created properly
138132
return;
139133
}
140134
} catch (Exception e) {
141135
LOG.error("Failed to create Role", e);
142-
//TODO Uncomment when permissions are fixed
143-
// return;
136+
return;
144137
}
145138

146139
try {
@@ -161,17 +154,13 @@ void createServiceMonitor() {
161154
.build();
162155
roleBinding = client.rbac().roleBindings().createOrReplace(roleBinding);
163156

164-
// TODO remove
165-
System.out.println("ROLEBINDING RESOURCE VERSION: " + roleBinding.getMetadata().getResourceVersion());
166-
167157
if (roleBinding.getMetadata().getResourceVersion() == null) {
168158
// No exception, but RoleBinding not created properly
169159
return;
170160
}
171161
} catch (Exception e) {
172162
LOG.error("Failed to create RoleBinding", e);
173-
//TODO Uncomment when permissions are fixed
174-
// return;
163+
return;
175164
}
176165

177166
try {
@@ -193,16 +182,13 @@ void createServiceMonitor() {
193182
.build();
194183
promRule = client.monitoring().prometheusRules().inNamespace(OPENSHIFT_MONITORING_NAMESPACE).createOrReplace(promRule);
195184

196-
// TODO remove
197-
System.out.println("PROMETHEUSRULE RESOURCE VERSION: " + promRule.getMetadata().getResourceVersion());
198185
if (promRule.getMetadata().getResourceVersion() == null) {
199186
// No exception, but PrometheusRule not created properly
200187
return;
201188
}
202189
} catch (Exception e) {
203190
LOG.error("Failed to create PrometheusRule", e);
204-
//TODO Uncomment when permissions are fixed
205-
// return;
191+
return;
206192
}
207193

208194
try {
@@ -228,8 +214,6 @@ void createServiceMonitor() {
228214
.endSpec()
229215
.build();
230216
monitor = client.monitoring().serviceMonitors().inNamespace(OPENSHIFT_MONITORING_NAMESPACE).createOrReplace(monitor);
231-
// TODO remove
232-
System.out.println("SERVICEMONITOR RESOURCE VERSION: " + monitor.getMetadata().getResourceVersion());
233217

234218
if (!monitor.getMetadata().getResourceVersion().isEmpty()) {
235219
LOG.info("ServiceMonitor " + SERVICE_MONITOR_NAME + " installed.");

0 commit comments

Comments
 (0)