From 6b52a69f23d8de1aa5944ded418c0fafa8dddcfc Mon Sep 17 00:00:00 2001 From: D4rk4 Date: Sat, 1 Aug 2020 22:20:09 +0200 Subject: [PATCH] Werf is still laggy for deploy 3-party charts, skip it --- contrib/firstboot.sh | 4 + contrib/mood.it | Bin 61235 -> 0 bytes .../docker-registry/.helm/templates/NOTES.txt | 19 -- .../.helm/templates/_helpers.tpl | 24 -- .../.helm/templates/configmap.yaml | 12 - .../.helm/templates/deployment.yaml | 221 ------------------ .../.helm/templates/ingress.yaml | 36 --- .../.helm/templates/poddisruptionbudget.yaml | 17 -- .../docker-registry/.helm/templates/pvc.yaml | 26 --- .../.helm/templates/secret.yaml | 37 --- .../.helm/templates/service.yaml | 29 --- .../werf/docker-registry/.helm/values.yaml | 47 ---- contrib/werf/docker-registry/werf.yaml | 2 - 13 files changed, 4 insertions(+), 470 deletions(-) delete mode 100644 contrib/mood.it delete mode 100755 contrib/werf/docker-registry/.helm/templates/NOTES.txt delete mode 100755 contrib/werf/docker-registry/.helm/templates/_helpers.tpl delete mode 100755 contrib/werf/docker-registry/.helm/templates/configmap.yaml delete mode 100755 contrib/werf/docker-registry/.helm/templates/deployment.yaml delete mode 100755 contrib/werf/docker-registry/.helm/templates/ingress.yaml delete mode 100755 contrib/werf/docker-registry/.helm/templates/poddisruptionbudget.yaml delete mode 100755 contrib/werf/docker-registry/.helm/templates/pvc.yaml delete mode 100755 contrib/werf/docker-registry/.helm/templates/secret.yaml delete mode 100755 contrib/werf/docker-registry/.helm/templates/service.yaml delete mode 100755 contrib/werf/docker-registry/.helm/values.yaml delete mode 100644 contrib/werf/docker-registry/werf.yaml diff --git a/contrib/firstboot.sh b/contrib/firstboot.sh index 4e31771..31d69d9 100755 --- a/contrib/firstboot.sh +++ b/contrib/firstboot.sh @@ -30,6 +30,10 @@ InstallCSI () { } InstallRegistry () { helm repo add stable https://kubernetes-charts.storage.googleapis.com/ + helm install registry stable/docker-registry \ + --set ingress.enabled=true \ + --set ingress.hosts[0]="registry.k8s-demo.vm" + echo '100.100.100.15 registry.k8s-demo.vm' >> /etc/hosts } InstallPGSQL () { helm repo add bitnami https://charts.bitnami.com/bitnami diff --git a/contrib/mood.it b/contrib/mood.it deleted file mode 100644 index 3404f51d6322041d4b8b39199809ebc21b2ebe65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61235 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 diff --git a/contrib/werf/docker-registry/.helm/templates/NOTES.txt b/contrib/werf/docker-registry/.helm/templates/NOTES.txt deleted file mode 100755 index 4a9152b..0000000 --- a/contrib/werf/docker-registry/.helm/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 "docker-registry.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 "docker-registry.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "docker-registry.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.externalPort }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "docker-registry.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl -n {{ .Release.Namespace }} port-forward $POD_NAME 8080:5000 -{{- end }} diff --git a/contrib/werf/docker-registry/.helm/templates/_helpers.tpl b/contrib/werf/docker-registry/.helm/templates/_helpers.tpl deleted file mode 100755 index a91077e..0000000 --- a/contrib/werf/docker-registry/.helm/templates/_helpers.tpl +++ /dev/null @@ -1,24 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "docker-registry.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). -*/}} -{{- define "docker-registry.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 -}} diff --git a/contrib/werf/docker-registry/.helm/templates/configmap.yaml b/contrib/werf/docker-registry/.helm/templates/configmap.yaml deleted file mode 100755 index 820bb4f..0000000 --- a/contrib/werf/docker-registry/.helm/templates/configmap.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "docker-registry.fullname" . }}-config - labels: - app: {{ template "docker-registry.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} -data: - config.yml: |- -{{ toYaml .Values.configData | indent 4 }} diff --git a/contrib/werf/docker-registry/.helm/templates/deployment.yaml b/contrib/werf/docker-registry/.helm/templates/deployment.yaml deleted file mode 100755 index a146d76..0000000 --- a/contrib/werf/docker-registry/.helm/templates/deployment.yaml +++ /dev/null @@ -1,221 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "docker-registry.fullname" . }} - labels: - app: {{ template "docker-registry.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - selector: - matchLabels: - app: {{ template "docker-registry.name" . }} - release: {{ .Release.Name }} - replicas: {{ .Values.replicaCount }} -{{- if .Values.updateStrategy }} - strategy: -{{ toYaml .Values.updateStrategy | indent 4 }} -{{- end }} - minReadySeconds: 5 - template: - metadata: - labels: - app: {{ template "docker-registry.name" . }} - release: {{ .Release.Name }} - {{- if .Values.podLabels }} -{{ toYaml .Values.podLabels | indent 8 }} - {{- end }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} -{{- if $.Values.podAnnotations }} -{{ toYaml $.Values.podAnnotations | indent 8 }} -{{- end }} - spec: - {{- if .Values.imagePullSecrets }} - imagePullSecrets: -{{ toYaml .Values.imagePullSecrets | indent 8 }} - {{- end }} -{{- if .Values.priorityClassName }} - priorityClassName: "{{ .Values.priorityClassName }}" -{{- end }} -{{- if .Values.securityContext.enabled }} - securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} - runAsUser: {{ .Values.securityContext.runAsUser }} -{{- end }} - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - command: - - /bin/registry - - serve - - /etc/docker/registry/config.yml - ports: - - containerPort: 5000 - livenessProbe: - httpGet: -{{- if .Values.tlsSecretName }} - scheme: HTTPS -{{- end }} - path: / - port: 5000 - readinessProbe: - httpGet: -{{- if .Values.tlsSecretName }} - scheme: HTTPS -{{- end }} - path: / - port: 5000 - resources: -{{ toYaml .Values.resources | indent 12 }} - env: -{{- if .Values.secrets.htpasswd }} - - name: REGISTRY_AUTH - value: "htpasswd" - - name: REGISTRY_AUTH_HTPASSWD_REALM - value: "Registry Realm" - - name: REGISTRY_AUTH_HTPASSWD_PATH - value: "/auth/htpasswd" -{{- end }} - - name: REGISTRY_HTTP_SECRET - valueFrom: - secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret - key: haSharedSecret -{{- if .Values.tlsSecretName }} - - name: REGISTRY_HTTP_TLS_CERTIFICATE - value: /etc/ssl/docker/tls.crt - - name: REGISTRY_HTTP_TLS_KEY - value: /etc/ssl/docker/tls.key -{{- end }} -{{- if eq .Values.storage "filesystem" }} - - name: REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY - value: "/var/lib/registry" -{{- else if eq .Values.storage "azure" }} - - name: REGISTRY_STORAGE_AZURE_ACCOUNTNAME - valueFrom: - secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret - key: azureAccountName - - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY - valueFrom: - secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret - key: azureAccountKey - - name: REGISTRY_STORAGE_AZURE_CONTAINER - valueFrom: - secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret - key: azureContainer -{{- else if eq .Values.storage "s3" }} - {{- if and .Values.secrets.s3.secretKey .Values.secrets.s3.accessKey }} - - name: REGISTRY_STORAGE_S3_ACCESSKEY - valueFrom: - secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret - key: s3AccessKey - - name: REGISTRY_STORAGE_S3_SECRETKEY - valueFrom: - secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret - key: s3SecretKey - {{- end }} - - name: REGISTRY_STORAGE_S3_REGION - value: {{ required ".Values.s3.region is required" .Values.s3.region }} - {{- if .Values.s3.regionEndpoint }} - - name: REGISTRY_STORAGE_S3_REGIONENDPOINT - value: {{ .Values.s3.regionEndpoint }} - {{- end }} - - name: REGISTRY_STORAGE_S3_BUCKET - value: {{ required ".Values.s3.bucket is required" .Values.s3.bucket }} - {{- if .Values.s3.encrypt }} - - name: REGISTRY_STORAGE_S3_ENCRYPT - value: {{ .Values.s3.encrypt | quote }} - {{- end }} - {{- if .Values.s3.secure }} - - name: REGISTRY_STORAGE_S3_SECURE - value: {{ .Values.s3.secure | quote }} - {{- end }} -{{- else if eq .Values.storage "swift" }} - - name: REGISTRY_STORAGE_SWIFT_AUTHURL - value: {{ required ".Values.swift.authurl is required" .Values.swift.authurl }} - - name: REGISTRY_STORAGE_SWIFT_USERNAME - valueFrom: - secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret - key: swiftUsername - - name: REGISTRY_STORAGE_SWIFT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret - key: swiftPassword - - name: REGISTRY_STORAGE_SWIFT_CONTAINER - value: {{ required ".Values.swift.container is required" .Values.swift.container }} -{{- end }} -{{- if .Values.persistence.deleteEnabled }} - - name: REGISTRY_STORAGE_DELETE_ENABLED - value: "true" -{{- end }} - volumeMounts: -{{- if .Values.secrets.htpasswd }} - - name: auth - mountPath: /auth - readOnly: true -{{- end }} -{{- if eq .Values.storage "filesystem" }} - - name: data - mountPath: /var/lib/registry/ -{{- end }} - - name: "{{ template "docker-registry.fullname" . }}-config" - mountPath: "/etc/docker/registry" -{{- if .Values.tlsSecretName }} - - mountPath: /etc/ssl/docker - name: tls-cert - readOnly: true -{{- end }} -{{- with .Values.extraVolumeMounts }} - {{- toYaml . | nindent 12 }} -{{- end }} -{{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} -{{- end }} -{{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 8 }} -{{- end }} -{{- if .Values.tolerations }} - tolerations: -{{ toYaml .Values.tolerations | indent 8 }} -{{- end }} - volumes: -{{- if .Values.secrets.htpasswd }} - - name: auth - secret: - secretName: {{ template "docker-registry.fullname" . }}-secret - items: - - key: htpasswd - path: htpasswd -{{- end }} -{{- if eq .Values.storage "filesystem" }} - - name: data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "docker-registry.fullname" . }}{{- end }} - {{- else }} - emptyDir: {} - {{- end -}} -{{- end }} - - name: {{ template "docker-registry.fullname" . }}-config - configMap: - name: {{ template "docker-registry.fullname" . }}-config -{{- if .Values.tlsSecretName }} - - name: tls-cert - secret: - secretName: {{ .Values.tlsSecretName }} -{{- end }} -{{- with .Values.extraVolumes }} - {{- toYaml . | nindent 8 }} -{{- end }} diff --git a/contrib/werf/docker-registry/.helm/templates/ingress.yaml b/contrib/werf/docker-registry/.helm/templates/ingress.yaml deleted file mode 100755 index 58ab5fa..0000000 --- a/contrib/werf/docker-registry/.helm/templates/ingress.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $serviceName := include "docker-registry.fullname" . -}} -{{- $servicePort := .Values.service.port -}} -{{- $path := .Values.ingress.path -}} -apiVersion: {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} networking.k8s.io/v1beta1 {{- else }} extensions/v1beta1 {{- end }} -kind: Ingress -metadata: - name: {{ template "docker-registry.fullname" . }} - labels: - app: {{ template "docker-registry.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -{{- if .Values.ingress.labels }} -{{ toYaml .Values.ingress.labels | indent 4 }} -{{- end }} - annotations: - {{- range $key, $value := .Values.ingress.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} -spec: - rules: - {{- range $host := .Values.ingress.hosts }} - - host: {{ $host }} - http: - paths: - - path: {{ $path }} - backend: - serviceName: {{ $serviceName }} - servicePort: {{ $servicePort }} - {{- end -}} - {{- if .Values.ingress.tls }} - tls: -{{ toYaml .Values.ingress.tls | indent 4 }} - {{- end -}} -{{- end -}} diff --git a/contrib/werf/docker-registry/.helm/templates/poddisruptionbudget.yaml b/contrib/werf/docker-registry/.helm/templates/poddisruptionbudget.yaml deleted file mode 100755 index 38eb384..0000000 --- a/contrib/werf/docker-registry/.helm/templates/poddisruptionbudget.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.podDisruptionBudget -}} -apiVersion: policy/v1beta1 -kind: PodDisruptionBudget -metadata: - name: {{ template "docker-registry.fullname" . }} - labels: - app: {{ template "docker-registry.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - selector: - matchLabels: - app: {{ template "docker-registry.name" . }} - release: {{ .Release.Name }} -{{ toYaml .Values.podDisruptionBudget | indent 2 }} -{{- end -}} diff --git a/contrib/werf/docker-registry/.helm/templates/pvc.yaml b/contrib/werf/docker-registry/.helm/templates/pvc.yaml deleted file mode 100755 index 1619617..0000000 --- a/contrib/werf/docker-registry/.helm/templates/pvc.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if .Values.persistence.enabled }} -{{- if not .Values.persistence.existingClaim -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "docker-registry.fullname" . }} - labels: - app: {{ template "docker-registry.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} -{{- if .Values.persistence.storageClass }} -{{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" -{{- end }} -{{- end }} -{{- end }} -{{- end -}} diff --git a/contrib/werf/docker-registry/.helm/templates/secret.yaml b/contrib/werf/docker-registry/.helm/templates/secret.yaml deleted file mode 100755 index c22fd30..0000000 --- a/contrib/werf/docker-registry/.helm/templates/secret.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "docker-registry.fullname" . }}-secret - labels: - app: {{ template "docker-registry.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} -type: Opaque -data: - {{- if .Values.secrets.htpasswd }} - htpasswd: {{ .Values.secrets.htpasswd | b64enc }} - {{- end }} - {{- if .Values.secrets.haSharedSecret }} - haSharedSecret: {{ .Values.secrets.haSharedSecret | b64enc | quote }} - {{- else }} - haSharedSecret: {{ randAlphaNum 16 | b64enc | quote }} - {{- end }} - - {{- if eq .Values.storage "azure" }} - {{- if and .Values.secrets.azure.accountName .Values.secrets.azure.accountKey .Values.secrets.azure.container }} - azureAccountName: {{ .Values.secrets.azure.accountName | b64enc | quote }} - azureAccountKey: {{ .Values.secrets.azure.accountKey | b64enc | quote }} - azureContainer: {{ .Values.secrets.azure.container | b64enc | quote }} - {{- end }} - {{- else if eq .Values.storage "s3" }} - {{- if and .Values.secrets.s3.secretKey .Values.secrets.s3.accessKey }} - s3AccessKey: {{ .Values.secrets.s3.accessKey | b64enc | quote }} - s3SecretKey: {{ .Values.secrets.s3.secretKey | b64enc | quote }} - {{- end }} - {{- else if eq .Values.storage "swift" }} - {{- if and .Values.secrets.swift.username .Values.secrets.swift.password }} - swiftUsername: {{ .Values.secrets.swift.username | b64enc | quote }} - swiftPassword: {{ .Values.secrets.swift.password | b64enc | quote }} - {{- end }} - {{- end }} diff --git a/contrib/werf/docker-registry/.helm/templates/service.yaml b/contrib/werf/docker-registry/.helm/templates/service.yaml deleted file mode 100755 index 1414020..0000000 --- a/contrib/werf/docker-registry/.helm/templates/service.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "docker-registry.fullname" . }} - labels: - app: {{ template "docker-registry.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -{{- if .Values.service.annotations }} - annotations: -{{ toYaml .Values.service.annotations | indent 4 }} -{{- end }} -spec: - type: {{ .Values.service.type }} -{{- if (and (eq .Values.service.type "ClusterIP") (not (empty .Values.service.clusterIP))) }} - clusterIP: {{ .Values.service.clusterIP }} -{{- end }} - ports: - - port: {{ .Values.service.port }} - protocol: TCP - name: {{ .Values.service.name }} - targetPort: 5000 -{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }} - nodePort: {{ .Values.service.nodePort }} -{{- end }} - selector: - app: {{ template "docker-registry.name" . }} - release: {{ .Release.Name }} diff --git a/contrib/werf/docker-registry/.helm/values.yaml b/contrib/werf/docker-registry/.helm/values.yaml deleted file mode 100755 index 4354503..0000000 --- a/contrib/werf/docker-registry/.helm/values.yaml +++ /dev/null @@ -1,47 +0,0 @@ -replicaCount: 1 - -image: - repository: registry - tag: 2.7.1 - pullPolicy: IfNotPresent -service: - name: registry - type: ClusterIP - port: 5000 -ingress: - enabled: "true" - hosts: - - registry.k8s-demo.vm - annotations: - kubernetes.io/ingress.class: nginx - -persistence: - accessMode: 'ReadWriteOnce' - enabled: false - size: 10Gi - -configData: - version: 0.1 - log: - fields: - service: registry - storage: - cache: - blobdescriptor: inmemory - http: - addr: :5000 - headers: - X-Content-Type-Options: [nosniff] - health: - storagedriver: - enabled: true - interval: 10s - threshold: 3 - -securityContext: - enabled: true - runAsUser: 1000 - fsGroup: 1000 - -priorityClassName: "" - diff --git a/contrib/werf/docker-registry/werf.yaml b/contrib/werf/docker-registry/werf.yaml deleted file mode 100644 index 7c594c0..0000000 --- a/contrib/werf/docker-registry/werf.yaml +++ /dev/null @@ -1,2 +0,0 @@ -project: docker-registry -configVersion: 1