From 28852e400e0742d2e9fe8e611c016ff3f296df78 Mon Sep 17 00:00:00 2001 From: Aram Peres Date: Sat, 16 Oct 2021 13:51:41 -0400 Subject: [PATCH] Use onetun for ntc-comingsoon and ntc-pdf-converter --- .gitlab-ci.yml | 33 +++++++ infra/manifests/ntc-comingsoon.yml | 14 --- onetun/chart/onetun/.helmignore | 23 +++++ onetun/chart/onetun/Chart.yaml | 6 ++ onetun/chart/onetun/templates/NOTES.txt | 22 +++++ onetun/chart/onetun/templates/_helpers.tpl | 62 +++++++++++++ onetun/chart/onetun/templates/deployment.yaml | 79 +++++++++++++++++ onetun/chart/onetun/templates/hpa.yaml | 28 ++++++ onetun/chart/onetun/templates/ingress.yaml | 61 +++++++++++++ onetun/chart/onetun/templates/service.yaml | 15 ++++ .../onetun/templates/serviceaccount.yaml | 12 +++ onetun/chart/onetun/values.yaml | 86 +++++++++++++++++++ onetun/ntc-comingsoon.yml | 25 ++++++ onetun/ntc-pdf-converter.yml | 21 +++++ 14 files changed, 473 insertions(+), 14 deletions(-) delete mode 100644 infra/manifests/ntc-comingsoon.yml create mode 100644 onetun/chart/onetun/.helmignore create mode 100644 onetun/chart/onetun/Chart.yaml create mode 100644 onetun/chart/onetun/templates/NOTES.txt create mode 100644 onetun/chart/onetun/templates/_helpers.tpl create mode 100644 onetun/chart/onetun/templates/deployment.yaml create mode 100644 onetun/chart/onetun/templates/hpa.yaml create mode 100644 onetun/chart/onetun/templates/ingress.yaml create mode 100644 onetun/chart/onetun/templates/service.yaml create mode 100644 onetun/chart/onetun/templates/serviceaccount.yaml create mode 100644 onetun/chart/onetun/values.yaml create mode 100644 onetun/ntc-comingsoon.yml create mode 100644 onetun/ntc-pdf-converter.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 173ca7a..8545aa0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ variables: DEFIANT_SRC: ${CI_PROJECT_DIR}/defiant CHARTMUSEUM_SRC: ${CI_PROJECT_DIR}/chartmuseum ABITIBI_SRC: ${CI_PROJECT_DIR}/abitibi + ONETUN_SRC: ${CI_PROJECT_DIR}/onetun IMAGE_PREFIX: registry.gitlab.com/momothereal/momoperes.ca WEBSITE_IMAGE: ${IMAGE_PREFIX}/website @@ -82,6 +83,38 @@ abitibi:deploy: changes: - abitibi/**/* +onetun-ntc-comingsoon:deploy: + stage: deploy + image: wavyfm/helm-kubectl-docker:v1.19.3-v3.4.2 + script: + - mkdir -p ${KUBECONFIG_PARENT} + - echo ${K8S_CLUSTER_CONFIG} | base64 -d > ${KUBECONFIG} + + # Deploy using helm chart + - cd ${ONETUN_SRC} + - hper upgrade --install -n ${DEPLOY_NAMESPACE} -f ./ntc-comingsoon.yml ntc-comingsoon ./chart/onetun + only: + refs: + - master + changes: + - onetun/**/* + +onetun-ntc-pdf-converter:deploy: + stage: deploy + image: wavyfm/helm-kubectl-docker:v1.19.3-v3.4.2 + script: + - mkdir -p ${KUBECONFIG_PARENT} + - echo ${K8S_CLUSTER_CONFIG} | base64 -d > ${KUBECONFIG} + + # Deploy using helm chart + - cd ${ONETUN_SRC} + - hper upgrade --install -n ${DEPLOY_NAMESPACE} -f ./ntc-pdf-converter.yml ntc-pdf-converter ./chart/onetun + only: + refs: + - master + changes: + - onetun/**/* + # INFRA # infra:deploy: diff --git a/infra/manifests/ntc-comingsoon.yml b/infra/manifests/ntc-comingsoon.yml deleted file mode 100644 index 64f3a43..0000000 --- a/infra/manifests/ntc-comingsoon.yml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: ntc-comingsoon - namespace: public -spec: - externalName: 159.203.15.179 - ports: - - name: http - port: 7001 - protocol: TCP - targetPort: 7001 - sessionAffinity: None - type: ExternalName diff --git a/onetun/chart/onetun/.helmignore b/onetun/chart/onetun/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/onetun/chart/onetun/.helmignore @@ -0,0 +1,23 @@ +# 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 +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/onetun/chart/onetun/Chart.yaml b/onetun/chart/onetun/Chart.yaml new file mode 100644 index 0000000..9cca89b --- /dev/null +++ b/onetun/chart/onetun/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: onetun +description: A Helm chart for Kubernetes +type: application +version: 0.1.0 +appVersion: "v0.1.5" diff --git a/onetun/chart/onetun/templates/NOTES.txt b/onetun/chart/onetun/templates/NOTES.txt new file mode 100644 index 0000000..d1c18a4 --- /dev/null +++ b/onetun/chart/onetun/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "onetun.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 --namespace {{ .Release.Namespace }} svc -w {{ include "onetun.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "onetun.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + 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 "onetun.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/onetun/chart/onetun/templates/_helpers.tpl b/onetun/chart/onetun/templates/_helpers.tpl new file mode 100644 index 0000000..b6c5ae8 --- /dev/null +++ b/onetun/chart/onetun/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "onetun.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 "onetun.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 "onetun.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "onetun.labels" -}} +helm.sh/chart: {{ include "onetun.chart" . }} +{{ include "onetun.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "onetun.selectorLabels" -}} +app.kubernetes.io/name: {{ include "onetun.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "onetun.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "onetun.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/onetun/chart/onetun/templates/deployment.yaml b/onetun/chart/onetun/templates/deployment.yaml new file mode 100644 index 0000000..588199d --- /dev/null +++ b/onetun/chart/onetun/templates/deployment.yaml @@ -0,0 +1,79 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "onetun.fullname" . }} + labels: + {{- include "onetun.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "onetun.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "onetun.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "onetun.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: tcp + containerPort: 2115 + protocol: TCP + resources: + {{- toYaml .Values.resources | nindent 12 }} + env: + - name: ONETUN_LOG + value: {{ .Values.onetun.log | quote }} + - name: ONETUN_PRIVATE_KEY + valueFrom: + secretKeyRef: + key: private-key + name: {{ .Values.onetun.secretName | quote }} + - name: ONETUN_ENDPOINT_PUBLIC_KEY + valueFrom: + secretKeyRef: + key: public-key + name: {{ .Values.onetun.secretName | quote }} + - name: ONETUN_ENDPOINT_ADDR + valueFrom: + secretKeyRef: + key: endpoint + name: {{ .Values.onetun.secretName | quote }} + - name: ONETUN_SOURCE_PEER_IP + value: {{ .Values.onetun.sourcePeerIP | quote }} + - name: ONETUN_KEEP_ALIVE + value: {{ .Values.onetun.keepAlive | quote }} + - name: ONETUN_DESTINATION_ADDR + value: {{ .Values.onetun.destination | quote }} + - name: ONETUN_SOURCE_ADDR + value: "0.0.0.0:2115" + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/onetun/chart/onetun/templates/hpa.yaml b/onetun/chart/onetun/templates/hpa.yaml new file mode 100644 index 0000000..d505a27 --- /dev/null +++ b/onetun/chart/onetun/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "onetun.fullname" . }} + labels: + {{- include "onetun.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "onetun.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/onetun/chart/onetun/templates/ingress.yaml b/onetun/chart/onetun/templates/ingress.yaml new file mode 100644 index 0000000..f42d3fb --- /dev/null +++ b/onetun/chart/onetun/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "onetun.fullname" . -}} +{{- $svcPort := "tcp" -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "onetun.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + name: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/onetun/chart/onetun/templates/service.yaml b/onetun/chart/onetun/templates/service.yaml new file mode 100644 index 0000000..5a1ce9f --- /dev/null +++ b/onetun/chart/onetun/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "onetun.fullname" . }} + labels: + {{- include "onetun.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: tcp + protocol: TCP + name: tcp + selector: + {{- include "onetun.selectorLabels" . | nindent 4 }} diff --git a/onetun/chart/onetun/templates/serviceaccount.yaml b/onetun/chart/onetun/templates/serviceaccount.yaml new file mode 100644 index 0000000..51da119 --- /dev/null +++ b/onetun/chart/onetun/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "onetun.serviceAccountName" . }} + labels: + {{- include "onetun.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/onetun/chart/onetun/values.yaml b/onetun/chart/onetun/values.yaml new file mode 100644 index 0000000..866cda5 --- /dev/null +++ b/onetun/chart/onetun/values.yaml @@ -0,0 +1,86 @@ +replicaCount: 1 + +image: + repository: aramperes/onetun + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +onetun: + # Existing secret name that contains "private-key", "public-key", "endpoint". + secretName: "" + # Keep alive in seconds + keepAlive: "" + # This tunnel's assigned peer IP + sourcePeerIP: "" + # Destination IP and port + destination: "" + # Log level + log: info + +imagePullSecrets: [ ] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: false + # Annotations to add to the service account + annotations: { } + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: { } + +podSecurityContext: { } +# fsGroup: 2000 + +securityContext: + readOnlyRootFilesystem: true + runAsUser: 1000 + +service: + type: ClusterIP + port: 2115 + +ingress: + enabled: false + className: "" + annotations: { } + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: [ ] + # - host: chart-example.local + # paths: + # - path: / + # pathType: ImplementationSpecific + tls: [ ] + # - secretName: chart-example-tls + # hosts: + # - chart-example.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 + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: { } + +tolerations: [ ] + +affinity: { } diff --git a/onetun/ntc-comingsoon.yml b/onetun/ntc-comingsoon.yml new file mode 100644 index 0000000..7dd8b1c --- /dev/null +++ b/onetun/ntc-comingsoon.yml @@ -0,0 +1,25 @@ +onetun: + secretName: onetun-ntc-comingsoon + keepAlive: 10 + sourcePeerIP: 192.168.4.17 + destination: 192.168.4.2:7001 + log: trace + +ingress: + enabled: true + annotations: + kubernetes.io/ingress.class: nginx + hosts: + - host: notetaking.club + paths: + - path: / + pathType: ImplementationSpecific + - host: www.notetaking.club + paths: + - path: / + pathType: ImplementationSpecific + tls: + - secretName: notetaking.club-wildcard-tls + hosts: + - notetaking.club + - www.notetaking.club diff --git a/onetun/ntc-pdf-converter.yml b/onetun/ntc-pdf-converter.yml new file mode 100644 index 0000000..29cad44 --- /dev/null +++ b/onetun/ntc-pdf-converter.yml @@ -0,0 +1,21 @@ +onetun: + secretName: onetun-ntc-pdf-converter + keepAlive: 10 + sourcePeerIP: 192.168.4.18 + destination: 192.168.4.2:7000 + log: trace + +ingress: + enabled: true + annotations: + kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/proxy-body-size: 50m + hosts: + - host: ntc-pdf-converter.poire.dev + paths: + - path: / + pathType: ImplementationSpecific + tls: + - secretName: poire.dev-wildcard-tls + hosts: + - ntc-pdf-converter.poire.dev