Merge branch 'feature/helm_operator_1_1' of https://github.com/oracle/weblogic-kubernetes-operator into feature/helm_operator_1_1

Sync with any changes from helm_operator_1_1

Author: lennyphan

kubernetes/charts/weblogic-operator/templates/_domain-cm.tpl

@@ -3,15 +3,15 @@
 
 {{- define "operator.domainConfigMap" }}
 ---
-apiVersion: v1
-kind: ConfigMap
+apiVersion: "v1"
+kind: "ConfigMap"
 metadata:
   labels:
     weblogic.createdByOperator: "true"
-    weblogic.operatorName: {{ .operatorNamespace }}
-    weblogic.resourceVersion: domain-v1
-  name: weblogic-domain-cm
-  namespace: {{ .domainsNamespace }}
+    weblogic.operatorName: {{ .operatorNamespace | quote }}
+    weblogic.resourceVersion: "domain-v1"
+  name: "weblogic-domain-cm"
+  namespace: {{ .domainsNamespace | quote }}
 data:
 {{ (.Files.Glob "scripts/domain/*").AsConfig | indent 2 }}
 {{- end }}

kubernetes/charts/weblogic-operator/templates/_domains-ns.tpl

@@ -4,12 +4,12 @@
 {{- define "operator.domainsNamespace" }}
 {{- if (and (.createDomainsNamespace) (not (eq .domainsNamespace "default"))) }}
 ---
-apiVersion: v1
-kind: Namespace
+apiVersion: "v1"
+kind: "Namespace"
 metadata:
   labels:
-    weblogic.operatorName: {{ .operatorNamespace }}
-    weblogic.resourceVersion: operator-v1
-  name: {{ .domainsNamespace }}
+    weblogic.operatorName: {{ .operatorNamespace | quote }}
+    weblogic.resourceVersion: "operator-v1"
+  name: {{ .domainsNamespace | quote }}
 {{- end }}
 {{- end }}

kubernetes/charts/weblogic-operator/templates/_elasticsearch-dep.tpl

@@ -7,22 +7,22 @@
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
-  name: elasticsearch
+  name: "elasticsearch"
   labels:
-    app: elasticsearch
+    app: "elasticsearch"
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: elasticsearch
+      app: "elasticsearch"
   template:
     metadata:
       labels:
-        app: elasticsearch
+        app: "elasticsearch"
     spec:
       containers:
-      - name: elasticsearch
-        image: elasticsearch:5
+      - name: "elasticsearch"
+        image: "elasticsearch:5"
         ports:
         - containerPort: 9200
         - containerPort: 9300

kubernetes/charts/weblogic-operator/templates/_elasticsearch-svc.tpl

@@ -4,21 +4,21 @@
 {{- define "operator.elasticSearchService" }}
 {{- if .elkIntegrationEnabled }}
 ---
-kind: Service
-apiVersion: v1
+kind: "Service"
+apiVersion: "v1"
 metadata:
-  name: elasticsearch
+  name: "elasticsearch"
 spec:
   ports:
-  - name: http
-    protocol: TCP
+  - name: "http"
+    protocol: "TCP"
     port: 9200
     targetPort: 9200
-  - name: https
-    protocol: TCP
+  - name: "https"
+    protocol: "TCP"
     port: 9300
     targetPort: 9300
   selector:
-    app: elasticsearch
+    app: "elasticsearch"
 {{- end }}
 {{- end }}

kubernetes/charts/weblogic-operator/templates/_helpers.tpl

@@ -4,25 +4,25 @@
 {{- define "operator.kibanaDeployment" }}
 {{- if .elkIntegrationEnabled }}
 ---
-apiVersion: apps/v1beta1
-kind: Deployment
+apiVersion: "apps/v1beta1"
+kind: "Deployment"
 metadata:
-  name: kibana
+  name: "kibana"
   labels:
-    app: kibana
+    app: "kibana"
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: kibana
+      app: "kibana"
   template:
     metadata:
       labels:
-        app: kibana
+        app: "kibana"
     spec:
       containers:
-      - name: kibana
-        image: kibana:5
+      - name: "kibana"
+        image: "kibana:5"
         ports:
         - containerPort: 5601
 {{- end }}

kubernetes/charts/weblogic-operator/templates/_kibana-dep.tpl

@@ -4,17 +4,17 @@
 {{- define "operator.kibanaService" }}
 {{- if .elkIntegrationEnabled }}
 ---
-apiVersion: v1
-kind: Service
+apiVersion: "v1"
+kind: "Service"
 metadata: 
-  name: kibana
+  name: "kibana"
   labels: 
-    app: kibana
+    app: "kibana"
 spec: 
-  type: NodePort
+  type: "NodePort"
   ports:
     - port: 5601
   selector: 
-    app: kibana
+    app: "kibana"
 {{- end }}
 {{- end }}

kubernetes/charts/weblogic-operator/templates/_kibana-svc.tpl

@@ -3,12 +3,12 @@
 
 {{- define "operator.operatorClusterRoleNamespace" }}
 ---
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: "ClusterRole"
+apiVersion: "rbac.authorization.k8s.io/v1beta1"
 metadata:
-  name: weblogic-operator-namespace-role
+  name: "weblogic-operator-namespace-role"
   labels:
-    weblogic.resourceVersion: operator-v1
+    weblogic.resourceVersion: "operator-v1"
 rules:
 - apiGroups: [""]
   resources: ["secrets"]

kubernetes/charts/weblogic-operator/templates/_operator-clusterrole-namespace.tpl

@@ -3,12 +3,12 @@
 
 {{- define "operator.operatorClusterRoleNonResource" }}
 ---
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: "ClusterRole"
+apiVersion: "rbac.authorization.k8s.io/v1beta1"
 metadata:
-  name: weblogic-operator-cluster-role-nonresource
+  name: "weblogic-operator-cluster-role-nonresource"
   labels:
-    weblogic.resourceVersion: operator-v1
+    weblogic.resourceVersion: "operator-v1"
 rules:
 - nonResourceURLs: ["/version/*"]
   verbs: ["get"]

kubernetes/charts/weblogic-operator/templates/_operator-clusterrole-nonresource.tpl

@@ -3,12 +3,12 @@
 
 {{- define "operator.operatorClusterRole" }}
 ---
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: "ClusterRole"
+apiVersion: "rbac.authorization.k8s.io/v1beta1"
 metadata:
-  name: weblogic-operator-cluster-role
+  name: "weblogic-operator-cluster-role"
   labels:
-    weblogic.resourceVersion: operator-v1
+    weblogic.resourceVersion: "operator-v1"
 rules:
 - apiGroups: [""]
   resources: ["namespaces"]