Merge pull request #378 from oracle/issue-371

Possible fix for issue #371

Author: thegridman

Jenkinsfile

@@ -247,10 +247,10 @@ pipeline {
                     export IMAGE_PULL_SECRETS=coherence-k8s-operator-development-secret,ocr-k8s-operator-development-secret
                     export RELEASE_IMAGE_PREFIX=$(eval echo $TEST_IMAGE_PREFIX)
                     export TEST_MANIFEST_VALUES=deploy/oci-values.yaml
-                    kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/master/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
-                    kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/master/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
-                    kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/master/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
-                    kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/master/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+                    kubectl apply --validate=false -f https://raw.githubusercontent.com/coreos/prometheus-operator/master/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+                    kubectl apply --validate=false -f https://raw.githubusercontent.com/coreos/prometheus-operator/master/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+                    kubectl apply --validate=false -f https://raw.githubusercontent.com/coreos/prometheus-operator/master/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+                    kubectl apply --validate=false -f https://raw.githubusercontent.com/coreos/prometheus-operator/master/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
                     make helm-test GO_TEST_FLAGS='-short'
                 '''
             }

Makefile

@@ -8,7 +8,7 @@
 # ---------------------------------------------------------------------------
 
 # The version of the Operator being build - this should be a valid SemVer format
-VERSION ?= 2.0.2
+VERSION ?= 2.0.3
 
 # VERSION_SUFFIX is ann optional version suffix. For a full release this should be
 # set to blank, for an interim release it should be set to a value to identify that

cmd/manager/main.go

@@ -16,6 +16,7 @@ import (
 	"github.com/oracle/coherence-operator/pkg/flags"
 	"github.com/oracle/coherence-operator/pkg/operator"
 	cohrest "github.com/oracle/coherence-operator/pkg/rest"
+	"k8s.io/klog"
 	"net/http"
 	"os"
 	"runtime"
@@ -81,12 +82,21 @@ func main() {
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 
 	// >>>>>>>> Coherence Operator code added to Operator SDK the generated file ---------------------------
+
+	// ensure that klog always logs to the console
+	klog.InitFlags(flag.CommandLine)
+	if err := flag.CommandLine.Set("logtostderr", "true"); err != nil {
+		fmt.Println(err)
+		log.Error(err, "Failed to get set logtostderr command line flag")
+		os.Exit(1)
+	}
+
 	// create Coherence Operator flags
 	cohf := flags.AddTo(pflag.CommandLine)
 
 	// create Helm Operator flags
 	hflags := hoflags.AddTo(pflag.CommandLine)
-	fmt.Println(hflags)
+
 	// <<<<<<<< Coherence Operator code added to Operator SDK the generated file ---------------------------
 
 	pflag.Parse()

docs/developer/05_building.adoc

@@ -47,7 +47,7 @@ By default the version number used to tag the Docker images and Helm charts is s
 in the `Makefile` and in the `pom.xml` files in the `java/` directory.
 
 The `Makefile` also contains a `VERSION_SUFFIX` variable that is used to add a suffix to the build. By default
-this suffix is `ci` so the default version of the build artifacts is `2.0.2-ci`. Change this suffix, for
+this suffix is `ci` so the default version of the build artifacts is `2.0.3-ci`. Change this suffix, for
 example when building a release candidate or a full release.
 
 For example, if building a release called `alpha2` the following command can be used:

examples/deployment/README.md

@@ -152,7 +152,7 @@ This will result in the following Docker image being created which contains the
 artifacts to be use by all deployments.
 
 ```console
-deployment-example:2.0.2
+deployment-example:2.0.3
 ```
 ## Install the Coherence Operator
 

examples/deployment/pom.xml

@@ -15,13 +15,13 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>deployment-example</artifactId>
   <name>Coherence Operator Deployment Example</name>
-  <version>2.0.2</version>
+  <version>2.0.3</version>
 
   <properties>
     <maven.compiler.source>8</maven.compiler.source>

examples/pom.xml

@@ -16,7 +16,7 @@
   <groupId>com.oracle.coherence.kubernetes</groupId>
   <artifactId>examples-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.0.2</version>
+  <version>2.0.3</version>
 
   <description>Oracle Coherence Operator Examples Project</description>
   <name>Oracle Coherence Operator Examples Parent</name>

java/coherence-utils/pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
   </parent>
 
   <artifactId>coherence-utils</artifactId>

java/docs/pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
   </parent>
 
   <artifactId>operator-docs</artifactId>

java/operator-test/pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.oracle.coherence.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
   </parent>
 
   <artifactId>operator-test</artifactId>