Merge "Uplift Promenade"

2019-06-28 19:20:33 +00:00 · 2019-06-28 19:20:33 +00:00 · 4e55c5e228
parent 130cbfb0e9 9ca7dfd06b
commit 4e55c5e228
5 changed files with 247 additions and 116 deletions
--- a/global/profiles/kubernetes-host.yaml
+++ b/global/profiles/kubernetes-host.yaml
@ -11,9 +11,9 @@ metadata:
    - src:
        schema: pegleg/SoftwareVersions/v1
        name: software-versions
-        path: .files.kubelet
+        path: .images.kubernetes.hyperkube
      dest:
-        path: .files[0].tar_url
+        path: .files[0].docker_image

    # Initial CoreDNS image (used during node Genesis and node join)
    - src:
@ -41,9 +41,9 @@ metadata:
    - src:
        schema: pegleg/SoftwareVersions/v1
        name: software-versions
-        path: .images.kubernetes.kubectl
+        path: .images.ucp.promenade.monitoring_image
      dest:
-        path: .images.kubernetes.kubectl
+        path: .images.monitoring_image

    # System packages
    - src:
@ -51,20 +51,20 @@ metadata:
        name: software-versions
        path: .packages.named.docker
      dest:
-        path: .packages.required.docker
+        path: .packages.common.required.docker
    - src:
        schema: pegleg/SoftwareVersions/v1
        name: software-versions
        path: .packages.named.socat
      dest:
-        path: .packages.required.socat
+        path: .packages.common.required.socat

    - src:
        schema: pegleg/SoftwareVersions/v1
        name: software-versions
        path: .packages.unnamed
      dest:
-        path: .packages.additional
+        path: .packages.common.additional

    # Docker authorization
    - src:
@ -72,13 +72,19 @@ metadata:
        path: .
        name: private_docker_key
      dest:
-        path: .files[2].content
+        path: .files[4].content
        pattern: DH_SUB_PRIVATE_DOCKER_KEY

 data:
  files:
+    - path: /opt/kubernetes/bin/hyperkube
+      file_path: /hyperkube
+      mode: 0555
    - path: /opt/kubernetes/bin/kubelet
-      tar_path: kubernetes/node/bin/kubelet
+      symlink: /opt/kubernetes/bin/hyperkube
+      mode: 0555
+    - path: /usr/local/bin/kubectl
+      symlink: /opt/kubernetes/bin/hyperkube
      mode: 0555
    - path: /etc/logrotate.d/json-logrotate
      mode: 0444
@ -111,71 +117,76 @@ data:
    - path: /var/lib/prom.done
      mode: 0444
      content: ""
+    - path: /etc/profile.d/kubeconfig.sh
+      mode: 0744
+      content: |-
+        export KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml
  packages:
-    repositories:
-      - deb https://download.docker.com/linux/ubuntu/ xenial stable
-    keys:
-      - |-
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
+    common:
+      repositories:
+        - deb https://download.docker.com/linux/ubuntu/ xenial stable
+      keys:
+        - |-
+          -----BEGIN PGP PUBLIC KEY BLOCK-----

