Local volumes and StatefulSet to provision Master/Slave MySQL and Galera cluster

2 files changed, 142 insertions, 19 deletions

diff --git a/roles/ands_kaas/templates/00-local-volumes.yml.j2 b/roles/ands_kaas/templates/00-local-volumes.yml.j2
new file mode 100644
index 0000000..a97ffae
--- /dev/null
+++ b/roles/ands_kaas/templates/00-local-volumes.yml.j2
@@ -0,0 +1,50 @@
+---
+apiVersion: v1
+kind: Template
+metadata:
+  name: {{ kaas_project }}-local-volumes
+  annotations:
+    descriptions: "{{ kaas_project }} local volumes"
+objects:
+{% for name, vol in kaas_project_local_volumes.iteritems() %}
+{%   set voltypes = kaas_storage_domains | json_query("[*].volumes." + vol.volume + ".type") %}
+{%   set voltype = voltypes[0] | default('host') %}
+{%   set mntpaths = kaas_storage_domains | json_query("[*].volumes." + vol.volume + ".mount") %}
+{%   set mntpath = mntpaths[0] | default('') %}
+{%   set oc_name = vol.name | default(name) | regex_replace('_','-') %}
+{%   set cfgpath = vol.path | default("") %}
+{%   set path = cfgpath if cfgpath[:1] == "/" else "/" + kaas_project + "/" + cfgpath %}
+{%   if oc_name | regex_search("^" + kaas_project) %}
+{%     set pvprefix = oc_name %}
+{%   else %}
+{%     set pvprefix = (kaas_project + "-" + oc_name) | regex_replace('_','-') %}
+{%   endif %}
+{%   for id in vol.nodes | default(hostvars[inventory_hostname]['ands_volume_' + vol.volume + '_server_ids']) %}
+{%      set srvid = (id | string) %}
+{%      set server_name = hostvars[inventory_hostname]['ands_host_' + srvid + '_public_hostname'] %}
+{%      set openshift_name = hostvars[inventory_hostname]['ands_host_' + srvid + '_openshift_fqdn'] %}
+{%      set pvname = pvprefix + '-' + server_name %}
+  - apiVersion: v1
+    kind: PersistentVolume
+    metadata:
+      name: {{ pvname }}
+      annotations:
+        "volume.alpha.kubernetes.io/node-affinity": '{
+            "requiredDuringSchedulingIgnoredDuringExecution": {
+                "nodeSelectorTerms": [
+                    { "matchExpressions": [ { "key": "kubernetes.io/hostname", "operator": "In", "values": ["{{ openshift_name }}"] } ]}
+                ]
+            }
+        }'
+    spec:
+      storageClassName: {{ vol.sc | default('kaas-lst-' + pvprefix) }}
+      persistentVolumeReclaimPolicy: Retain 
+      local:
+        path: "{{ mntpath }}{{ path }}"
+        readOnly: {{ not (vol.write | default(false)) }}
+      accessModes:
+        - ReadWriteOnce
+      capacity:
+        storage: {{ vol.capacity | default(kaas_default_volume_capacity) }}
+{%   endfor %}
+{% endfor %}
diff --git a/roles/ands_kaas/templates/50-kaas-pods.yml.j2 b/roles/ands_kaas/templates/50-kaas-pods.yml.j2
index 761004d..8c7fe85 100644
--- a/roles/ands_kaas/templates/50-kaas-pods.yml.j2
+++ b/roles/ands_kaas/templates/50-kaas-pods.yml.j2
@@ -1,14 +1,20 @@
 #jinja2: trim_blocks: "true", lstrip_blocks: "false"
 ---
+{% set app = app | default('{}') %}
 apiVersion: v1
 kind: Template
 metadata:
-  name: {{ name | default(kaas_project) }}-pods
+  name: {{ appname | default(kaas_project) }}-pods
   annotations:
-    descriptions: {{ kaas_project_config.description | default(name | default(kaas_project) ~ " auto-generated pod template") }}
+    descriptions: {{ kaas_project_config.description | default(appname | default(kaas_project) ~ " auto-generated pod template") }}
+{% set applabels = ( app.labels | default({}) | combine( { 'app': appname }) ) if appname is defined else (app.labels | default({})) %}
+{% if applabels | length > 0 %}
+  labels: {{ applabels | to_json }}
+{% endif %}
 objects:
 {% for name, pod in pods.iteritems() %}
   {% set kind = pod.kind | default('DeploymentConfig') %}
