CI: More pipeline tweaks for CT lint.

Bug: Make sure we enable Service in DaemonSet mode as well.
haproxytech · Dec 19, 2019 · b372ef4 · b372ef4
1 parent 0ea84a4
commit b372ef4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,10 @@ jobs:
     steps:
       - checkout
       - run:
-          command: ct lint --config .circleci/ct.yaml
+          command: |
+            git remote add k8s https://github.com/haproxytech/helm-charts
+            git fetch k8s master
+            ct lint --config .circleci/ct.yaml
   install-charts:
     machine: true
     steps:

diff --git a/.circleci/ct.yaml b/.circleci/ct.yaml
@@ -1,2 +1,4 @@
-helm-extra-args: --timeout 800
+remote: k8s
+target-branch: master
 chart-dirs: .
+helm-extra-args: --timeout 600
diff --git a/kubernetes-ingress/Chart.yaml b/kubernetes-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kubernetes-ingress
-version: 0.2.5
+version: 0.2.6
 kubeVersion: ">=1.12.0-0"
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 keywords:

diff --git a/kubernetes-ingress/templates/controller-service.yaml b/kubernetes-ingress/templates/controller-service.yaml
@@ -1,4 +1,3 @@
-{{- if eq .Values.controller.kind "Deployment" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -31,4 +30,3 @@ spec:
 {{- if .Values.controller.service.externalIPs }}
 {{ toYaml .Values.controller.service.externalIPs | indent 4 }}
 {{- end -}}
-{{- end -}}