diff --git a/Makefile b/Makefile index fbd61d3..a1cc512 100644 --- a/Makefile +++ b/Makefile @@ -14,13 +14,13 @@ IMAGE_PREFIX ?= airshipit IMAGE_TAG ?= untagged -IMAGE_NAME := aptly +IMAGE_NAME := mini-mirror COMMIT ?= commit-id DOCKER_REGISTRY ?= quay.io PUSH_IMAGE ?= false -HELM := $(BUILD_DIR)/helm +HELM := helm PROXY ?= http://proxy.foo.com:8000 NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local @@ -30,11 +30,13 @@ UBUNTU_BASE_IMAGE ?= ubuntu:16.04 IMAGE:=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$(IMAGE_NAME):${IMAGE_TAG} +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 @@ -48,6 +50,11 @@ test-containers: clean build --volume $(shell pwd)/tools:/opt \ $(UBUNTU_BASE_IMAGE) /opt/install_packages.sh +.PHONY: test-charts +test-charts: helm-lint charts + $(HELM) delete mini-mirror || true + $(HELM) install --debug -n mini-mirror mini-mirror-*.tgz + .PHONY: clean clean: docker rm -f aptly || true @@ -86,3 +93,13 @@ 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: + $(HELM) dep up $(CHART) + $(HELM) package $(CHART) 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/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..bec33f8 --- /dev/null +++ b/charts/mini-mirror/templates/deployment.yaml @@ -0,0 +1,51 @@ +apiVersion: apps/v1beta2 +kind: Deployment +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: + replicas: {{ .Values.replicaCount }} + 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 }} + spec: + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 80 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: +{{ toYaml .Values.resources | indent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/charts/mini-mirror/templates/ingress.yaml b/charts/mini-mirror/templates/ingress.yaml new file mode 100644 index 0000000..6af3e49 --- /dev/null +++ b/charts/mini-mirror/templates/ingress.yaml @@ -0,0 +1,38 @@ +{{- if .Values.ingress.enabled -}} +{{- $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: http + {{- end }} +{{- end }} diff --git a/charts/mini-mirror/templates/service.yaml b/charts/mini-mirror/templates/service.yaml new file mode 100644 index 0000000..e1aa5ce --- /dev/null +++ b/charts/mini-mirror/templates/service.yaml @@ -0,0 +1,19 @@ +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: http + protocol: TCP + name: http + selector: + app.kubernetes.io/name: {{ include "mini-mirror.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/mini-mirror/values.yaml b/charts/mini-mirror/values.yaml new file mode 100644 index 0000000..21f76be --- /dev/null +++ b/charts/mini-mirror/values.yaml @@ -0,0 +1,48 @@ +# Default values for mini-mirror. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: docker.io/amadev/mini-mirror + tag: latest + pullPolicy: IfNotPresent + +nameOverride: "mini-mirror" +fullnameOverride: "mini-mirror" + +service: + type: ClusterIP + port: 8889 + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + path: / + hosts: + - cluster.local + tls: [] + # - secretName: chart-example-tls + # hosts: + # - cluster.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {}