remove es from platform helm dependencies; update crd (#39)

neuro-inc · Jun 16, 2020 · 59ee0bb · 59ee0bb
1 parent a9e9819
commit 59ee0bb
Show file tree

Hide file tree

Showing 25 changed files with 50 additions and 85 deletions.
diff --git a/Makefile b/Makefile
@@ -54,6 +54,7 @@ helm_push:
 ifeq ($(TAG),latest)
 	$(error Helm package tag is not specified)
 endif
+	rm -rf deploy/platform/charts
 	helm dependency update deploy/platform
 	helm package --app-version=$(TAG) --version=$(TAG) deploy/platform/
 	helm push-artifactory platform-$(TAG).tgz neuro-local-public

diff --git a/deploy/platform-operator/templates/crd.yaml b/deploy/platform-operator/templates/crd.yaml
@@ -79,6 +79,8 @@ spec:
           type: object
           required:
           - token
+          - storage
+          - monitoring
           properties:
             token:
               type: string
@@ -269,8 +271,38 @@ spec:
                       type: string
                     storageAccountKey:
                       type: string
+                kubernetes:
+                  type: object
+                  required:
+                  - persistence
+                  properties:
+                    persistence:
+                      type: object
+                      required:
+                      - storageClassName
+                      properties:
+                        storageClassName:
+                          type: string
+                        size:
+                          type: string
               oneOf:
               - properties:
                   azure: {}
                 required:
                 - azure
+              - properties:
+                  kubernetes: {}
+                required:
+                - kubernetes
+            monitoring:
+              type: object
+              required:
+              - logs
+              properties:
+                logs:
+                  type: object
+                  required:
+                  - bucket
+                  properties:
+                    bucket:
+                      type: string
diff --git a/deploy/platform/requirements.yaml b/deploy/platform/requirements.yaml
@@ -15,31 +15,6 @@ dependencies:
     - aws
     - azure
     - on_prem
-  - name: elasticsearch
-    version: "1.33.1"
-    repository: "@neuro"
-    tags:
-    - gcp
-    - aws
-    - azure
-    - on_prem
-  - name: elasticsearch-curator
-    version: "2.1.3"
-    repository: "@neuro"
-    tags:
-    - gcp
-    - aws
-    - azure
-    - on_prem
-  - name: fluent-bit
-    version: "2.8.14"
-    repository: "@stable"
-    alias: fluent-bit
-    tags:
-    - gcp
-    - aws
-    - azure
-    - on_prem
   - name: cluster-autoscaler
     version: "6.2.0"
     repository: "@stable"
@@ -59,7 +34,7 @@ dependencies:
     tags:
     - gcp
   - name: nvidia-gpu-driver
-    version: "1.0.0"
+    version: "1.0.1"
     repository: "@neuro"
     tags:
     - aws
@@ -70,6 +45,11 @@ dependencies:
     repository: "@stable"
     tags:
     - on_prem
+  - name: minio
+    version: "5.0.29"
+    repository: "@stable"
+    tags:
+    - on_prem
   - name: ssh-auth
     version: "1.0.6"
     repository: "@neuro"
@@ -97,7 +77,7 @@ dependencies:
     - azure
     - on_prem
   - name: platformmonitoringapi
-    version: "1.0.9"
+    version: "1.1.0"
     repository: "@neuro"
     alias: platform-monitoring
     tags:

diff --git a/deploy/platform/templates/_helpers.tpl b/deploy/platform/templates/_helpers.tpl
@@ -61,10 +61,4 @@ release: {{ .Release.Name | quote }}
     }
   }
 }
-{{- end -}}
-
-{{- define "platform.isSelfContained" -}}
-{{- if has true (values .Values.tags) -}}
-true
-{{- end -}}
 {{- end -}}
diff --git a/deploy/platform/templates/acme-ca-cert-daemon-set.yaml b/deploy/platform/templates/acme-ca-cert-daemon-set.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 {{- if (default false .Values.traefik.acme.staging) }}
 apiVersion: apps/v1
 kind: DaemonSet
