fix: avoid NPE when connecting to OpenShift clusters

metacosm · metacosm · commit 5cb514de94ea · 2021-03-09T15:44:36.000+01:00
Relates to fabric8io/kubernetes-client#2856 Fixes #365
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java
@@ -45,9 +45,11 @@ public void start() {
     log.info("Client version: {}", Version.clientVersion());
     try {
       final var k8sVersion = k8sClient.getVersion();
-      log.info("Server version: {}.{}", k8sVersion.getMajor(), k8sVersion.getMinor());
+      if (k8sVersion != null) {
+        log.info("Server version: {}.{}", k8sVersion.getMajor(), k8sVersion.getMinor());
+      }
     } catch (Exception e) {
-      log.error("Not connected to any cluster. Exiting!");
+      log.error("Error retrieving the server version. Exiting!", e);
       System.exit(1);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,11 @@ public void start() {`
`45`	`45`	`log.info("Client version: {}", Version.clientVersion());`
`46`	`46`	`try {`
`47`	`47`	`final var k8sVersion = k8sClient.getVersion();`
`48`		`- log.info("Server version: {}.{}", k8sVersion.getMajor(), k8sVersion.getMinor());`
	`48`	`+ if (k8sVersion != null) {`
	`49`	`+ log.info("Server version: {}.{}", k8sVersion.getMajor(), k8sVersion.getMinor());`
	`50`	`+ }`
`49`	`51`	`} catch (Exception e) {`
`50`		`- log.error("Not connected to any cluster. Exiting!");`
	`52`	`+ log.error("Error retrieving the server version. Exiting!", e);`
`51`	`53`	`System.exit(1);`
`52`	`54`	`}`
`53`	`55`	`}`