-        mQINBFit2ioBEADhWpZ8/wvZ6hUTiXOwQHXMAlaFHcPH9hAtr4F1y2+OYdbtMuth
-        lqqwp028AqyY+PRfVMtSYMbjuQuu5byyKR01BbqYhuS3jtqQmljZ/bJvXqnmiVXh
-        38UuLa+z077PxyxQhu5BbqntTPQMfiyqEiU+BKbq2WmANUKQf+1AmZY/IruOXbnq
-        L4C1+gJ8vfmXQt99npCaxEjaNRVYfOS8QcixNzHUYnb6emjlANyEVlZzeqo7XKl7
-        UrwV5inawTSzWNvtjEjj4nJL8NsLwscpLPQUhTQ+7BbQXAwAmeHCUTQIvvWXqw0N
-        cmhh4HgeQscQHYgOJjjDVfoY5MucvglbIgCqfzAHW9jxmRL4qbMZj+b1XoePEtht
-        ku4bIQN1X5P07fNWzlgaRL5Z4POXDDZTlIQ/El58j9kp4bnWRCJW0lya+f8ocodo
-        vZZ+Doi+fy4D5ZGrL4XEcIQP/Lv5uFyf+kQtl/94VFYVJOleAv8W92KdgDkhTcTD
-        G7c0tIkVEKNUq48b3aQ64NOZQW7fVjfoKwEZdOqPE72Pa45jrZzvUFxSpdiNk2tZ
-        XYukHjlxxEgBdC/J3cMMNRE1F4NCA3ApfV1Y7/hTeOnmDuDYwr9/obA8t016Yljj
-        q5rdkywPf4JF8mXUW5eCN1vAFHxeg9ZWemhBtQmGxXnw9M+z6hWwc6ahmwARAQAB
-        tCtEb2NrZXIgUmVsZWFzZSAoQ0UgZGViKSA8ZG9ja2VyQGRvY2tlci5jb20+iQI3
-        BBMBCgAhBQJYrefAAhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEI2BgDwO
-        v82IsskP/iQZo68flDQmNvn8X5XTd6RRaUH33kXYXquT6NkHJciS7E2gTJmqvMqd
-        tI4mNYHCSEYxI5qrcYV5YqX9P6+Ko+vozo4nseUQLPH/ATQ4qL0Zok+1jkag3Lgk
-        jonyUf9bwtWxFp05HC3GMHPhhcUSexCxQLQvnFWXD2sWLKivHp2fT8QbRGeZ+d3m
-        6fqcd5Fu7pxsqm0EUDK5NL+nPIgYhN+auTrhgzhK1CShfGccM/wfRlei9Utz6p9P
-        XRKIlWnXtT4qNGZNTN0tR+NLG/6Bqd8OYBaFAUcue/w1VW6JQ2VGYZHnZu9S8LMc
-        FYBa5Ig9PxwGQOgq6RDKDbV+PqTQT5EFMeR1mrjckk4DQJjbxeMZbiNMG5kGECA8
-        g383P3elhn03WGbEEa4MNc3Z4+7c236QI3xWJfNPdUbXRaAwhy/6rTSFbzwKB0Jm
-        ebwzQfwjQY6f55MiI/RqDCyuPj3r3jyVRkK86pQKBAJwFHyqj9KaKXMZjfVnowLh
-        9svIGfNbGHpucATqREvUHuQbNnqkCx8VVhtYkhDb9fEP2xBu5VvHbR+3nfVhMut5
-        G34Ct5RS7Jt6LIfFdtcn8CaSas/l1HbiGeRgc70X/9aYx/V/CEJv0lIe8gP6uDoW
-        FPIZ7d6vH+Vro6xuWEGiuMaiznap2KhZmpkgfupyFmplh0s6knymuQINBFit2ioB
-        EADneL9S9m4vhU3blaRjVUUyJ7b/qTjcSylvCH5XUE6R2k+ckEZjfAMZPLpO+/tF
-        M2JIJMD4SifKuS3xck9KtZGCufGmcwiLQRzeHF7vJUKrLD5RTkNi23ydvWZgPjtx
-        Q+DTT1Zcn7BrQFY6FgnRoUVIxwtdw1bMY/89rsFgS5wwuMESd3Q2RYgb7EOFOpnu
-        w6da7WakWf4IhnF5nsNYGDVaIHzpiqCl+uTbf1epCjrOlIzkZ3Z3Yk5CM/TiFzPk
-        z2lLz89cpD8U+NtCsfagWWfjd2U3jDapgH+7nQnCEWpROtzaKHG6lA3pXdix5zG8
-        eRc6/0IbUSWvfjKxLLPfNeCS2pCL3IeEI5nothEEYdQH6szpLog79xB9dVnJyKJb
-        VfxXnseoYqVrRz2VVbUI5Blwm6B40E3eGVfUQWiux54DspyVMMk41Mx7QJ3iynIa
-        1N4ZAqVMAEruyXTRTxc9XW0tYhDMA/1GYvz0EmFpm8LzTHA6sFVtPm/ZlNCX6P1X
-        zJwrv7DSQKD6GGlBQUX+OeEJ8tTkkf8QTJSPUdh8P8YxDFS5EOGAvhhpMBYD42kQ
-        pqXjEC+XcycTvGI7impgv9PDY1RCC1zkBjKPa120rNhv/hkVk/YhuGoajoHyy4h7
-        ZQopdcMtpN2dgmhEegny9JCSwxfQmQ0zK0g7m6SHiKMwjwARAQABiQQ+BBgBCAAJ
-        BQJYrdoqAhsCAikJEI2BgDwOv82IwV0gBBkBCAAGBQJYrdoqAAoJEH6gqcPyc/zY
-        1WAP/2wJ+R0gE6qsce3rjaIz58PJmc8goKrir5hnElWhPgbq7cYIsW5qiFyLhkdp
-        YcMmhD9mRiPpQn6Ya2w3e3B8zfIVKipbMBnke/ytZ9M7qHmDCcjoiSmwEXN3wKYI
-        mD9VHONsl/CG1rU9Isw1jtB5g1YxuBA7M/m36XN6x2u+NtNMDB9P56yc4gfsZVES
-        KA9v+yY2/l45L8d/WUkUi0YXomn6hyBGI7JrBLq0CX37GEYP6O9rrKipfz73XfO7
-        JIGzOKZlljb/D9RX/g7nRbCn+3EtH7xnk+TK/50euEKw8SMUg147sJTcpQmv6UzZ
-        cM4JgL0HbHVCojV4C/plELwMddALOFeYQzTif6sMRPf+3DSj8frbInjChC3yOLy0
-        6br92KFom17EIj2CAcoeq7UPhi2oouYBwPxh5ytdehJkoo+sN7RIWua6P2WSmon5
-        U888cSylXC0+ADFdgLX9K2zrDVYUG1vo8CX0vzxFBaHwN6Px26fhIT1/hYUHQR1z
-        VfNDcyQmXqkOnZvvoMfz/Q0s9BhFJ/zU6AgQbIZE/hm1spsfgvtsD1frZfygXJ9f
-        irP+MSAI80xHSf91qSRZOj4Pl3ZJNbq4yYxv0b1pkMqeGdjdCYhLU+LZ4wbQmpCk
-        SVe2prlLureigXtmZfkqevRz7FrIZiu9ky8wnCAPwC7/zmS18rgP/17bOtL4/iIz
-        QhxAAoAMWVrGyJivSkjhSGx1uCojsWfsTAm11P7jsruIL61ZzMUVE2aM3Pmj5G+W
-        9AcZ58Em+1WsVnAXdUR//bMmhyr8wL/G1YO1V3JEJTRdxsSxdYa4deGBBY/Adpsw
-        24jxhOJR+lsJpqIUeb999+R8euDhRHG9eFO7DRu6weatUJ6suupoDTRWtr/4yGqe
-        dKxV3qQhNLSnaAzqW/1nA3iUB4k7kCaKZxhdhDbClf9P37qaRW467BLCVO/coL3y
-        Vm50dwdrNtKpMBh3ZpbB1uJvgi9mXtyBOMJ3v8RZeDzFiG8HdCtg9RvIt/AIFoHR
-        H3S+U79NT6i0KPzLImDfs8T7RlpyuMc4Ufs8ggyg9v3Ae6cN3eQyxcK3w0cbBwsh
-        /nQNfsA6uu+9H7NhbehBMhYnpNZyrHzCmzyXkauwRAqoCbGCNykTRwsur9gS41TQ
-        M8ssD1jFheOJf3hODnkKU+HKjvMROl1DK7zdmLdNzA1cvtZH/nCC9KPj1z8QC47S
-        xx+dTZSx4ONAhwbS/LN3PoKtn8LPjY9NP9uDWI+TWYquS2U+KHDrBDlsgozDbs/O
-        jCxcpDzNmXpWQHEtHU7649OXHP7UeNST1mCUCH5qdank0V1iejF6/CfTFU4MfcrG
-        YT90qFF93M3v01BbxP+EIY2/9tiIPbrd
-        =0YYh
-        -----END PGP PUBLIC KEY BLOCK-----
+          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
+          YT90qFF93M3v01BbxP+EIY2/9tiIPbrd
+          =0YYh
+          -----END PGP PUBLIC KEY BLOCK-----
 ...