@@ -45,5 +44,4 @@ spec:
       - name: certs
         hostPath:
           path: /etc/docker/certs.d
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/blob-storage-key-secret.yaml b/deploy/platform/templates/blob-storage-key-secret.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 {{- if not .Values.tags.on_prem }}
 apiVersion: v1
 kind: Secret
@@ -17,5 +16,4 @@ data:
   account_name: {{ .Values.blobStorage.azure.storageAccountName | b64enc | quote }}
   account_key: {{ .Values.blobStorage.azure.storageAccountKey | b64enc | quote }}
 {{- end }}
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/egress-to-ingress-network-policy.yaml b/deploy/platform/templates/egress-to-ingress-network-policy.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -15,5 +14,4 @@ spec:
     - namespaceSelector: {}
       podSelector:
         matchLabels:
-{{ toYaml .Values.traefik.deployment.podLabels | indent 10 }}
-{{- end }}
+{{ toYaml .Values.traefik.deployment.podLabels | indent 10 }}
diff --git a/deploy/platform/templates/egress-to-ssh-auth-network-policy.yaml b/deploy/platform/templates/egress-to-ssh-auth-network-policy.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -15,5 +14,4 @@ spec:
     - namespaceSelector: {}
       podSelector:
         matchLabels:
-          service: ssh-auth
-{{- end }}
+          service: ssh-auth
diff --git a/deploy/platform/templates/gcp-service-account-key-secret.yaml b/deploy/platform/templates/gcp-service-account-key-secret.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 {{- if .Values.tags.gcp }}
 apiVersion: v1
 kind: Secret
@@ -8,5 +7,4 @@ metadata:
 {{ include "platform.labels.standard" . | indent 4 }}
 data:
   key.json: {{ .Values.gcp.serviceAccountKeyBase64 | quote }}
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/idle-jobs-deployment.yaml b/deploy/platform/templates/idle-jobs-deployment.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 {{- $standardLabels := include "platform.labels.standard" . }}
 {{- $appName := include "platform.name" . }}
 {{- $releaseName := .Release.Name }}
@@ -100,5 +99,4 @@ spec:
             topologyKey: kubernetes.io/hostname
 ---
 {{- end }}
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/image-pull-secret.yaml b/deploy/platform/templates/image-pull-secret.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 {{- if .Values.imagePullSecret.create }}
 apiVersion: v1
 kind: Secret
@@ -15,5 +14,4 @@ data:
 {{- $credentials := .Values.imagePullSecret.credentials }}
 {{- $dockerConfigJson := include "platform.dockerConfigJson" $credentials }}
   .dockerconfigjson: {{ $dockerConfigJson | b64enc | quote }}
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/images-prepull-daemon-set.yaml b/deploy/platform/templates/images-prepull-daemon-set.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 {{- $imagesPrepull := .Values.kubernetes.imagesPrepull }}
 {{- if .Values.kubernetes.imagesPrepull }}
 {{- if gt (len .Values.kubernetes.imagesPrepull.images) 0 }}
@@ -55,5 +54,4 @@ spec:
       nodeSelector:
         {{ .Values.jobs.label }}: "true"
 {{- end }}
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/jobs-admin-role-binding.yaml b/deploy/platform/templates/jobs-admin-role-binding.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -16,5 +15,4 @@ subjects:
 roleRef:
   kind: ClusterRole
   name: admin
-  apiGroup: rbac.authorization.k8s.io
-{{- end }}
+  apiGroup: rbac.authorization.k8s.io
diff --git a/deploy/platform/templates/jobs-cluster-role-binding.yaml b/deploy/platform/templates/jobs-cluster-role-binding.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -15,5 +14,4 @@ subjects:
 roleRef:
   kind: ClusterRole
   name: {{ include "platform.jobs.serviceAccountName" . }}