+  {% set podname = pod.name | default(name) | regex_replace('_','-') %}
   {% if pod.enabled | default(true) %}
     {% set pubkey = "kaas_" ~ name ~ "_pubkey" %}
     {% set privkey = "kaas_" ~ name ~ "_privkey" %}
@@ -17,19 +23,27 @@ objects:
       {% set pod = pod[pod.variant] %}
     {% endif %}
     {% set sched = pod.sched | default({}) %}
+    {% set service = pod.service | default({}) %}
+    {% set headless = (service.headles | default(false)) if kind == 'StatefulSet' else false %}
+    {% set network = pod.network | default({}) %}
+    {% set hostnet = network.host | default(false) %}
     {% set node_selector = (sched.selector is defined) | ternary(sched.selector, ands_default_node_selector | combine(sched.restrict | default({})))  %}
+    {% set labels = pod.general_labels | default({}) | combine(applabels)  %}
     {% if pod.service is defined %}
-      {% if kind == 'StatefulSet' and pod.service.ports is defined %}
+      {% if headless and pod.service.ports is defined %}
   - apiVersion: v1
     kind: Service
     metadata:
-      name: {{ pod.name | default(name) }}-ss
+      name: {{ podname }}-ss
       annotations: {{ pod.service.annotations | default({}) | combine({"service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" }) | to_json }}
+      {% if labels | length > 0 %}
+      labels: {{ labels | to_json }}
+      {% endif %}
     spec:
       clusterIP: None
       publishNotReadyAddresses: True
       selector:
-        name: {{ pod.name | default(name) }}
+        name: {{ podname }}
       ports:
         {% for port in pod.service.ports %}
           {% set portmap = (port | string).split('/') %}
@@ -41,13 +55,16 @@ objects:
   - apiVersion: v1
     kind: Service
     metadata:
-      name: {{ pod.name | default(name) }}
+      name: {{ podname }}
       {% if pod.service.annotations is defined %}
       annotations: {{ pod.service.annotations | to_json }}
       {% endif %}
+      {% if labels | length > 0 %}
+      labels: {{ labels | to_json }}
+      {% endif %}
     spec:
       selector:
-        name: {{ pod.name | default(name) }}
+        name: {{ podname }}
       {% if pod.service.ip is defined %}
       clusterIP: {{ pod.service.ip }}
       {% endif %}
@@ -65,12 +82,15 @@ objects:
   - apiVersion: v1
     kind: Route
     metadata:
-      name: {{ pod.name | default(name) }}
+      name: {{ podname }}
+      {% if labels | length > 0 %}
+      labels: {{ labels | to_json }}
+      {% endif %}
     spec:
       host: {{ pod.service.host }}
       to:
         kind: Service
-        name: {{ pod.name | default(name) }}
+        name: {{ podname }}
       port:
         targetPort: {{ (first_port[1] is defined) | ternary(first_port[1], first_port[0]) }}
         {% if (first_port[0] == "80") %}
@@ -95,7 +115,10 @@ objects:
   - apiVersion: {{ kaas_openshift_api_versions[kind] | default('v1') }}
     kind: {{ kind }}
     metadata:
-      name: {{ pod.name | default(name) }}
+      name: {{ podname }}
+      {% if labels | length > 0 %}
+      labels: {{ labels | to_json }}
+      {% endif %}
     spec:
       replicas: {{ ( sched | default({})).replicas | default(1) }}
       revisionHistoryLimit: 2 
@@ -111,25 +134,59 @@ objects:
       triggers:
       - type: ConfigChange
     {% if kind == 'StatefulSet' %}
-      serviceName: {{ pod.name | default(name) }}-ss
+       {% if headless %}
+      serviceName: {{ podname }}-ss
+       {% else %}
+      serviceName: {{ podname }}
+       {% endif %}
       selector:
         matchLabels:
-          name: {{ pod.name | default(name) }}
+          name: {{ podname }}
     {% else %}
       selector:
-        name: {{ pod.name | default(name) }}
+        name: {{ podname }}
     {% endif %}