--- a/global/schemas/promenade/HostSystem/v1.yaml
+++ b/global/schemas/promenade/HostSystem/v1.yaml
@ -11,6 +11,18 @@ data:
    abs_path:
      type: string
      pattern: '^/.+$'
+    systemd_unit:
+      type: object
+      properties:
+        enable:
+          type: boolean
+        disable:
+          type: boolean
+        start:
+          type: boolean
+        stop:
+          type: boolean
+      additionalProperties: false
    apt_source_line:
      type: string
      # XXX add regex
@ -27,7 +39,12 @@ data:
          $ref: '#/definitions/url'
        tar_path:
          $ref: '#/definitions/rel_path'
-
+        docker_image:
+          $ref: '#/definitions/url'
+        file_path:
+          $ref: '#/definitions/abs_path'
+        symlink:
+          $ref: '#/definitions/abs_path'
      required:
        - mode
        - path
@ -35,12 +52,21 @@ data:
        - type: object
          required:
            - content
+        - type: object
+          required:
+            - symlink
        - type: object
          allOf:
            - type: object
              required:
                - tar_url
                - tar_path
+        - type: object
+          allOf:
+            - type: object
+              required:
+                - docker_image
+                - file_path
      additionalProperties: false

    image:
@ -68,13 +94,17 @@ data:
        type: object
        items:
          $ref: '#/definitions/file'
