DodoApp: Support dev virtual machines
Change-Id: Ib7641adb5be477bdde7cd9a06df4b45aa65a1c01
diff --git a/charts/soft-serve/templates/ingress.yaml b/charts/soft-serve/templates/ingress.yaml
deleted file mode 100644
index 490a5b3..0000000
--- a/charts/soft-serve/templates/ingress.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-{{ if .Values.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: ingress
- namespace: {{ .Release.Namespace }}
- {{- if .Values.ingress.certificateIssuer }}
- annotations:
- acme.cert-manager.io/http01-edit-in-place: "true"
- cert-manager.io/cluster-issuer: {{ .Values.ingress.certificateIssuer }}
- {{- end }}
-spec:
- ingressClassName: {{ .Values.ingress.ingressClassName }}
- {{- if .Values.ingress.certificateIssuer }}
- tls:
- - hosts:
- - {{ .Values.ingress.domain }}
- secretName: cert-soft-serve
- {{- end }}
- rules:
- - host: {{ .Values.ingress.domain }}
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: soft-serve
- port:
- name: http
-{{ end }}
diff --git a/charts/soft-serve/templates/service-transport.yaml b/charts/soft-serve/templates/service-transport.yaml
deleted file mode 100644
index 969fbbe..0000000
--- a/charts/soft-serve/templates/service-transport.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ if .Values.ingress.enabled }}
-apiVersion: transport.dodo.cloud/v1
-kind: ServiceTransport
-metadata:
- name: ingress-transport
- namespace: {{ .Release.Namespace }}
-spec:
- port: {{ .Values.port }}
- sourcePort: {{ .Values.ingress.sourcePort }}
- protocol: TCP
- service: soft-serve
- ingressClassName: {{ .Values.ingress.ingressClassName }}
-{{ end }}
diff --git a/charts/soft-serve/templates/stateful-set.yaml b/charts/soft-serve/templates/stateful-set.yaml
index e5b32eb..5cf32c6 100644
--- a/charts/soft-serve/templates/stateful-set.yaml
+++ b/charts/soft-serve/templates/stateful-set.yaml
@@ -17,7 +17,7 @@
volumes:
- name: data
persistentVolumeClaim:
- claimName: soft-serve
+ claimName: {{ .Values.persistentVolumeClaimName }}
{{ if and .Values.privateKey .Values.publicKey }}
- name: keys
configMap:
@@ -31,7 +31,7 @@
- name: SOFT_SERVE_SSH_LISTEN_ADDR
value: ":{{ .Values.port }}"
- name: SOFT_SERVE_SSH_PUBLIC_URL
- value: "ssh://{{ .Values.ingress.domain }}:{{ .Values.sshPublicPort }}"
+ value: "ssh://{{ .Values.host }}:{{ .Values.sshPublicPort }}"
- name: SOFT_SERVE_INITIAL_ADMIN_KEYS
value: |-
{{ indent 12 .Values.adminKey }}
@@ -44,11 +44,7 @@
- name: SOFT_SERVE_HTTP_LISTEN_ADDR
value: ":80"
- name: SOFT_SERVE_HTTP_PUBLIC_URL
- value: "http://{{ .Values.ingress.domain }}"
- - name: SOFT_SERVE_ALLOW_KEYLESS
- value: "{{ .Values.allowKeyless }}"
- - name: SOFT_SERVE_ANON_ACCESS
- value: "{{ .Values.anonAccess }}"
+ value: "http://{{ .Values.host }}"
ports:
- name: ssh
containerPort: {{ .Values.port }}
diff --git a/charts/soft-serve/templates/volume.yaml b/charts/soft-serve/templates/volume.yaml
deleted file mode 100644
index f5d0bfc..0000000
--- a/charts/soft-serve/templates/volume.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: soft-serve
- namespace: {{ .Release.Namespace }}
-spec:
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: {{ .Values.storage.size }}
diff --git a/charts/soft-serve/values.yaml b/charts/soft-serve/values.yaml
index cd042fc..5538d5c 100644
--- a/charts/soft-serve/values.yaml
+++ b/charts/soft-serve/values.yaml
@@ -2,8 +2,8 @@
repository: charmcli/soft-serve
tag: latest
pullPolicy: IfNotPresent
-storage:
- size: 1Gi
+persistentVolumeClaimName: ""
+host: ""
port: 22
sshPublicPort: 22
privateKey: ""
@@ -12,11 +12,3 @@
serviceType: LoadBalancer
reservedIP: ""
addressPool: ""
-ingress:
- enabled: false
- domain: git.p.example.com
- ingressClassName: example-ingress-private
- certificateIssuer: ""
- sourcePort: 0
-allowKeyless: false
-anonAccess: "no-access"