diff --git a/.gitignore b/.gitignore index 41c079b6c3..1e69553255 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.lock +*/*.lock *.tgz **/*.tgz .idea/ diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..9484e3a88c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,33 @@ +language: go + +services: + - docker + +before_install: + - export GLIDE_VERSION=v0.12.3 + - ls $GOPATH/src/ + - wget "https://github.com/Masterminds/glide/releases/download/$GLIDE_VERSION/glide-$GLIDE_VERSION-linux-amd64.tar.gz" + - mkdir -p $HOME/bin + - tar -vxz -C $HOME/bin --strip=1 -f glide-$GLIDE_VERSION-linux-amd64.tar.gz + - export PATH="$HOME/bin:$PATH" GLIDE_HOME="$HOME/.glide" + +install: + - cd $GOPATH/src/ + - mkdir k8s.io && cd k8s.io + - git clone https://github.com/kubernetes/helm + - cd helm && make bootstrap build + - mv bin/helm $HOME/bin + +script: + - cd $TRAVIS_BUILD_DIR + - bash travis-ci/kubeadm_setup.sh + - $GOPATH/src/k8s.io/helm/bin/tiller & + - export HELM_HOST=localhost:44134 + - helm init --client-only + - helm version + - helm serve & + - sleep 1m + - helm repo add local http://localhost:8879/charts + - helm repo update + - make + - bash travis-ci/charts_dry_run.sh diff --git a/Makefile b/Makefile index 4ca9917a35..86c6aa342a 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ -.PHONY: ceph bootstrap mariadb keystone memcached rabbitmq common openstack neutron nova cinder heat maas all clean +.PHONY: ceph bootstrap mariadb postgresql keystone memcached rabbitmq common openstack neutron nova cinder heat maas all clean B64_DIRS := common/secrets B64_EXCLUDE := $(wildcard common/secrets/*.b64) -CHARTS := ceph mariadb rabbitmq memcached keystone glance horizon neutron nova cinder heat maas openstack +CHARTS := ceph mariadb postgresql rabbitmq memcached keystone glance horizon neutron nova cinder heat maas openstack COMMON_TPL := common/templates/_globals.tpl -all: common ceph bootstrap mariadb rabbitmq memcached keystone glance horizon neutron nova cinder heat maas openstack +all: common ceph bootstrap mariadb postgresql rabbitmq memcached keystone glance horizon neutron nova cinder heat maas openstack common: build-common @@ -17,6 +17,8 @@ bootstrap: build-bootstrap mariadb: build-mariadb +postgresql: build-postgresql + keystone: build-keystone cinder: build-cinder diff --git a/README.md b/README.md index 6014cf596d..da84a258d6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Travis CI](https://travis-ci.org/att-comdev/openstack-helm.svg?branch=master)](https://travis-ci.org/att-comdev/openstack-helm) + # Openstack-Helm **Join us on [Slack](http://slack.k8s.io/):** `#openstack-helm`
diff --git a/bootstrap/requirements.lock b/bootstrap/requirements.lock deleted file mode 100644 index e5d7bf64b5..0000000000 --- a/bootstrap/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: http://localhost:8879/charts - version: 0.1.0 -digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc -generated: 2016-11-30T17:10:48.887264789-08:00 diff --git a/common/requirements.lock b/common/requirements.lock deleted file mode 100644 index 98d4c0a4eb..0000000000 --- a/common/requirements.lock +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: [] -digest: sha256:81059fe6210ccee4e3349c0f34c12d180f995150128a913d63b65b7937c6b152 -generated: 2016-11-30T17:10:48.32482926-08:00 diff --git a/docs/README.md b/docs/README.md index fe214b6d85..e2ef11b78c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,49 +3,55 @@ ## Table of Contents -##  1. [Openstack-Helm Design Principles]() +##  1. Openstack-Helm Design Principles ###    1.1 [Mission](mission.md) #####      1.1.1 [Resiliency](mission.md#resiliency) #####      1.1.2 [Scaling](mission.md#scaling) -###    1.2 [Helm Overrides]() -#####      1.2.1 [Resource Limits]() -#####      1.2.2 [Conditionals]() -###    1.3 [Init-Containers]() -#####      1.3.1 [Dependency Checking]() -###    1.4 [Kubernetes Jobs]() -#####      1.4.1 [Service Registration]() -#####      1.4.2 [User Registration]() -#####      1.4.3 [Database Creation]() -#####      1.4.4 [Database Migration]() -###    1.5 [Complimentary Efforts]() -####      1.5.1 [Image-Based Project Considerations]() -###    1.6 [Kubernetes State]() -####      1.6.1 [Third Party Resources]() -####      1.6.2 [Add-Ons]() -##  2. [Repository Structure]() -###    2.1 [Infrastructure Components]() -###    2.2 [Openstack-Helm Core Services]() -###    2.3 [Openstack-Helm Add-Ons]() -##  3. [Operator Resources]() +###    1.2 Helm Overrides +#####      1.2.1 [Values Philosophy](helm_overrides.md#values) +#####      1.2.1 [Replicas](helm_overrides.md#replicas) +#####      1.2.1 [Labels](helm_overrides.md#labels) +#####      1.2.1 [Images](helm_overrides.md#images) +#####      1.2.1 [Upgrades](helm_overrides.md#upgrades) +#####      1.2.1 [Resource Limits](helm_overrides.md#resource limits) +#####      1.2.2 [Endpoints](#helm_overrides.md#endpoints) +#####      1.2.2 [Common Conditionals](helm_overrides.md#common conditionals) +###    1.3 Init-Containers +#####      1.3.1 Dependency Checking +###    1.4 Kubernetes Jobs +#####      1.4.1 Service Registration +#####      1.4.2 User Registration +#####      1.4.3 Database Creation +#####      1.4.4 Database Migration +###    1.5 Complimentary Efforts +####      1.5.1 Image-Based Project Considerations +###    1.6 Kubernetes State +####      1.6.1 Third Party Resources +####      1.6.2 Add-Ons +##  2. Repository Structure +###    2.1 Infrastructure Components +###    2.2 Openstack-Helm Core Services +###    2.3 Openstack-Helm Add-Ons +##  3. Operator Resources ###     3.1 [Installation](https://github.com/att-comdev/openstack-helm/blob/master/docs/installation/getting-started.md) -###     3.2 [Openstack-Helm Chart Definition Overrides]() -###     3.2 [Openstacak-Helm Upgrades]() -##  4. [Openstack-Helm Networking]() -###    4.1 [Kubernetes Control Plane]() -####     4.1.1 [CNI SDN Considerations]() -####     4.1.2 [Calico Networking]() -###    4.2 [Ingress Philosophy]() -###    4.3 [Openstack Networking]() -####     4.3.1 [Flat Networking]() -####     4.3.1 [L2 Networking]() -##  5. [Security Guidelines]() -###    5.1 [Network Policies]() -###    5.2 [Advanced Network Policies]() -###    5.3 [Role-Based Access Controls]() -###    5.4 [Security Contexts]() -###    5.5 [Security Add-Ons]() -##  6. [Developer Resources](https://github.com/att-comdev/openstack-helm/tree/master/docs/developer) -###    6.1 [Contributions and Guidelines]() -###    6.2 [Development Tools]() +###     3.2 Openstack-Helm Chart Definition Overrides +###     3.2 Openstacak-Helm Upgrades +##  4. Openstack-Helm Networking +###    4.1 Kubernetes Control Plane +####     4.1.1 CNI SDN Considerations +####     4.1.2 Calico Networking +###    4.2 Ingress Philosophy +###    4.3 Openstack Networking +####     4.3.1 Flat Networking +####     4.3.1 L2 Networking +##  5. Security Guidelines +###    5.1 Network Policies +###    5.2 Advanced Network Policies +###    5.3 Role-Based Access Controls +###    5.4 Security Contexts +###    5.5 Security Add-Ons +##  6. Developer Resources +###    6.1 Contributions and Guidelines +###    6.2 Development Tools ####     6.2.1 [Minikube Development](https://github.com/att-comdev/openstack-helm/blob/master/docs/developer/minikube.md) -###    6.3 [Tips and Considerations]() +###    6.3 Tips and Considerations diff --git a/docs/helm_overrides.md b/docs/helm_overrides.md new file mode 100644 index 0000000000..1e8eb8b92b --- /dev/null +++ b/docs/helm_overrides.md @@ -0,0 +1,349 @@ +# Helm Overrides + +This document covers Helm overrides and the OpenStack-Helm approach. For more information on Helm overrides in general see the Helm [Values Documentation](https://github.com/kubernetes/helm/blob/master/docs/charts.md#values-files) + +## Values Philosophy + +Two major philosophies guide the OpenStack-Helm values approach. It is important that new chart developers understand the `values.yaml` approach OpenStack-Helm has within each of its charts to ensure that all charts are both consistent and remain a joy to work with. + +The first philosophy to understand is that all charts should be independently installable and should not require a parent chart. This means that the values file in each chart should be self-contained. The project avoids using Helm globals and parent charts as requirements for capturing and feeding environment specific overrides into subcharts. An example of a single site definition YAML that can be source controlled and used as `--values` input to all OpenStack-Helm charts to maintain overrides in one testable place is forthcoming. Currently Helm does not support a `--values=environment.yaml` chunking up a larger override file's YAML namespace. Ideally, the project seeks native Helm support for `helm install local/keystone --values=environment.yaml:keystone` where `environment.yaml` is the operator's chart-wide environment definition and `keystone` is the section in environment.yaml that will be fed to the keystone chart during install as overrides. Standard YAML anchors can be used to duplicate common elements like the `endpoints` sections. At the time of writing, operators can use a temporary approach like [values.py](https://github.com/att-comdev/openstack-helm/blob/master/helm-toolkit/utils/values/values.py) to chunk up a single override YAML file as input to various individual charts. Overrides, just like the templates themselves, should be source controlled and tested, especially for operators operating charts at scale. This project will continue to examine efforts such as [helm-value-store](https://github.com/skuid/helm-value-store) and solutions in the vein of [helmfile](https://github.com/roboll/helmfile). Another compelling project that seems to address the needs of orchestrating multiple charts and managing site specific overrides is [Landscape](https://github.com/Eneco/landscaper) + +The second philosophy is that the values files should be consistent across all charts, including charts in core, infra, and add-ons. This provides a consistent way for operators to override settings, such as enabling developer mode, defining resource limitations, and customizing the actual OpenStack configuration within chart templates without having to guess how a particular chart developer has laid out their values.yaml. There are also various macros in the `helm-toolkit` chart that will depend on the `values.yaml` within all charts being structured a certain way. + +Finally, where charts reference connectivity information for other services sane defaults should be provided. In cases where these services are provided by OpenStack-Helm itself, the defaults should assume that the user will use the OpenStack-Helm charts for those services, but should also allow those charts to be overridden if the operator has them externally deployed. + +## Replicas + +All charts must provide replica definitions and leverage those in the Kubernetes manifests. This allows site operators to tune the replica counts at install or when upgrading. Each chart should deploy with multiple replicas by default to ensure that production deployments are treated as first class citizens, and that services are tested with multiple replicas more frequently during development and testing. Developers wishing to deploy minimal environments can enable the `development` mode override, which should enforce only one replica per component. + +The convention today in OpenStack-Helm is to define a `replicas:` section for the chart, where each component being deployed has its own tunable value. + +For example, the `glance` chart provides the following replicas in `values.yaml` + +``` +replicas: + api: 2 + registry: 2 +``` + +An operator can override these on `install` or `upgrade`: + +``` +$ helm install local/glance --set replicas.api=3,replicas.registry=3 +``` + +## Labels + +This project uses `nodeSelectors` as well as `podAntiAffinity` rules to ensure resources land in the proper place within Kubernetes. Today, OpenStack-Helm employs four labels: + +- ceph-storage: enabled +- openstack-control-plane: enabled +- openstack-compute-node: enabled +- openvswitch: enabled + +NOTE: The `openvswitch` label is an element that is applicable to both `openstack-control-plane` as well as `openstack-compute-node` nodes. Ideally, you would eliminate the `openvswitch` label if you could simply do an OR of (`openstack-control-plane` and `openstack-compute-node`). However, Kubernetes `nodeSelectors` prohibits this specific logic. As a result of this, a third label that spans all hosts is required, which in this case is `openvswitch`. The Open vSwitch service must run on both control plane and tenant nodes with both labels to provide connectivity for DHCP, L3, and Metadata services. These Open vSwitch services run as part of the control plane as well as tenant connectivity, which runs as part of the compute node infrastructure. + + +Labels are of course definable and overridable by the chart operators. Labels are defined in charts by using a `labels:` section, which is a common convention that defines both a selector and a value: + +``` +labels: + node_selector_key: openstack-control-plane + node_selector_value: enabled +``` + +In some cases, such as with the Neutron chart, a chart may need to define more then one label. In cases such as this, each element should be articulated under the `labels:` section, nesting where appropriate: + +``` +labels: + # ovs is a special case, requiring a special + # label that can apply to both control hosts + # and compute hosts, until we get more sophisticated + # with our daemonset scheduling + ovs: + node_selector_key: openvswitch + node_selector_value: enabled + agent: + dhcp: + node_selector_key: openstack-control-plane + node_selector_value: enabled + l3: + node_selector_key: openstack-control-plane + node_selector_value: enabled + metadata: + node_selector_key: openstack-control-plane + node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled +``` + +These labels should be leveraged by `nodeSelector` definitions in charts for all resources, including jobs: + +``` + ... + spec: + nodeSelector: + {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + containers: + ... +``` + +In some cases, especially with infrastructure components, it is necessary for the chart developer to provide scheduling instruction to Kubernetes to help ensure proper resiliency. The most common examples employed today are podAntiAffinity rules, such as those used in the `mariadb` chart. These should be placed on all foundational elements so that Kubernetes will not only disperse resources for resiliency, but also allow multi-replica installations to deploy successfully into a single host environment: + +``` + annotations: + # this soft requirement allows single + # host deployments to spawn several mariadb containers + # but in a larger environment, would attempt to spread + # them out + scheduler.alpha.kubernetes.io/affinity: > + { + "podAntiAffinity": { + "preferredDuringSchedulingIgnoredDuringExecution": [{ + "labelSelector": { + "matchExpressions": [{ + "key": "app", + "operator": "In", + "values":["mariadb"] + }] + }, + "topologyKey": "kubernetes.io/hostname", + "weight": 10 + }] + } + } +``` + +## Images + +The project's core philosophy regarding images is that the toolsets required to enable the OpenStack services should be applied by Kubernetes itself. This requires OpenStack-Helm to develop common and simple scripts with minimal dependencies that can be overlaid on any image that meets the OpenStack core library requirements. The advantage of this is that the project can be image agnostic, allowing operators to use Stackanetes, Kolla, Yaodu, or any image flavor and format they choose and they will all function the same. + +A long-term goal, besides being image agnostic, is to also be able to support any of the container runtimes that Kubernetes supports, even those that might not use Docker's own packaging format. This will allow the project to continue to offer maximum flexibility with regard to operator choice. + +To that end, all charts provide an `images:` section that allows operators to override images. Also, all default image references should be fully spelled out, even those hosted by Docker or Quay. Further, no default image reference should use `:latest` but rather should be pinned to a specific version to ensure consistent behavior for deployments over time. + +Today, the `images:` section has several common conventions. Most OpenStack services require a database initialization function, a database synchronization function, and a series of steps for Keystone registration and integration. Each component may also have a specific image that composes an OpenStack service. The images may or may not differ, but regardless, should all be defined in `images`. + +The following standards are in use today, in addition to any components defined by the service itself: + +- dep_check: The image that will perform dependency checking in an init-container. +- db_init: The image that will perform database creation operations for the OpenStack service. +- db_sync: The image that will perform database sync (schema insertion) for the OpenStack service. +- ks_user: The image that will perform keystone user creation for the service. +- ks_service: The image that will perform keystone service registration for the service. +- ks_endpoints: The image that will perform keystone endpoint registration for the service. +- pull_policy: The image pull policy, one of "Always", "IfNotPresent", and "Never" which will be used by all containers in the chart. + +An illustrative example of an `images:` section taken from the heat chart: + +``` +images: + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0 + db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton + db_sync: docker.io/kolla/ubuntu-source-heat-api:3.0.1 + ks_user: quay.io/stackanetes/stackanetes-kolla-toolbox:newton + ks_service: quay.io/stackanetes/stackanetes-kolla-toolbox:newton + ks_endpoints: quay.io/stackanetes/stackanetes-kolla-toolbox:newton + api: docker.io/kolla/ubuntu-source-heat-api:3.0.1 + cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.1 + cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.1 + engine: docker.io/kolla/ubuntu-source-heat-engine:3.0.1 + pull_policy: "IfNotPresent" +``` + +The OpenStack-Helm project today uses a mix of Docker images from Stackanetes and Kolla, but will likely standardize on Kolla images for all charts without any reliance on Kolla image utilities. Soon, the project will support alternative images with substantially smaller footprints, such as [Yaodu](https://github.com/yaodu). + +## Upgrades + +The OpenStack-Helm project assumes all upgrades will be done through Helm. This includes handling several different resource types. First, changes to the Helm chart templates themselves are handled. Second, all of the resources layered on top of the container image, such as `ConfigMaps` which includes both scripts and configuration files, are updated during an upgrade. Finally, any image references will result in rolling updates of containers, replacing them with the updating image. + +As Helm stands today, several issues exist when you update images within charts that might have been used by jobs that already ran to completion or are still in flight. OpenStack-Helm developers will continue to work with the Helm community or develop charts that will support job removal prior to an upgrade, which will recreate services with updated images. An example of where this behavior would be desirable is when an updated db_sync image has updated to point from a Mitaka image to a Newton image. In this case, the operator will likely want a db_sync job, which was already run and completed during site installation, to run again with the updated image to bring the schema inline with the Newton release. + +The OpenStack-Helm project also implements annotations across all chart configmaps so that changing resources inside containers, such as configuration files, triggers a Kubernetes rolling update. This means that those resources can be updated without deleting and redeploying the service and can be treated like any other upgrade, such as a container image change. + +This is accomplished with the following annotation: + +``` + ... + annotations: + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} +``` + +The `hash` function defined in the `helm-toolkit` chart ensures that any change to any file referenced by configmap-bin.yaml or configmap-etc.yaml results in a new hash, which will then trigger a rolling update. + +All chart components (except `DaemonSets`) are outfitted by default with rolling update strategies: + +``` +spec: + replicas: {{ .Values.replicas }} + revisionHistoryLimit: {{ .Values.upgrades.revision_history }} + strategy: + type: {{ .Values.upgrades.pod_replacement_strategy }} + {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }} + rollingUpdate: + maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} + maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} + {{ end }} +``` + +In values.yaml in each chart, the same defaults are supplied in every chart, which allows the operator to override at upgrade or deployment time. + +``` +upgrades: + revision_history: 3 + pod_replacement_strategy: RollingUpdate + rolling_update: + max_unavailable: 1 + max_surge: 3 +``` + +## Resource Limits + +Resource limits should be defined for all charts within OpenStack-Helm. + +The convention is to leverage a `resources:` section within values.yaml by using an `enabled` setting that defaults to `false` but can be turned on by the operator at install or upgrade time. + +The resources specify the requests (memory and cpu) and limits (memory and cpu) for each deployed resource. For example, from the Nova chart `values.yaml`: + +``` +resources: + enabled: false + nova_compute: + requests: + memory: "124Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + nova_libvirt: + requests: + memory: "124Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + nova_api_metadata: + requests: + memory: "124Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" +... +``` + +These resources definitions are then applied to the appropriate component when the `enabled` flag is set. For instance, the following nova_compute daemonset has the requests and limits values applied from `.Values.resources.nova_compute`: + +``` + {{- if .Values.resources.enabled }} + resources: + requests: + memory: {{ .Values.resources.nova_compute.requests.memory | quote }} + cpu: {{ .Values.resources.nova_compute.requests.cpu | quote }} + limits: + memory: {{ .Values.resources.nova_compute.limits.memory | quote }} + cpu: {{ .Values.resources.nova_compute.limits.cpu | quote }} + {{- end }} +``` + +When a chart developer doesn't know what resource limits or requests to apply to a new component, they can deploy the component locally and examine resource utilization using tools like WeaveScope. The resource limits may not be perfect on initial submission, but over time and with community contributions, they can be refined to reflect reality. + +## Endpoints + +NOTE: This feature is under active development. There may be dragons here. + +As a large part of the project's purpose, OpenStack-Helm seeks to provide mechanisms around endpoints. OpenStack is a highly interconnected application, with various components requiring connectivity details to numerous services, including other OpenStack components and infrastructure elements such as databases, queues, and memcached infrastructure. The project's goal is to ensure that it can provide a consistent mechanism for defining these "endpoints" across all charts and provide the macros necessary to convert those definitions into usable endpoints. The charts should consistently default to building endpoints that assume the operator is leveraging all charts to build their OpenStack cloud. Endpoints should be configurable if an operator would like a chart to work with their existing infrastructure or run elements in different namespaces. + + +For instance, in the Neutron chart `values.yaml` the following endpoints are defined: + +``` +# typically overridden by environmental +# values, but should include all endpoints +# required by this chart +endpoints: + image: + hosts: + default: glance-api + type: image + path: null + scheme: 'http' + port: + api: 9292 + registry: 9191 + compute: + hosts: + default: nova-api + path: "/v2/%(tenant_id)s" + type: compute + scheme: 'http' + port: + api: 8774 + metadata: 8775 + novncproxy: 6080 + identity: + hosts: + default: keystone-api + path: /v3 + type: identity + scheme: 'http' + port: + admin: 35357 + public: 5000 + network: + hosts: + default: neutron-server + path: null + type: network + scheme: 'http' + port: + api: 9696 +``` + +These values define all the endpoints that the Neutron chart may need in order to build full URL compatible endpoints to various services. Long-term, these will also include database, memcached, and rabbitmq elements in one place. Essentially, all external connectivity needs to be defined centrally. + +The macros that help translate these into the actual URLs necessary are defined in the `helm-toolkit` chart. For instance, the cinder chart defines a `glance_api_servers` definition in the `cinder.conf` template: + +``` ++glance_api_servers = {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoint_type_lookup_addr" }} +``` + +This line of magic uses the `endpoint_type_lookup_addr` macro in the `helm-toolkit` chart (since it is used by all charts). Note that there is a second convention here. All `{{ define }}` macros in charts should be pre-fixed with the chart that is defining them. This allows developers to easily identify the source of a Helm macro and also avoid namespace collisions. In the example above, the macro `endpoint_type_look_addr` is defined in the `helm-toolkit` chart. This macro is passing three parameters (aided by the `tuple` method built into the go/sprig templating library used by Helm): + +- image: This is the OpenStack service that the endpoint is being built for. This will be mapped to `glance` which is the image service for OpenStack. +- internal: This is the OpenStack endpoint type we are looking for - valid values would be `internal`, `admin`, and `public` +- api: This is the port to map to for the service. Some components, such as glance, provide an `api` port and a `registry` port, for example. + +At all costs, charts should avoid hard coding values such as `http://keystone-api:5000` because these are not compatible with operator overrides and do not support spreading components out over various namespaces. + +## Common Conditionals + +The OpenStack-Helm charts make the following conditions available across all charts, which can be set at install or upgrade time with Helm below. + +### Developer Mode + +``` +helm install local/chart --set development.enabled=true +``` + +The development mode flag should be available on all charts. Enabling this reduces dependencies that the chart may have on persistent volume claims (which are difficult to support in a laptop minikube environment) as well as reducing replica counts or resiliency features to support a minimal environment. + +The glance chart for instance defines the following `development:` overrides: + +``` +development: + enabled: false + storage_path: /data/openstack-helm/glance/images +``` + +The `enabled` flag allows the developer to enable development mode. The storage path allows the operator to store glance images in a hostPath instead of leveraging a ceph backend, which again, is difficult to spin up in a small laptop minikube environment. The host path can be overriden by the operator if desired. + +### Resources + +``` +helm install local/chart --set resources.enabled=true +``` + +Resource limits/requirements can be turned on and off. By default, they are off. Setting this enabled to `true` will deploy Kubernetes resources with resource requirements and limits. diff --git a/docs/installation/getting-started.md b/docs/installation/getting-started.md index a0d261720e..16c04a47f9 100644 --- a/docs/installation/getting-started.md +++ b/docs/installation/getting-started.md @@ -232,6 +232,13 @@ admin@kubenode01:~$ ./generate_secrets.sh all `./generate_secrets.sh fsid` admin@kubenode01:~$ cd ../../.. ``` +## Nova Compute Instance Storage +Nova Compute requires a place to store instances locally. Each node labeled `openstack-compute-node` needs to have the following directory: +``` +admin@kubenode01:~$ mkdir -p /var/lib/nova/instances +``` +*Repeat this step for each node labeled: `openstack-compute-node`* + ## Helm Preparation Now we need to install and prepare Helm, the core of our project. Please use the installation guide from the [Kubernetes/Helm](https://github.com/kubernetes/helm/blob/master/docs/install.md#from-the-binary-releases) repository. Please take note of our required versions above. @@ -326,7 +333,7 @@ The parameters is what we're looking for here. If we see parameters passed to th ### Ceph Validation Most commonly, we want to validate that Ceph is working correctly. This can be done with the following ceph command: ``` -admin@kubenode01:~$ kubectl exec -t -i ceph-mon-392438295-6q04c -n ceph -- ceph status +admin@kubenode01:~$ kubectl exec -t -i ceph-mon-0 -n ceph -- ceph status cluster 046de582-f8ee-4352-9ed4-19de673deba0 health HEALTH_OK monmap e3: 3 mons at {ceph-mon-392438295-6q04c=10.25.65.131:6789/0,ceph-mon-392438295-ksrb2=10.25.49.196:6789/0,ceph-mon-392438295-l0pzj=10.25.79.193:6789/0} @@ -339,7 +346,23 @@ admin@kubenode01:~$ kubectl exec -t -i ceph-mon-392438295-6q04c -n ceph -- ceph 80 active+clean admin@kubenode01:~$ ``` -Use one of your Ceph Monitors to check the status of the cluster. A couple of things to note above; our health is 'HEALTH_OK', we have 3 mons, we've established a quorum, and we can see that our active mds is 'ceph-mds-2810413505-gtjgv'. We have a healthy environment, and are ready to install our next chart, MariaDB. +Use one of your Ceph Monitors to check the status of the cluster. A couple of things to note above; our health is 'HEALTH_OK', we have 3 mons, we've established a quorum, and we can see that our active mds is 'ceph-mds-2810413505-gtjgv'. We have a healthy environment. + +For Glance and Cinder to operate, you will need to create some storage pools for these systems. Additionally, Nova can be configured to use a pool as well, but this is off by default. + +``` +kubectl exec -n ceph -it ceph-mon-0 ceph osd pool create volumes 128 +kubectl exec -n ceph -it ceph-mon-0 ceph osd pool create images 128 +``` + +Nova storage would be added like this: +``` +kubectl exec -n ceph -it ceph-mon-0 ceph osd pool create vms 128 +``` + +The choosing the amount of storage is up to you and can be changed by replacing the 128 to meet your needs. + +We are now ready to install our next chart, MariaDB. ## MariaDB Installation and Verification We are using Galera to cluster MariaDB and establish a quorum. To install the MariaDB, issue the following command: diff --git a/docs/mission.md b/docs/mission.md index b39a809f90..f7d96fc611 100644 --- a/docs/mission.md +++ b/docs/mission.md @@ -1,6 +1,6 @@ # Mission -The goal for openstack-helm is to provide an incredibly customizable *framework* for operators and developers alike. This framework will enable end-users to deploy, maintain, and upgrade a fully functioning OpenStack environment for both simple and complex environments. Administrators or developers can either deploy all or individual OpenStack components along with their required dependencies. It heavily borrows concepts from [Stackanetes](https://github.com/stackanetes/stackanetes) and [other complex Helm application deployments](https://github.com/sapcc/openstack-helm). This project is meant to be a collaborative project that brings Openstack applications into a [Cloud-Native](https://www.cncf.io/about/charter) model. +The goal for OpenStack-Helm is to provide an incredibly customizable *framework* for operators and developers alike. This framework will enable end-users to deploy, maintain, and upgrade a fully functioning OpenStack environment for both simple and complex environments. Administrators or developers can either deploy all or individual OpenStack components along with their required dependencies. It heavily borrows concepts from [Stackanetes](https://github.com/stackanetes/stackanetes) and [other complex Helm application deployments](https://github.com/sapcc/openstack-helm). This project is meant to be a collaborative project that brings Openstack applications into a [Cloud-Native](https://www.cncf.io/about/charter) model. ## Resiliency diff --git a/horizon/requirements.lock b/horizon/requirements.lock deleted file mode 100644 index a30dd69a13..0000000000 --- a/horizon/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: http://localhost:8879/charts - version: 0.1.0 -digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc -generated: 2016-11-30T17:10:50.917838584-08:00 diff --git a/keystone/requirements.lock b/keystone/requirements.lock deleted file mode 100644 index 33d057c17f..0000000000 --- a/keystone/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: http://localhost:8879/charts - version: 0.1.0 -digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc -generated: 2016-11-30T17:10:51.579937981-08:00 diff --git a/maas/templates/bin/_register-rack-controller.sh.tpl b/maas/templates/bin/_register-rack-controller.sh.tpl new file mode 100644 index 0000000000..3445cc35fe --- /dev/null +++ b/maas/templates/bin/_register-rack-controller.sh.tpl @@ -0,0 +1,24 @@ +#!/bin/bash + +set -ex + +# show env +env > /tmp/env + +echo "register-rack-controller URL: "{{ .Values.service_name }}.{{ .Release.Namespace }} + +# note the secret must be a valid hex value + +# register forever +while [ 1 ]; +do + if maas-rack register --url=http://{{ .Values.service_name }}.{{ .Release.Namespace }}/MAAS --secret={{ .Values.secret | quote }}; + then + echo "Successfully registered with MaaS Region Controller" + break + else + echo "Unable to register with http://{{ .Values.service_name }}.{{ .Release.Namespace }}/MAAS... will try again" + sleep 10 + fi; + +done; \ No newline at end of file diff --git a/maas/templates/configmap-bin.yaml b/maas/templates/configmap-bin.yaml index f355e2fe97..ef95068fb5 100644 --- a/maas/templates/configmap-bin.yaml +++ b/maas/templates/configmap-bin.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: maas-region-bin + name: maas-bin data: start.sh: | {{ tuple "bin/_start.sh.tpl" . | include "template" | indent 4 }} @@ -11,3 +11,5 @@ data: {{ tuple "bin/_import-boot-resources.sh.tpl" . | include "template" | indent 4 }} job-readiness.sh: | {{ tuple "bin/_job-readiness.sh.tpl" . | include "template" | indent 4 }} + register-rack-controller.sh: | +{{ tuple "bin/_register-rack-controller.sh.tpl" . | include "template" | indent 4 }} diff --git a/maas/templates/configmap-etc.yaml b/maas/templates/configmap-etc.yaml index aebd1363b8..5dae1fb15b 100644 --- a/maas/templates/configmap-etc.yaml +++ b/maas/templates/configmap-etc.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: maas-region-etc + name: maas-etc data: named.conf.options: |+ {{ tuple "etc/_region-dns-config.tpl" . | include "template" | indent 4 }} diff --git a/maas/templates/deploy-rack.yaml b/maas/templates/deploy-rack.yaml index e2c6af2478..9feed98e71 100644 --- a/maas/templates/deploy-rack.yaml +++ b/maas/templates/deploy-rack.yaml @@ -11,6 +11,7 @@ spec: nodeSelector: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} hostNetwork: true + dnsPolicy: ClusterFirst containers: - name: maas-rack image: {{ .Values.images.maas_rack }} @@ -26,3 +27,12 @@ spec: {{- end }} securityContext: privileged: true + volumeMounts: + - name: registerrackcontrollersh + mountPath: "/usr/local/bin/register-rack-controller.sh" + subPath: "register-rack-controller.sh" + volumes: + - name: registerrackcontrollersh + configMap: + name: maas-bin + defaultMode: 0511 diff --git a/maas/templates/deploy-region.yaml b/maas/templates/deploy-region.yaml index 7f6c2c48c7..d663ac051a 100644 --- a/maas/templates/deploy-region.yaml +++ b/maas/templates/deploy-region.yaml @@ -106,18 +106,18 @@ spec: emptyDir: {} - name: maas-region-secret configMap: - name: maas-region-etc + name: maas-etc - name: maas-config emptyDir: {} - name: maas-dns-config configMap: - name: maas-region-etc + name: maas-etc - name: postgresql-defaults configMap: - name: maas-region-etc + name: maas-etc - name: startsh configMap: - name: maas-region-bin + name: maas-bin - name: maasregionpostinst configMap: - name: maas-region-bin + name: maas-bin diff --git a/maas/templates/etc/_secret.tpl b/maas/templates/etc/_secret.tpl index 48aad03a88..14c823bc4a 100644 --- a/maas/templates/etc/_secret.tpl +++ b/maas/templates/etc/_secret.tpl @@ -1 +1 @@ -3858f62230ac3c915f300c664312c63f +{{ .Values.secret }} diff --git a/maas/values.yaml b/maas/values.yaml index 237dbae388..fcf2570e5e 100644 --- a/maas/values.yaml +++ b/maas/values.yaml @@ -48,9 +48,9 @@ network: db_service: 5432 db_service_target: 5432 - ui_service_name: maas-region-ui db_service_name: db-service +secret: 3858f62230ac3c915f300c664312c63f resources: enabled: false diff --git a/mariadb/requirements.lock b/mariadb/requirements.lock deleted file mode 100644 index 9c460b97df..0000000000 --- a/mariadb/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: http://localhost:8879/charts - version: 0.1.0 -digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc -generated: 2016-11-30T17:10:49.537749902-08:00 diff --git a/memcached/requirements.lock b/memcached/requirements.lock deleted file mode 100644 index a30dd69a13..0000000000 --- a/memcached/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: http://localhost:8879/charts - version: 0.1.0 -digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc -generated: 2016-11-30T17:10:50.917838584-08:00 diff --git a/openstack/requirements.lock b/openstack/requirements.lock deleted file mode 100644 index 73571f11ba..0000000000 --- a/openstack/requirements.lock +++ /dev/null @@ -1,18 +0,0 @@ -dependencies: -- name: common - repository: http://localhost:8879/charts - version: 0.1.0 -- name: memcached - repository: http://localhost:8879/charts - version: 0.1.0 -- name: rabbitmq - repository: http://localhost:8879/charts - version: 0.1.0 -- name: mariadb - repository: http://localhost:8879/charts - version: 0.1.0 -- name: keystone - repository: http://localhost:8879/charts - version: 0.1.0 -digest: sha256:e92d6b6811d65492a95e4db258d516bfd7dd540108bb3d0e92e7dabc13ae2bbf -generated: 2016-11-30T17:10:52.235026033-08:00 diff --git a/postgresql/Chart.yaml b/postgresql/Chart.yaml new file mode 100644 index 0000000000..83840a3571 --- /dev/null +++ b/postgresql/Chart.yaml @@ -0,0 +1,3 @@ +description: A Helm chart for postgresql +name: postgresql +version: 0.1.0 diff --git a/postgresql/README.md b/postgresql/README.md new file mode 100644 index 0000000000..6857bd2e19 --- /dev/null +++ b/postgresql/README.md @@ -0,0 +1,11 @@ +# openstack-helm/postgresql + +This chart leverages StatefulSets, with persistent storage. + +The StatefulSets all leverage PVCs to provide stateful storage to /var/lib/postgresql. + +You must ensure that your control nodes that should receive postgresql instances are labeled with openstack-control-plane=enabled, or whatever you have configured in values.yaml for the label configuration: + +``` +kubectl label nodes openstack-control-plane=enabled --all +``` diff --git a/postgresql/requirements.yaml b/postgresql/requirements.yaml new file mode 100644 index 0000000000..2350b1facb --- /dev/null +++ b/postgresql/requirements.yaml @@ -0,0 +1,4 @@ +dependencies: + - name: common + repository: http://localhost:8879/charts + version: 0.1.0 diff --git a/postgresql/templates/deployment.yaml b/postgresql/templates/deployment.yaml new file mode 100644 index 0000000000..6593b14b9e --- /dev/null +++ b/postgresql/templates/deployment.yaml @@ -0,0 +1,54 @@ +apiVersion: apps/v1beta1 +kind: StatefulSet +metadata: + name: {{ .Values.service_name }} +spec: + serviceName: {{ .Values.service_name }} + replicas: {{ .Values.replicas }} + template: + metadata: + labels: + app: {{ .Values.service_name }} + spec: + nodeSelector: + {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + containers: + - name: {{ .Values.service_name }} + image: {{ .Values.images.postgresql }} + imagePullPolicy: {{ .Values.images.pull_policy }} + ports: + - containerPort: {{ .Values.network.port.postgresql }} + livenessProbe: + exec: + command: + - pg_isready + initialDelaySeconds: 20 + timeoutSeconds: 5 + readinessProbe: + exec: + command: + - pg_isready + initialDelaySeconds: 20 + timeoutSeconds: 5 + resources: +{{ toYaml .Values.resources | indent 10 }} + volumeMounts: + - name: postgresql-data + mountPath: /var/lib/postgresql + volumes: +{{- if .Values.development.enabled }} + - name: postgresql-data + hostPath: + path: {{ .Values.development.storage_path }} +{{- else }} + volumeClaimTemplates: + - metadata: + name: postgresql-data + annotations: + {{ .Values.volume.class_path }}: {{ .Values.volume.class_name }} + spec: + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: {{ .Values.volume.size }} +{{- end }} diff --git a/postgresql/templates/service.yaml b/postgresql/templates/service.yaml new file mode 100644 index 0000000000..223b79338c --- /dev/null +++ b/postgresql/templates/service.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.service_name }} +spec: + ports: + - name: db + port: {{ .Values.network.port.postgresql }} + selector: + app: {{ .Values.service_name }} diff --git a/postgresql/values.yaml b/postgresql/values.yaml new file mode 100644 index 0000000000..d8a340c52c --- /dev/null +++ b/postgresql/values.yaml @@ -0,0 +1,29 @@ +# Default values for postgresql. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +development: + enabled: true + storage_path: /data/openstack-helm/postgresql + +replicas: 1 #only 1 replica currently supported + +service_name: postgresql + +# using dockerhub postgresql: https://hub.docker.com/r/library/postgres/tags/ +images: + postgresql: "docker.io/postgres:9.5" + pull_policy: IfNotPresent + +volume: + class_path: volume.beta.kubernetes.io/storage-class + class_name: general + size: 20Gi + +labels: + node_selector_key: openstack-control-plane + node_selector_value: enabled + +network: + port: + postgresql: 5432 diff --git a/rabbitmq/requirements.lock b/rabbitmq/requirements.lock deleted file mode 100644 index 3d8db9f442..0000000000 --- a/rabbitmq/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: http://localhost:8879/charts - version: 0.1.0 -digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc -generated: 2016-11-30T17:10:50.189434385-08:00 diff --git a/travis-ci/charts_dry_run.sh b/travis-ci/charts_dry_run.sh new file mode 100644 index 0000000000..8fed0b1e29 --- /dev/null +++ b/travis-ci/charts_dry_run.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +for chart in *.tgz; do + echo "Running helm install --dry-run --debug on $chart"; + helm install --dry-run --debug local/$chart; +done diff --git a/travis-ci/kubeadm_setup.sh b/travis-ci/kubeadm_setup.sh new file mode 100644 index 0000000000..14b04764dc --- /dev/null +++ b/travis-ci/kubeadm_setup.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +docker run -it -e quay.io/attcomdev/kubeadm-ci:v1.1.0 --name kubeadm-ci --privileged=true -d --net=host --security-opt seccomp:unconfined --cap-add=SYS_ADMIN -v /sys/fs/cgroup:/sys/fs/cgroup:ro -v /var/run/docker.sock:/var/run/docker.sock quay.io/attcomdev/kubeadm-ci:v1.1.0 /sbin/init + +docker exec kubeadm-ci kubeadm.sh