+    systemd_units:
+      type: object
+      additionalProperties:
+        $ref: '#/definitions/systemd_unit'
    images:
      type: object
      properties:
-        haproxy:
-          $ref: '#/definitions/image'
        coredns:
          $ref: '#/definitions/image'
+        haproxy:
+          $ref: '#/definitions/image'
        helm:
          type: object
          properties:
@ -83,52 +113,124 @@ data:
          required:
            - helm
          additionalProperties: false
-        kubernetes:
-          type: object
-          properties:
-            kubectl:
-              $ref: '#/definitions/image'
-          required:
-            - kubectl
-          additionalProperties: false
+        monitoring_image:
+          $ref: '#/definitions/image'
      required:
        - haproxy
-        - coredns
        - helm
-        - kubernetes
+        - monitoring_image
      additionalProperties: false

    packages:
      type: object
-      properties:
-        additional:
-          type: array
-          items:
-            $ref: '#/definitions/package'
-        keys:
-          type: array
-          items:
-            $ref: '#/definitions/public_key'
+      common:
+        type: object
+        properties:
+          additional:
+            type: array
+            items:
+              $ref: '#/definitions/package'
+          keys:
+            type: array
+            items:
+              $ref: '#/definitions/public_key'
+
+          required:
+            type: object
+            properties:
+              docker:
+                $ref: '#/definitions/package'
+              socat:
+                $ref: '#/definitions/package'
+            required:
+              - docker
+              - socat
+            additionalProperties: false
+
+          repositories:
+            type: array
+            items:
+              $ref: '#/definitions/apt_source_line'

        required:
+          - required
+        additionalProperties: false
+
+      genesis:
+        type: object
+        properties:
+          additional:
+            type: array
+            items:
+              $ref: '#/definitions/package'
+          keys:
+            type: array
+            items:
+              $ref: '#/definitions/public_key'
+
+          required:
+            type: object
+            properties:
+              docker:
+                $ref: '#/definitions/package'
+              socat:
+                $ref: '#/definitions/package'
+            required:
+              - docker
+              - socat
+            additionalProperties: false
+
+          repositories:
+            type: array
+            items:
+              $ref: '#/definitions/apt_source_line'
+
+        required:
+          - required
+        additionalProperties: false
+
+      join:
+        type: object
+        properties:
+          additional:
+            type: array
+            items:
+              $ref: '#/definitions/package'
+          keys:
+            type: array
+            items:
+              $ref: '#/definitions/public_key'
+
+          required:
+            type: object
+            properties:
+              docker:
+                $ref: '#/definitions/package'
+              socat:
+                $ref: '#/definitions/package'
+            required:
+              - docker
+              - socat
+            additionalProperties: false
+
+          repositories:
+            type: array
+            items:
+              $ref: '#/definitions/apt_source_line'
+
+        required:
+          - required
+        additionalProperties: false
+
+    validation:
+      type: object
+      properties:
+        pod_logs:
          type: object
          properties:
