Merge "Revert "Implement ability to enable cluster monitoring""

kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Classes/KubernetesMinionNode.yaml

@@ -8,10 +8,6 @@ Name: KubernetesMinionNode
 
 Extends: KubernetesNode
 
-Properties:
-  enableMonitoring:
-    Contract: $.bool().notNull()
-
 Methods:
   initialize:
     Body:
@@ -46,23 +42,11 @@ Methods:
       - $.instance.agent.call($template, $resources)
 
       - $._environment.reporter.report($, 'Setup Kubernetes Minion on {0}'.format($.instance.name))
-
-      - If: $.enableMonitoring
-        Then:
-          - $._environment.reporter.report($this, 'Adding access to cAdvisor')
-          - $securityGroupIngress:
-              - ToPort: 4194
-                FromPort: 4194
-                IpProtocol: tcp
-                External: false
-          - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
-
       - $resources: new(sys:Resources)
       - $template: $resources.yaml('KubeMinionSetup.template').bind(dict(
             name => $.instance.name,
             ip => $.getIp(),
-            masterIp => $._cluster.masterNode.getIp(),
-            enableMonitoring => $.enableMonitoring
+            masterIp => $._cluster.masterNode.getIp()
           ))
       - $.instance.agent.call($template, $resources)
 

kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/KubeMinionSetup.template

@@ -6,10 +6,9 @@ Parameters:
   name: $name
   ip: $ip
   masterIp: $masterIp
-  enableMonitoring: $enableMonitoring
 
 Body: |
-  return setup('{0} {1} {2} {3}'.format(args.name, args.ip, args.masterIp, args.enableMonitoring)).stdout
+  return setup('{0} {1} {2}'.format(args.name, args.ip, args.masterIp)).stdout
 
 Scripts:
   setup:
@@ -19,7 +18,6 @@ Scripts:
     Files:
       - <kube-proxy.conf>
       - <kubelet.conf>
-      - <cadvisor.manifest>
 
     Options:
       captureStdout: true

kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/cadvisor.manifest

@@ -1,32 +0,0 @@
-version: v1beta2
-id: cadvisor-agent
-containers:
-  - name: cadvisor
-    image: google/cadvisor:latest
-    ports:
-      - name: http
-        containerPort: 8080
-        hostPort: 4194
-    volumeMounts:
-      - name: varrun
-        mountPath: /var/run
-        readOnly: false
-      - name: varlibdocker
-        mountPath: /var/lib/docker
-        readOnly: true
-      - name: cgroups
-        mountPath: /sys/fs/cgroup
-        readOnly: true
-volumes:
-  - name: varrun
-    source:
-      hostDir:
-        path: /var/run
-  - name: varlibdocker
-    source:
-      hostDir:
-        path: /var/lib/docker
-  - name: cgroups
-    source:
-      hostDir:
-        path: /sys/fs/cgroup

kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/Resources/scripts/minion-kube-setup.sh

@@ -3,7 +3,6 @@
 # $1 - NAME
 # $2 - IP
 # $3 - MASTER_IP
-# $4 - IS_CA_ENABLED
 
 if [ "$3" != "$2" ]; then
  service kube-proxy stop
@@ -36,15 +35,6 @@ sed -i.bkp "s/%%IP%%/$2/g" kubelet.conf
 cp -f kube-proxy.conf /etc/default/kube-proxy
 cp -f kubelet.conf /etc/default/kubelet
 
-if [ "$4" == "True" ]; then
- #Create directory for manifests used by kubelet
- mkdir /etc/kubernetes
- mkdir /etc/kubernetes/manifests
- cp -f cadvisor.manifest /etc/kubernetes/manifests
- #Add path to kubelet parameters
- sed -i 's/kubernetes"/kubernetes \\/g' /etc/default/kubelet
- sed -i '/--log_dir*/a --config=/etc/kubernetes/manifests"' /etc/default/kubelet
-fi
 
 service kubelet start
 service kube-proxy start

kubernetes/io.murano.apps.docker.kubernetes.KubernetesCluster/UI/ui.yaml

@@ -17,7 +17,6 @@ Templates:
   minionNode:
     ?:
       type: io.murano.apps.docker.kubernetes.KubernetesMinionNode
-    enableMonitoring: $.appConfiguration.enableMonitoring
     instance:
       ?:
         type: io.murano.resources.LinuxMuranoInstance
@@ -67,18 +66,13 @@ Forms:
 #          label: Select portalNet
 #          description: >-
 #             TODO
-        - name: enableMonitoring
-          type: boolean
-          initial: true
-          label: Enable cAdvisor monitoring
-          description: >-
-             Select to true to use cAdvisor
         - name: assignFloatingIP
           type: boolean
           initial: true
           label: Assign Floating IP
           description: >-
              Select to true to assign floating IP automatically
+          initial: false
           required: false
         - name: unitNamingPattern
           type: string