diff --git a/Makefile b/Makefile index 3ccebcb..eaf7e11 100644 --- a/Makefile +++ b/Makefile @@ -31,17 +31,18 @@ UBUNTU_BASE_IMAGE ?= ubuntu:16.04 IMAGE:=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$(IMAGE_NAME):${IMAGE_TAG} MINI_MIRROR := mini-mirror +CHART := charts/mini-mirror .PHONY: validate validate: lint test .PHONY: test -test: test-containers +test: test-containers test-charts .PHONY: test-containers test-containers: clean build docker run -d \ - --publish 8080:80 \ + --publish 8889:80 \ --volume $(shell pwd)/assets/nginx:/opt/nginx \ --name aptly \ ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} @@ -49,12 +50,22 @@ test-containers: clean build --name target \ --volume $(shell pwd)/tools:/opt \ $(UBUNTU_BASE_IMAGE) /opt/install_packages.sh + $(MAKE) clean + +.PHONY: test-charts +test-charts: clean-charts charts helm-lint + $(HELM) install --debug -n mini-mirror mini-mirror-*.tgz --set nodeSelector= + $(MAKE) clean-charts .PHONY: clean clean: docker rm -f aptly || true docker rm -f target || true +.PHONY: clean-charts +clean-charts: + $(HELM) delete --purge mini-mirror || true + .PHONY: lint lint: shellcheck $(MINI_MIRROR)/assets/*.sh @@ -88,3 +99,19 @@ endif .PHONY: lint-install lint-install: apt-get install -y shellcheck + +.PHONY: helm-lint +helm-lint: + $(HELM) lint $(CHART) + +# Create tgz of the chart +.PHONY: charts +charts: + rm -f mini-mirror-*.tgz + $(HELM) dep up $(CHART) + $(HELM) package $(CHART) + +.PHONY: test-install +test-install: + rm -rf build + tools/helm_tk.sh $(HELM) diff --git a/charts/mini-mirror/.helmignore b/charts/mini-mirror/.helmignore new file mode 100644 index 0000000..f0c1319 --- /dev/null +++ b/charts/mini-mirror/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/charts/mini-mirror/Chart.yaml b/charts/mini-mirror/Chart.yaml new file mode 100644 index 0000000..5bc8afa --- /dev/null +++ b/charts/mini-mirror/Chart.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +appVersion: "1.0" +description: A Helm chart for miniMirror +name: mini-mirror +version: 0.1.0 +maintainers: +- name: Airship diff --git a/charts/mini-mirror/requirements.yaml b/charts/mini-mirror/requirements.yaml new file mode 100644 index 0000000..b98ba5a --- /dev/null +++ b/charts/mini-mirror/requirements.yaml @@ -0,0 +1,19 @@ +# Copyright 2017 The Openstack-Helm Authors. +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +dependencies: + - name: helm-toolkit + repository: http://localhost:8879/charts + version: 0.1.0 diff --git a/charts/mini-mirror/templates/NOTES.txt b/charts/mini-mirror/templates/NOTES.txt new file mode 100644 index 0000000..f2e9858 --- /dev/null +++ b/charts/mini-mirror/templates/NOTES.txt @@ -0,0 +1,19 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range .Values.ingress.hosts }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "mini-mirror.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get svc -w {{ include "mini-mirror.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "mini-mirror.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "mini-mirror.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:80 +{{- end }} diff --git a/charts/mini-mirror/templates/_helpers.tpl b/charts/mini-mirror/templates/_helpers.tpl new file mode 100644 index 0000000..8817848 --- /dev/null +++ b/charts/mini-mirror/templates/_helpers.tpl @@ -0,0 +1,32 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "mini-mirror.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "mini-mirror.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "mini-mirror.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/charts/mini-mirror/templates/deployment.yaml b/charts/mini-mirror/templates/deployment.yaml new file mode 100644 index 0000000..0238142 --- /dev/null +++ b/charts/mini-mirror/templates/deployment.yaml @@ -0,0 +1,72 @@ +# Copyright 2017 The Openstack-Helm Authors. +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- if .Values.manifests.deployment_mini_mirror }} +{{- $envAll := . }} +apiVersion: apps/v1beta2 +kind: Deployment +metadata: + name: {{ include "mini-mirror.fullname" . }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} + labels: + app.kubernetes.io/name: {{ include "mini-mirror.name" . }} + helm.sh/chart: {{ include "mini-mirror.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + replicas: {{ .Values.replicaCount }} +{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "mini-mirror.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + template: + metadata: + labels: + app.kubernetes.io/name: {{ include "mini-mirror.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} +{{ tuple $envAll "mini-mirror" "mini-mirror" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} + spec: + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} +{{ tuple $envAll $envAll.Values.pod.resources.mini_mirror | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} + ports: + - name: http + containerPort: 80 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} +{{- end }} diff --git a/charts/mini-mirror/templates/ingress.yaml b/charts/mini-mirror/templates/ingress.yaml new file mode 100644 index 0000000..80e30f6 --- /dev/null +++ b/charts/mini-mirror/templates/ingress.yaml @@ -0,0 +1,55 @@ +{{/* +Copyright 2017 The Openstack-Helm Authors. +Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if .Values.manifests.ingress_mini_mirror }} +{{- $fullName := include "mini-mirror.fullname" . -}} +{{- $ingressPath := .Values.ingress.path -}} +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + app.kubernetes.io/name: {{ include "mini-mirror.name" . }} + helm.sh/chart: {{ include "mini-mirror.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- with .Values.ingress.annotations }} + annotations: +{{ toYaml . | indent 4 }} +{{- end }} +spec: +{{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} +{{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ . | quote }} + http: + paths: + - path: {{ $ingressPath }} + backend: + serviceName: {{ $fullName }} + servicePort: mm-port + {{- end }} +{{- end }} diff --git a/charts/mini-mirror/templates/service.yaml b/charts/mini-mirror/templates/service.yaml new file mode 100644 index 0000000..b5ef23e --- /dev/null +++ b/charts/mini-mirror/templates/service.yaml @@ -0,0 +1,40 @@ +{{/* +Copyright 2017 The Openstack-Helm Authors. +Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if .Values.manifests.service_mini_mirror }} +{{- $envAll := . }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ include "mini-mirror.fullname" . }} + labels: + app.kubernetes.io/name: {{ include "mini-mirror.name" . }} + helm.sh/chart: {{ include "mini-mirror.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: 80 + protocol: TCP + name: mm-port + selector: + app.kubernetes.io/name: {{ include "mini-mirror.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} diff --git a/charts/mini-mirror/values.yaml b/charts/mini-mirror/values.yaml new file mode 100644 index 0000000..2586813 --- /dev/null +++ b/charts/mini-mirror/values.yaml @@ -0,0 +1,55 @@ +# Default values for mini-mirror. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + tag: docker.io/amadev/mini-mirror:latest + pullPolicy: IfNotPresent + +nameOverride: "mini-mirror" +fullnameOverride: "mini-mirror" + +service: + type: ClusterIP + port: 8889 + +ingress: + enabled: false + annotations: {} + path: / + hosts: + - cluster.local + tls: [] + +nodeSelector: + ucp-control-plane: enabled + +tolerations: [] + +affinity: {} + +pod: + lifecycle: + upgrades: + deployments: + revision_history: 3 + pod_replacement_strategy: RollingUpdate + rolling_update: + max_unavailable: 1 + max_surge: 3 + resources: + enabled: false + mini_mirror: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + +manifests: + deployment_mini_mirror: true + service_mini_mirror: true + ingress_mini_mirror: true diff --git a/tools/gate/playbooks/zuul-check.yaml b/tools/gate/playbooks/zuul-check.yaml index 7f4280c..5f8f1f8 100644 --- a/tools/gate/playbooks/zuul-check.yaml +++ b/tools/gate/playbooks/zuul-check.yaml @@ -16,6 +16,6 @@ tasks: - name: Build and Run Container become: true - command: make test + command: make test-install test args: chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh new file mode 100755 index 0000000..5007d35 --- /dev/null +++ b/tools/helm_tk.sh @@ -0,0 +1,59 @@ +#!/bin/bash +# Copyright 2018 AT&T Intellectual Property. All other rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Script to setup helm-toolkit and helm dep up the shipyard chart +# +HELM=$1 +HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"} +HTK_PATH=${HTK_PATH:-""} + +if [[ ! -z $(echo $http_proxy) ]] +then + export no_proxy=$no_proxy,127.0.0.1 +fi + +set -x + +function helm_serve { + if [[ -d "$HOME/.helm" ]]; then + echo ".helm directory found" + else + ${HELM} init --client-only + fi + if [[ -z $(curl -s 127.0.0.1:8879 | grep 'Helm Repository') ]]; then + ${HELM} serve & > /dev/null + while [[ -z $(curl -s 127.0.0.1:8879 | grep 'Helm Repository') ]]; do + sleep 1 + echo "Waiting for Helm Repository" + done + else + echo "Helm serve already running" + fi + + if ${HELM} repo list | grep -q "^stable" ; then + ${HELM} repo remove stable + fi + + ${HELM} repo add local http://localhost:8879/charts +} + +mkdir -p build +pushd build +git clone --depth 1 $HTK_REPO || true +pushd ${HTK_REPO##*/}/$HTK_PATH + +git pull +make helm-toolkit +helm_serve diff --git a/tools/install_packages.sh b/tools/install_packages.sh index 502d672..2184748 100755 --- a/tools/install_packages.sh +++ b/tools/install_packages.sh @@ -6,8 +6,8 @@ set -o xtrace apt update apt install -y curl -curl -s localhost:8080/aptly_repo_signing.key | apt-key add - -echo 'deb http://localhost:8080 xenial main' > /etc/apt/sources.list +curl -s localhost:8889/aptly_repo_signing.key | apt-key add - +echo 'deb http://localhost:8889 xenial main' > /etc/apt/sources.list apt-get update apt-cache policy accountsservice apt-get install -y accountsservice