Merge remote-tracking branch 'origin/master' into release-2.5

cloudfoundry-incubator · Oct 2, 2020 · ad2531f · ad2531f
2 parents 263427c + 64f0b73
commit ad2531f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/chart/config/jobs.yaml b/chart/config/jobs.yaml
@@ -162,6 +162,7 @@ jobs:
   uaa:
     # Added via ops in assets/operations/instance_groups/uaa.yaml
     cf-cli-7-linux:
+      condition: 'features.credhub.enabled'
       processes: [uaa-internal-security-group-setup]
 
   # additional tests defined in ops files; only smoke-tests is in cf-deployment

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -103,9 +103,9 @@ binaries:
 # Additional files we need to download; see http_file() invocation in WORKSPACE.
 external_files:
   cf_operator:
-    sha256: 5aa346b377bb37c83a0011180f512463d977ea21446e9c3082ecb206ca39b15a
+    sha256: 5805ddfe34d626f3b068abc0d1f897ec756269308e6a5d2aedf212378500c220
     url: https://s3.amazonaws.com/cf-operators/release/helm-charts/cf-operator-{version}.tgz
-    version: 6.1.7%2B0.g4d918d1f
+    version: 6.1.8%2B0.g2821133a
   kube_dashboard:
     sha256: f849252870818a2971dfc3c4f8a8c5f58a57606bc2b5f221d7ab693e1d1190e0
     url: https://raw.githubusercontent.com/kubernetes/dashboard/{version}/aio/deploy/recommended.yaml

diff --git a/scripts/cf-operator-delete.sh b/scripts/cf-operator-delete.sh
@@ -12,7 +12,7 @@ kubectl delete --ignore-not-found clusterrole cf-operator-quarks-job-cluster
 kubectl delete --ignore-not-found clusterrole cf-operator-cluster
 kubectl delete --ignore-not-found clusterrolebinding cf-operator-quarks-job-cluster
 kubectl delete --ignore-not-found clusterrolebinding cf-operator-cluster
-kubectl delete --ignore-not-foundcrd boshdeployments.quarks.cloudfoundry.org
+kubectl delete --ignore-not-found crd boshdeployments.quarks.cloudfoundry.org
 kubectl delete --ignore-not-found crd quarksjobs.quarks.cloudfoundry.org
 kubectl delete --ignore-not-found crd quarkssecrets.quarks.cloudfoundry.org
 kubectl delete --ignore-not-found crd quarksstatefulsets.quarks.cloudfoundry.org