-  apiGroup: rbac.authorization.k8s.io
-{{- end }}
+  apiGroup: rbac.authorization.k8s.io
diff --git a/deploy/platform/templates/jobs-cluster-role.yaml b/deploy/platform/templates/jobs-cluster-role.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -14,5 +13,4 @@ rules:
   - create
   - get
   - list
-  - watch
-{{- end }}
+  - watch
diff --git a/deploy/platform/templates/jobs-namespace.yaml b/deploy/platform/templates/jobs-namespace.yaml
@@ -1,10 +1,8 @@
-{{- if include "platform.isSelfContained" . }}
 {{- if .Values.jobs.namespace.create }}
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ include "platform.jobs.namespace.name" . }}
   labels:
 {{ include "platform.labels.standard" . | indent 4 }}
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/jobs-pv.yaml b/deploy/platform/templates/jobs-pv.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -32,5 +31,4 @@ spec:
       bucket: {{ .Values.storage.gcs.bucketName }}
       key_file: /accounts/key.json
       additional_args: --limit-ops-per-sec 0
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/jobs-pvc.yaml b/deploy/platform/templates/jobs-pvc.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -14,5 +13,4 @@ spec:
     requests:
       storage: {{ .Values.storage.size }}
   storageClassName: ""
-  volumeName: {{ include "platform.storage.jobsPvName" . }}
-{{- end }}
+  volumeName: {{ include "platform.storage.jobsPvName" . }}
diff --git a/deploy/platform/templates/jobs-service-account.yaml b/deploy/platform/templates/jobs-service-account.yaml
@@ -1,10 +1,8 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "platform.jobs.serviceAccountName" . }}
   namespace: {{ include "platform.jobs.namespace.name" . }}
   labels:
 {{ include "platform.labels.standard" . | indent 4 }}
-automountServiceAccountToken: false
-{{- end }}
+automountServiceAccountToken: false
diff --git a/deploy/platform/templates/platform-pv.yaml b/deploy/platform/templates/platform-pv.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -31,5 +30,4 @@ spec:
       bucket: {{ .Values.storage.gcs.bucketName }}
       key_file: /accounts/key.json
       additional_args: --limit-ops-per-sec 0
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/platform-pvc.yaml b/deploy/platform/templates/platform-pvc.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -13,5 +12,4 @@ spec:
     requests:
       storage: {{ .Values.storage.size }}
   storageClassName: ""
-  volumeName: {{ include "platform.storage.platformPvName" . }}
-{{- end }}
+  volumeName: {{ include "platform.storage.platformPvName" . }}
diff --git a/deploy/platform/templates/platform-registry-secret.yaml b/deploy/platform/templates/platform-registry-secret.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -12,5 +11,4 @@ data:
 {{- else }}
   username: {{ .Values.registry.username | b64enc | quote }}
   password: {{ .Values.registry.password | b64enc | quote }}
-{{- end }}
 {{- end }}
diff --git a/deploy/platform/templates/platform-services-secret.yaml b/deploy/platform/templates/platform-services-secret.yaml
@@ -1,4 +1,3 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,5 +8,4 @@ data:
   compute_token: {{ .Values.serviceToken | b64enc | quote }}
   registry_token: {{ .Values.serviceToken | b64enc | quote }}
   storage_token: {{ .Values.serviceToken | b64enc | quote }}
-  cluster_token: {{ .Values.serviceToken | b64enc | quote }}
-{{- end }}
+  cluster_token: {{ .Values.serviceToken | b64enc | quote }}
diff --git a/deploy/platform/templates/resolve-dns-challenge-config-map.yaml b/deploy/platform/templates/resolve-dns-challenge-config-map.yaml
@@ -1,10 +1,8 @@
-{{- if include "platform.isSelfContained" . }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-resolve-dns-challenge-script
   labels:
 {{ include "platform.labels.standard" . | indent 4 }}
 data:
-{{ (.Files.Glob "files/resolve_dns_challenge.sh").AsConfig | indent 2 }}
-{{- end }}
+{{ (.Files.Glob "files/resolve_dns_challenge.sh").AsConfig | indent 2 }}