diff --git a/README.md b/README.md index bd0600c..d51d4e3 100644 --- a/README.md +++ b/README.md @@ -120,19 +120,7 @@ helm upgrade --install --wait --timeout 120s --values values/production/pyarweb. ## Wiki -Using https://github.com/helm/charts/tree/master/testing/wiki - -Staging: - -```bash -helm upgrade --install --wait --timeout 120s --values values/staging/pyar-wiki.yaml staging-wiki stable/pyar-wiki --debug -``` - -Production: - -```bash -helm upgrade --install --wait --timeout 120s --values values/production/pyar-wiki.yaml prod-wiki stable/pyar-wiki --debug -``` +The Wiki is hosted on GitHub Pages and Cloudflare is configured to forward [https://wiki.python.org.ar/](https://wiki.python.org.ar/) to [https://pyar.github.io](https://pyar.github.io). ## AsociaciĆ³n Civil administration. (asoc_members) diff --git a/stable/pyar-wiki/.helmignore b/stable/pyar-wiki/.helmignore deleted file mode 100644 index 50af031..0000000 --- a/stable/pyar-wiki/.helmignore +++ /dev/null @@ -1,22 +0,0 @@ -# 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 -.vscode/ diff --git a/stable/pyar-wiki/Chart.yaml b/stable/pyar-wiki/Chart.yaml deleted file mode 100644 index f2a5ba2..0000000 --- a/stable/pyar-wiki/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for Kubernetes -name: pyar-wiki -version: 0.1.0 diff --git a/stable/pyar-wiki/templates/NOTES.txt b/stable/pyar-wiki/templates/NOTES.txt deleted file mode 100644 index ad0f2be..0000000 --- a/stable/pyar-wiki/templates/NOTES.txt +++ /dev/null @@ -1,19 +0,0 @@ -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 {{ template "asoc-members.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 {{ template "asoc-members.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "asoc-members.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={{ template "asoc-members.name" . }},release={{ .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/stable/pyar-wiki/templates/_helpers.tpl b/stable/pyar-wiki/templates/_helpers.tpl deleted file mode 100644 index 86a973f..0000000 --- a/stable/pyar-wiki/templates/_helpers.tpl +++ /dev/null @@ -1,56 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "pyar-wiki.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 "pyar-wiki.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 "pyar-wiki.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "pyar-wiki.labels" -}} -app.kubernetes.io/name: {{ include "pyar-wiki.name" . }} -helm.sh/chart: {{ include "pyar-wiki.chart" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "pyar-wiki.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "pyar-wiki.fullname" .) .Values.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.serviceAccount.name }} -{{- end -}} -{{- end -}} diff --git a/stable/pyar-wiki/templates/_secrets_env_vars_helper.yaml b/stable/pyar-wiki/templates/_secrets_env_vars_helper.yaml deleted file mode 100644 index 0fe76ba..0000000 --- a/stable/pyar-wiki/templates/_secrets_env_vars_helper.yaml +++ /dev/null @@ -1,7 +0,0 @@ -{{- define "env.secrets" }} -- name: SENTRY_DSN - valueFrom: - secretKeyRef: - name: {{ .Values.secretsName }} - key: SENTRY_DSN -{{- end }} diff --git a/stable/pyar-wiki/templates/deployment.yaml b/stable/pyar-wiki/templates/deployment.yaml deleted file mode 100644 index b4844f6..0000000 --- a/stable/pyar-wiki/templates/deployment.yaml +++ /dev/null @@ -1,61 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "pyar-wiki.fullname" . }} - labels: -{{ include "pyar-wiki.labels" . | indent 4 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "pyar-wiki.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "pyar-wiki.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ template "pyar-wiki.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - {{- if .Values.secretsName }} - {{ include "env.secrets" . | indent 12 }} - {{- end }} - ports: - - name: http - containerPort: 80 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- 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/stable/pyar-wiki/templates/ingress.yaml b/stable/pyar-wiki/templates/ingress.yaml deleted file mode 100644 index 2dc5ea0..0000000 --- a/stable/pyar-wiki/templates/ingress.yaml +++ /dev/null @@ -1,44 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "pyar-wiki.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- $ingressPath := .Values.ingress.path -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: -{{ include "pyar-wiki.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 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: {{ . }} - http: - paths: - - path: {{ $ingressPath }} - pathType: Prefix - backend: - service: - name: {{ $fullName }} - port: - number: 80 - - {{- end }} -{{- end }} diff --git a/stable/pyar-wiki/templates/service.yaml b/stable/pyar-wiki/templates/service.yaml deleted file mode 100644 index f0b0944..0000000 --- a/stable/pyar-wiki/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "pyar-wiki.fullname" . }} - labels: -{{ include "pyar-wiki.labels" . | indent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - app.kubernetes.io/name: {{ include "pyar-wiki.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/stable/pyar-wiki/templates/serviceaccount.yaml b/stable/pyar-wiki/templates/serviceaccount.yaml deleted file mode 100644 index 758e599..0000000 --- a/stable/pyar-wiki/templates/serviceaccount.yaml +++ /dev/null @@ -1,8 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "pyar-wiki.serviceAccountName" . }} - labels: -{{ include "pyar-wiki.labels" . | indent 4 }} -{{- end -}} diff --git a/stable/pyar-wiki/templates/tests/test-connection.yaml b/stable/pyar-wiki/templates/tests/test-connection.yaml deleted file mode 100644 index 5b620b8..0000000 --- a/stable/pyar-wiki/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "pyar-wiki.fullname" . }}-test-connection" - labels: -{{ include "pyar-wiki.labels" . | indent 4 }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "pyar-wiki.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/stable/pyar-wiki/values.yaml b/stable/pyar-wiki/values.yaml deleted file mode 100644 index 42717e5..0000000 --- a/stable/pyar-wiki/values.yaml +++ /dev/null @@ -1,65 +0,0 @@ -# Default values for pyar-wiki. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: pyar/wiki - tag: latest - pullPolicy: Always - imagePullPolicy: "Always" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: [] - - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: - limits: - cpu: 100m - memory: 128Mi - requests: - cpu: 100m - memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/values/production/pyar-wiki.yaml b/values/production/pyar-wiki.yaml deleted file mode 100644 index 8b0285d..0000000 --- a/values/production/pyar-wiki.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# Default values for asoc_members. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: pyar/wiki - tag: latest - pullPolicy: Always - imagePullPolicy: "Always" - -nameOverride: "" -fullnameOverride: "" - -service: - type: ClusterIP - port: 80 - -resources: - limits: - cpu: 50m - memory: 256Mi - requests: - cpu: 20m - memory: 128Mi - -ingress: - enabled: true - path: / - hosts: - - wiki.python.org.ar - annotations: - kubernetes.io/ingress.class: nginx - cert-manager.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/rewrite-target: / - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: 25m - ingress.kubernetes.io/proxy-body-size: 25m - tls: - - secretName: tls-secret-wiki - hosts: - - wiki.python.org.ar - -secretsName: wiki-production - -nodeSelector: {} - -tolerations: [] - -affinity: {} - - diff --git a/values/staging/pyar-wiki.yaml b/values/staging/pyar-wiki.yaml deleted file mode 100644 index 897ce8f..0000000 --- a/values/staging/pyar-wiki.yaml +++ /dev/null @@ -1,54 +0,0 @@ -# Default values for asoc_members. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: pyar/wiki - tag: latest - pullPolicy: Always - imagePullPolicy: "Always" - -nameOverride: "" -fullnameOverride: "" - -service: - type: ClusterIP - port: 80 - -resources: - limits: - cpu: 50m - memory: 256Mi - requests: - cpu: 20m - memory: 128Mi - -ingress: - enabled: true - path: / - hosts: - - wiki.staging.python.org.ar - annotations: - kubernetes.io/ingress.class: nginx - cert-manager.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/rewrite-target: / - nginx.ingress.kubernetes.io/ssl-redirect: "true" - nginx.ingress.kubernetes.io/proxy-body-size: 25m - ingress.kubernetes.io/proxy-body-size: 25m - tls: - - secretName: tls-secret-staging-wiki - hosts: - - wiki.staging.python.org.ar - - -secretsName: wiki-staging - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -