diff options
Diffstat (limited to '')
| -rw-r--r-- | grumpy/cgit/values.yaml | 2 | ||||
| -rw-r--r-- | grumpy/gitolite/templates/gitolite-deployment.yaml | 9 | ||||
| -rw-r--r-- | grumpy/gitolite/templates/gitolite-svc.yaml | 9 | ||||
| -rw-r--r-- | grumpy/gitolite/values.yaml | 8 | ||||
| -rw-r--r-- | grumpy/gitsnapshot/values.yaml | 2 | ||||
| -rw-r--r-- | grumpy/sally/deploy.yaml | 2 |
6 files changed, 10 insertions, 22 deletions
diff --git a/grumpy/cgit/values.yaml b/grumpy/cgit/values.yaml index 0f8e3e2..2516c57 100644 --- a/grumpy/cgit/values.yaml +++ b/grumpy/cgit/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 imagePullSecrets: - - name: gitlabsec + - name: regcred nameOverride: "" fullnameOverride: "" 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}} diff --git a/grumpy/gitolite/values.yaml b/grumpy/gitolite/values.yaml index e2cfe19..2bc1e07 100644 --- a/grumpy/gitolite/values.yaml +++ b/grumpy/gitolite/values.yaml @@ -9,13 +9,13 @@ ImageTag: "v0.0.4" ImagePullPolicy: "Always" Component: "gitolite" imagePullSecrets: - - name: gitlabsec + - name: regcred Cpu: "200m" Memory: "256Mi" -ServicePort: 22 +ServicePort: 30000 # For minikube, set this to NodePort, elsewhere use LoadBalancer # Use ClusterIP if your setup includes ingress controller -ServiceType: LoadBalancer +ServiceType: NodePort ServiceAnnotations: {} # service.beta.kubernetes.io/aws-load-balancer-backend-protocol: https # Used to create Ingress record (should used with ServiceType: ClusterIP) @@ -92,5 +92,5 @@ NetworkPolicy: Enabled: false # For Kubernetes v1.4, v1.5 and v1.6, use 'extensions/v1beta1' # For Kubernetes v1.7, use 'networking.k8s.io/v1' - ApiVersion: 'networking.k8s.io/v1' + ApiVersion: 'networking.k8s.io/v1' diff --git a/grumpy/gitsnapshot/values.yaml b/grumpy/gitsnapshot/values.yaml index 3a22d1a..ea428ee 100644 --- a/grumpy/gitsnapshot/values.yaml +++ b/grumpy/gitsnapshot/values.yaml @@ -10,7 +10,7 @@ image: pullPolicy: Always imagePullSecrets: - - name: gitlabsec + - name: regcred nameOverride: "" fullnameOverride: "" diff --git a/grumpy/sally/deploy.yaml b/grumpy/sally/deploy.yaml index efbe10e..33428e6 100644 --- a/grumpy/sally/deploy.yaml +++ b/grumpy/sally/deploy.yaml @@ -21,5 +21,5 @@ spec: ports: - containerPort: 8080 imagePullSecrets: - - name: gitlabsec + - name: regcred |