From 7f085cf9ab03f7949b74155ce20fc830a422ffa2 Mon Sep 17 00:00:00 2001
From: Max Resnick <max@ofmax.li>
Date: Tue, 15 Sep 2020 22:03:36 -0700
Subject: house keeping

---
 grumpy/gitolite/templates/gitolite-deployment.yaml | 9 +++------
 grumpy/gitolite/templates/gitolite-svc.yaml        | 9 ---------
 2 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'grumpy/gitolite/templates')

diff --git a/grumpy/gitolite/templates/gitolite-deployment.yaml b/grumpy/gitolite/templates/gitolite-deployment.yaml
index 39717b9..1632b93 100644
--- a/grumpy/gitolite/templates/gitolite-deployment.yaml
+++ b/grumpy/gitolite/templates/gitolite-deployment.yaml
@@ -38,12 +38,9 @@ spec:
       containers:
         - name: {{ template "gitolite.fullname" . }}
           image: "{{ .Values.Image }}:{{ .Values.ImageTag }}"
-          #command:
-          #  - tail
-          #  - -f
-          #  - /dev/null
-
           imagePullPolicy: "{{ .Values.ImagePullPolicy }}"
+          args:
+            - sshd
           env:
             - name: SSH_KEY
               value: "{{ default "" .Values.SSH_KEY}}"
@@ -72,7 +69,7 @@ spec:
               readOnly: false
       initContainers:
         - name: setup
-          image: busybox
+          image: "{{ .Values.Image }}:{{ .Values.ImageTag }}" 
           command:
             - "chmod"
             - "755"
diff --git a/grumpy/gitolite/templates/gitolite-svc.yaml b/grumpy/gitolite/templates/gitolite-svc.yaml
index eec57da..e181a57 100644
--- a/grumpy/gitolite/templates/gitolite-svc.yaml
+++ b/grumpy/gitolite/templates/gitolite-svc.yaml
@@ -17,15 +17,6 @@ spec:
     - port: {{.Values.ServicePort}}
       name: http
       targetPort: {{.Values.ContainerPort}}
-      {{if (and (eq .Values.ServiceType "NodePort") (not (empty .Values.NodePort)))}}
-      nodePort: {{.Values.NodePort}}
-      {{end}}
   selector:
     component: "{{.Release.Name}}-{{.Values.Component}}"
   type: {{.Values.ServiceType}}
-  {{if eq .Values.ServiceType "LoadBalancer"}}
-  loadBalancerSourceRanges: {{.Values.LoadBalancerSourceRanges}}
-  {{if .Values.LoadBalancerIP}}
-  loadBalancerIP: {{.Values.LoadBalancerIP}}
-  {{end}}
-  {{end}}
-- 
cgit v1.2.3