From 63340af3db389f3dbadbcfc1b59beee431b9b9b8 Mon Sep 17 00:00:00 2001
From: Tim Collins <45351296+tico24@users.noreply.github.com>
Date: Wed, 28 Jul 2021 12:23:03 +0100
Subject: [PATCH] Remove faulty director readiness probe & support sorry
 cypress 1.1.0 (#64)

* Remove readiness probe for director

* Support sorry-cypress v1.1.0

* Tweak some ci stuff
---
 .github/workflows/lint-test.yml                        | 4 ++--
 charts/sorry-cypress/Chart.yaml                        | 4 ++--
 charts/sorry-cypress/templates/deployment-director.yml | 8 --------
 test.yaml                                              | 2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 5a4735e..fadb308 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -17,7 +17,7 @@ jobs:
           - "kindest/node:v1.19.11"
           - "kindest/node:v1.18.19"
           - "kindest/node:v1.17.17"
-      fail-fast: false
+      fail-fast: true
 
     steps:
       - name: Checkout
@@ -57,7 +57,7 @@ jobs:
         run: ct lint --all --debug --config lint.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.1.0
+        uses: helm/kind-action@v1.2.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           node_image: ${{ matrix.kubernetes_version }}
diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml
index 669bc7e..94683ab 100644
--- a/charts/sorry-cypress/Chart.yaml
+++ b/charts/sorry-cypress/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: sorry-cypress
 description: A Helm chart for Sorry Cypress
 type: application
-version: 1.0.3
-appVersion: 1.0.3
+version: 1.0.4
+appVersion: 1.1.0
 home: https://sorry-cypress.dev/
 sources:
   - https://github.com/sorry-cypress/sorry-cypress
diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml
index b0225cf..93a62ed 100644
--- a/charts/sorry-cypress/templates/deployment-director.yml
+++ b/charts/sorry-cypress/templates/deployment-director.yml
@@ -98,14 +98,6 @@ spec:
         name: {{ include "sorry-cypress-helm.fullname" . }}-director
         ports:
         - containerPort: 1234
-        readinessProbe:
-          httpGet:
-            path: /
-            port: 1234
-          periodSeconds: 10
-          timeoutSeconds: 5
-          successThreshold: 2
-          failureThreshold: 5
         resources:
           {{- toYaml .Values.director.resources | nindent 10 }}
       restartPolicy: Always
diff --git a/test.yaml b/test.yaml
index 88551a3..2b33fc3 100644
--- a/test.yaml
+++ b/test.yaml
@@ -6,4 +6,4 @@ chart-repos:
   - mongodb=https://charts.bitnami.com/bitnami
 chart-dirs:
   - charts
-helm-extra-args: --timeout 600s
+helm-extra-args: --timeout 300s