-            docker:
-              $ref: '#/definitions/package'
-            socat:
-              $ref: '#/definitions/package'
-          required:
-            - docker
-            - socat
+            image:
+              type: string
          additionalProperties: false
-
-        repositories:
-          type: array
-          items:
-            $ref: '#/definitions/apt_source_line'
-
-      required:
-        - required
      additionalProperties: false

  required:
--- a/global/software/charts/ucp/promenade/promenade.yaml
+++ b/global/software/charts/ucp/promenade/promenade.yaml
@ -26,6 +26,20 @@ metadata:
        path: .images.ucp.promenade
      dest:
        path: .values.images.tags
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .images.ucp.promenade.monitoring_image
+      dest:
+        path: .values.images.tags.monitoring_image
+
+    # Files
+    - src:
+        schema: promenade/HostSystem/v1
+        name: host-system
+        path: .files[0].path
+      dest:
+        path: .values.pod.mount_path

    # Endpoints

--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@ -468,7 +468,7 @@ data:
        type: git
      promenade:
        location: https://opendev.org/airship/promenade
-        reference: 44b5fae04788c6a28de0f9a2e132204561474d47
+        reference: fefd664cd8a5de659e197694b1cfa4d243ab4fae
        subpath: charts/promenade
        type: git
      promenade-htk:
@ -536,8 +536,6 @@ data:
        reference: 09ae22d8493d5cef34c80cb69117c69dc0f2dc8e
        subpath: helm-toolkit
        type: git
-  files:
-    kubelet: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz
  images:
    calico:
      calico: {}
@ -568,8 +566,8 @@ data:
      haproxy:
        anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
        haproxy: docker.io/haproxy:1.8.19
+      hyperkube: gcr.io/google-containers/hyperkube-amd64:v1.11.6
      ingress: {}
-      kubectl: gcr.io/google-containers/hyperkube-amd64:v1.11.6
      pause: gcr.io/google-containers/pause-amd64:3.1
      proxy:
        proxy: gcr.io/google-containers/hyperkube-amd64:v1.11.6
@ -635,7 +633,8 @@ data:
        pegleg: quay.io/airshipit/pegleg:fb2f62d25a11374435d99d9f59049d5799ccab73-ubuntu_xenial
      postgresql: {}
      promenade:
-        promenade: quay.io/airshipit/promenade:9b62a49eae5b29088c1f7899949df38ae91494e2
+        monitoring_image: busybox:1.28.3
+        promenade: quay.io/airshipit/promenade:fefd664cd8a5de659e197694b1cfa4d243ab4fae
      rabbitmq: {}
      shipyard:
        airflow: quay.io/airshipit/airflow:89a8eda43e4af3cf146f89a25e96c37dbaa5fa88-ubuntu_xenial
--- a/tools/airship
+++ b/tools/airship
@ -132,12 +132,17 @@ no_proxy=${no_proxy:-}
 HTTP_PROXY=${HTTP_PROXY:-}
 HTTPS_PROXY=${HTTPS_PROXY:-}
 NO_PROXY=${NO_PROXY:-}
+# Promenade specific variables for downloading hyperkube image to generate genesis.sh
+PROMENADE_TMP=/tmp
+PROMENADE_TMP_LOCAL=/tmp
 EOF

  docker run --rm --net=host $TERM_OPTS \
      -u "${USER}:${GROUP}" \
      -w /target \
      -v $(pwd):/target \
+      -v /tmp:/tmp \
+      -v /var/run/docker.sock:/var/run/docker.sock \
      --env-file $ENV_FILE \
      $IMAGE_URL $@
 }