Skip to content

Instantly share code, notes, and snippets.

@kingdonb
Created August 29, 2017 00:10
Show Gist options
  • Save kingdonb/845945908336cbeefb3e8cce73ec5dc2 to your computer and use it in GitHub Desktop.
Save kingdonb/845945908336cbeefb3e8cce73ec5dc2 to your computer and use it in GitHub Desktop.
Minio off-cluster (Deis Workflow)
diff --git a/charts/builder/templates/builder-deployment.yaml b/charts/builder/templates/builder-deployment.yaml
index d5ea4a0..35ab6bb 100755
--- a/charts/builder/templates/builder-deployment.yaml
+++ b/charts/builder/templates/builder-deployment.yaml
@@ -42,6 +42,10 @@ spec:
{{- end}}
{{- end}}
env:
+ - name: DEIS_MINIO_SERVICE_HOST
+ value: "172.17.12.108"
+ - name: DEIS_MINIO_SERVICE_PORT
+ value: "9000"
# NOTE(bacongobbler): use deis/registry_proxy to work around Docker --insecure-registry requirements
- name: "DEIS_REGISTRY_SERVICE_HOST"
value: "127.0.0.1"
diff --git a/charts/controller/templates/controller-deployment.yaml b/charts/controller/templates/controller-deployment.yaml
index 82732ed..31ebabb 100755
--- a/charts/controller/templates/controller-deployment.yaml
+++ b/charts/controller/templates/controller-deployment.yaml
@@ -53,6 +53,10 @@ spec:
{{- end }}
{{- end }}
env:
+ - name: DEIS_MINIO_SERVICE_HOST
+ value: "172.17.12.108"
+ - name: DEIS_MINIO_SERVICE_PORT
+ value: "9000"
- name: REGISTRATION_MODE
value: {{ .Values.registration_mode }}
# NOTE(bacongobbler): use deis/registry_proxy to work around Docker --insecure-registry requirements
diff --git a/charts/database/templates/database-deployment.yaml b/charts/database/templates/database-deployment.yaml
index e588c09..33e5e22 100755
--- a/charts/database/templates/database-deployment.yaml
+++ b/charts/database/templates/database-deployment.yaml
@@ -37,6 +37,10 @@ spec:
{{- end}}
{{- end}}
env:
+ - name: DEIS_MINIO_SERVICE_HOST
+ value: "172.17.12.108"
+ - name: DEIS_MINIO_SERVICE_PORT
+ value: "9000"
- name: DATABASE_STORAGE
value: "{{.Values.global.storage}}"
- name: PGCTLTIMEOUT
diff --git a/charts/minio/Chart.yaml b/charts/minio/Chart.yaml
deleted file mode 100755
index 5cadb75..0000000
--- a/charts/minio/Chart.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-description: Minio Object Storage in Kubernetes, used by Deis Workflow.
-home: https://github.com/deis/minio
-maintainers:
-- email: engineering@deis.com
- name: Deis Team
-name: minio
-version: v2.3.6
diff --git a/charts/minio/templates/minio-deployment.yaml b/charts/minio/templates/minio-deployment.yaml
deleted file mode 100755
index 7db852c..0000000
--- a/charts/minio/templates/minio-deployment.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-{{- if eq .Values.global.storage "minio" }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
- name: deis-minio
- labels:
- heritage: deis
- annotations:
- component.deis.io/version: {{ .Values.docker_tag }}
-spec:
- replicas: 1
- strategy:
- type: Recreate
- selector:
- matchLabels:
- app: deis-minio
- template:
- metadata:
- labels:
- app: deis-minio
- spec:
- serviceAccount: deis-minio
- containers:
- - name: deis-minio
- image: quay.io/{{.Values.org}}/minio:{{.Values.docker_tag}}
- imagePullPolicy: {{.Values.pull_policy}}
- env:
- - name: HEALTH_SERVER_PORT
- value: "8082"
- ports:
- - containerPort: 9000
- - containerPort: 8082
- livenessProbe:
- httpGet:
- path: /healthz
- port: 8082
- initialDelaySeconds: 30
- timeoutSeconds: 1
- readinessProbe:
- httpGet:
- path: /healthz
- port: 8082
- initialDelaySeconds: 30
- timeoutSeconds: 1
- command:
- - boot
- args:
- - "server /home/minio/"
- volumeMounts:
- - name: minio-user
- mountPath: /var/run/secrets/deis/minio/user
- readOnly: true
- volumes:
- - name: minio-user
- secret:
- secretName: minio-user
-{{- end }}
diff --git a/charts/minio/templates/minio-service-account.yaml b/charts/minio/templates/minio-service-account.yaml
deleted file mode 100755
index 2724940..0000000
--- a/charts/minio/templates/minio-service-account.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-{{- if eq .Values.global.storage "minio" }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: deis-minio
- labels:
- heritage: deis
-{{- end }}
diff --git a/charts/minio/templates/minio-service.yaml b/charts/minio/templates/minio-service.yaml
deleted file mode 100755
index d5494c7..0000000
--- a/charts/minio/templates/minio-service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- if eq .Values.global.storage "minio" }}
-apiVersion: v1
-kind: Service
-metadata:
- name: deis-minio
- labels:
- heritage: deis
-spec:
- ports:
- - name: s3
- port: 9000
- selector:
- app: deis-minio
-{{- end }}
diff --git a/charts/minio/templates/minio-user-secret.yaml b/charts/minio/templates/minio-user-secret.yaml
deleted file mode 100755
index e0b7dcd..0000000
--- a/charts/minio/templates/minio-user-secret.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: minio-user
- labels:
- heritage: deis
-type: Opaque
-data:
- accesskey: ORIGINAL_AKIA_REDACTED=
- secretkey: ORIGINAL_SECRET_KEY_BASE64_REDACTED==
diff --git a/charts/minio/values.yaml b/charts/minio/values.yaml
deleted file mode 100755
index e4f2ce1..0000000
--- a/charts/minio/values.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-org: "deis"
-pull_policy: "IfNotPresent"
-docker_tag: v2.3.6
-global:
- storage: minio
diff --git a/charts/registry/templates/registry-deployment.yaml b/charts/registry/templates/registry-deployment.yaml
index 2b53d6a..2f5036d 100755
--- a/charts/registry/templates/registry-deployment.yaml
+++ b/charts/registry/templates/registry-deployment.yaml
@@ -50,6 +50,10 @@ spec:
initialDelaySeconds: 1
timeoutSeconds: 1
env:
+ - name: DEIS_MINIO_SERVICE_HOST
+ value: "172.17.12.108"
+ - name: DEIS_MINIO_SERVICE_PORT
+ value: "9000"
- name: REGISTRY_STORAGE_DELETE_ENABLED
value: "true"
- name: REGISTRY_LOG_LEVEL
diff --git a/requirements.lock b/requirements.lock
index b8457c8..e7d408e 100755
--- a/requirements.lock
+++ b/requirements.lock
@@ -62,13 +62,6 @@ dependencies:
repository: https://charts.deis.com/logger
tags: null
version: v2.4.4
-- condition: ""
- enabled: false
- import-values: null
- name: minio
- repository: https://charts.deis.com/minio
- tags: null
- version: v2.3.6
- condition: ""
enabled: false
import-values: null
diff --git a/requirements.yaml b/requirements.yaml
index 99d52d0..6de1d02 100755
--- a/requirements.yaml
+++ b/requirements.yaml
@@ -26,9 +26,6 @@ dependencies:
- name: logger
version: "v2.4.4"
repository: https://charts.deis.com/logger
- - name: minio
- version: "v2.3.6"
- repository: https://charts.deis.com/minio
- name: monitor
version: "v2.10.1"
repository: https://charts.deis.com/monitor
diff --git a/templates/objectstorage-secret.yaml b/templates/objectstorage-secret.yaml
index ddaa86a..ba51ac0 100755
--- a/templates/objectstorage-secret.yaml
+++ b/templates/objectstorage-secret.yaml
@@ -31,5 +31,5 @@ data: {{ if eq .Values.global.storage "gcs"}}
builder-container: {{ .Values.swift.builder_container | b64enc }}
database-container: {{ .Values.swift.database_container | b64enc }}
registry-container: {{ .Values.swift.registry_container | b64enc }}{{else if eq .Values.global.storage "minio"}}
- accesskey: ORIGINAL_AKIA_REDACTED=
- secretkey: ORIGINAL_SECRETKEY_BASE64_REDACTED=={{ end }}
+ accesskey: MY_AKIA_REDACTED=
+ secretkey: MY_SECRETKEY_BASE64_REDACTED=={{ end }}
diff --git a/values.yaml b/values.yaml
index 90b7621..ee58b10 100755
--- a/values.yaml
+++ b/values.yaml
@@ -9,6 +9,7 @@ global:
# - gcs: Store persistent data in Google Cloud Storage
# - minio: Store persistent data on in-cluster Minio server
storage: minio
+ off_cluster_minio: true
# Set the location of Workflow's PostgreSQL database
#
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment