@@ -75,7 +75,6 @@ public class HealthCheckHelper {
75
75
76
76
private static final String DOMAIN_UID_LABEL = "weblogic.domainUID" ;
77
77
private static final String MINIMUM_K8S_VERSION = "v1.7.5" ;
78
- private static final String DOMAIN_IMAGE = "store/oracle/weblogic:12.2.1.3" ;
79
78
private static final String READ_WRITE_MANY_ACCESS = "ReadWriteMany" ;
80
79
81
80
/**
@@ -138,9 +137,8 @@ public void performNonSecurityChecks() throws ApiException {
138
137
* Verify Access.
139
138
*
140
139
* @param version Kubernetes version
141
- * @throws ApiException exception for k8s API
142
140
*/
143
- public void performSecurityChecks (KubernetesVersion version ) throws ApiException {
141
+ public void performSecurityChecks (KubernetesVersion version ) {
144
142
145
143
// Validate namespace
146
144
if (DEFAULT_NAMESPACE .equals (operatorNamespace )) {
@@ -258,6 +256,10 @@ public KubernetesVersion(int major, int minor) {
258
256
this .minor = minor ;
259
257
}
260
258
259
+ boolean isPublishNotReadyAddressesSupported () {
260
+ return this .major > 1 || (this .major == 1 && this .minor >= 8 );
261
+ }
262
+
261
263
@ Override
262
264
public boolean equals (Object o ) {
263
265
return this == o || o instanceof KubernetesVersion && equals ((KubernetesVersion ) o );
@@ -282,14 +284,13 @@ public String toString() {
282
284
* Verify the k8s version.
283
285
*
284
286
* @return Major and minor version information
285
- * @throws ApiException exception for k8s API
286
287
*/
287
- public KubernetesVersion performK8sVersionCheck () throws ApiException {
288
+ public KubernetesVersion performK8sVersionCheck () {
288
289
289
290
// k8s version must be 1.7.5 or greater
290
291
LOGGER .info (MessageKeys .VERIFY_K8S_MIN_VERSION );
291
292
boolean k8sMinVersion = true ;
292
- VersionInfo info = null ;
293
+ VersionInfo info ;
293
294
294
295
int major = 0 ;
295
296
int minor = 0 ;
@@ -419,12 +420,8 @@ private void verifyPersistentVolume(HashMap<String, Domain> domainUIDMap) throws
419
420
}
420
421
}
421
422
422
- /**
423
- * Perform health checks against a running Admin server.
424
- *
425
- * @throws ApiException exception for k8s API
426
- */
427
- private void verifyAdminServer (HashMap <String , Domain > domainUIDMap ) throws ApiException {
423
+ /** Perform health checks against a running Admin server. */
424
+ private void verifyAdminServer (HashMap <String , Domain > domainUIDMap ) {
428
425
429
426
for (Domain domain : domainUIDMap .values ()) {
430
427
if (isAdminServerRunning (domain )) {
0 commit comments