+    {% if pod.pvc is defined %}
+      volumeClaimTemplates:
+      {% for name, pvc in pod.pvc.iteritems() %}
+        {% set pvcname = name | regex_replace('_','-') %}
+        {% set pv = kaas_project_local_volumes[pvcname] | default({}) %}
+        {% set oc_name = pv.name | default(pvcname) | regex_replace('_','-') %}
+        {% if oc_name | regex_search("^" + kaas_project) %}
+        {%     set pvname = oc_name %}
+        {% else %}
+        {%     set pvname = (kaas_project + "-" + oc_name) | regex_replace('_','-') %}
+        {% endif %}
+        - metadata:
+            name: {{ pvcname }}
+          spec:
+            storageClassName: {{ pvc.sc | default(pv.sc | default('kaas-lst-' + pvname)) }}
+            accessModes:
+              - ReadWriteOnce
+            resources:
+              requests:
+                storage: {{ pvc.capacity | default(pv.capacity | default(kaas_default_volume_capacity)) }}
+        {% endfor %}
+      {% endif %}
       template:
         metadata:
-          name: {{ pod.name | default(name) }}
-    {% if kind == 'StatefulSet' %}
+          name: {{ podname }}
+    {% if headless %}
           annotations: {{ pod.annotations | default({}) | combine({"pod.alpha.kubernetes.io/initialized": "true"}) | to_json }}
     {% elif pod.annotations is defined %}
           annotations: {{ pod.annotations | to_json }}
     {% endif %}
-          labels:
-            name: {{ pod.name | default(name) }}
+          labels: {{ pod.labels | default({}) | combine(labels) | combine({'name': podname, 'app': (appname | default('kaas'))}) | to_json }}
         spec:
+    {% if pod.sa is defined %}
+          serviceAccountName: {{ pod.sa }}
+    {% endif %}
+          hostNetwork: {{ hostnet }}
+    {% if (headless) and (hostnet) %}
+          dnsPolicy: {{ network.dns_policy | default('ClusterFirstWithHostNet') }}
+    {% elif network.dns_policy is defined %}
+          dnsPolicy: {{ network.dns_policy }}
+    {% endif %}
     {% if node_selector | length > 0 %}
           nodeSelector: {{ node_selector | to_json }}
     {% endif %}
@@ -140,10 +197,12 @@ objects:
       {% for img in pod.images %}
         {% set imgidx = loop.index %}
         {% for vol in (img.mappings | default([])) %}
-            {% set oc_name = vol.name | default(name) | regex_replace('_','-') %}
+            {% if (vol.name | default(name)) in kaas_project_volumes.keys() %}
+                {% set oc_name = vol.name | default(name) | regex_replace('_','-') %}
             - name: vol-{{imgidx}}-{{loop.index}}
               persistentVolumeClaim: 
                 claimName: {{ oc_name }}
+            {% endif %}
         {% endfor %}
         {% for vol in (img.hostpath | default([])) %}
             - name: host-{{imgidx}}-{{loop.index}}
@@ -170,7 +229,7 @@ objects:
           containers:
     {% for img in pod.images %}
       {% set imgidx = loop.index %}
-            - name: {{ img.name | default(pod.name) | default(name) }}
+            - name: {{ img.name | default(podname) }}
               image: {{ img.image }}
               imagePullPolicy: {{ img.pull | default('Always') }}
       {% if (img.command is defined) %}
@@ -179,13 +238,22 @@ objects:
       {% if img.ports is defined %}
               ports:
         {% for port in img.ports %}
+          {% if hostnet %}
+              {% set portmap = (port | string).split('/') %}
+                - containerPort: {{ (portmap[1] is defined) | ternary(portmap[1], portmap[0]) }}
+                  hostPort: {{ portmap[0] }}
+          {% else %}
                 - containerPort: {{ port }}
+          {% endif %}
         {% endfor %}
       {% elif pod.service.ports is defined %}
               ports:
         {% for port in pod.service.ports %}
           {% set portmap = (port | string).split('/') %}
                 - containerPort: {{ (portmap[1] is defined) | ternary(portmap[1], portmap[0]) }}
+          {% if hostnet %}
+                  hostPort: {{ portmap[0] }}
+          {% endif %}
         {% endfor %}
       {% endif %}
       {% if kind == 'StatefulSet' %}
@@ -226,7 +294,12 @@ objects:
       {% if img.mappings is defined or img.hostpath is defined %}
               volumeMounts:
         {% for vol in (img.mappings | default([])) %}
+            {% if vol.name in kaas_project_volumes.keys() %}
                 - name: vol-{{imgidx}}-{{loop.index}}
+            {% elif vol.name in kaas_project_local_volumes.keys() %}
+                {% set pvcname = vol.name | regex_replace('_','-') %}
+                - name: {{ pvcname }}
+            {% endif %}
                   subPath: {{ vol.path | default("") }}
                   mountPath: {{ vol.mount }}
         {% endfor %}