From a5815ac76601cff7022fb3a7427f42a1b531c67c Mon Sep 17 00:00:00 2001 From: Christopher Weibel Date: Tue, 2 Jan 2024 15:32:57 -0500 Subject: [PATCH 1/3] try a delete first? --- bosh/opsfiles/enable-cflinuxfs4.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bosh/opsfiles/enable-cflinuxfs4.yml b/bosh/opsfiles/enable-cflinuxfs4.yml index efa4196e..56d598e6 100644 --- a/bosh/opsfiles/enable-cflinuxfs4.yml +++ b/bosh/opsfiles/enable-cflinuxfs4.yml @@ -1,6 +1,11 @@ # This file is the midpoint to get cflinuxfs4 enabled # Used to pull out credhub_tls certificate + + +- type: remove + path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs + - type: replace path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs value: From 801398c685812324f2585ee9ac4d8719052f2f8d Mon Sep 17 00:00:00 2001 From: Christopher Weibel Date: Tue, 2 Jan 2024 15:42:11 -0500 Subject: [PATCH 2/3] remove delete --- bosh/opsfiles/enable-cflinuxfs4.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bosh/opsfiles/enable-cflinuxfs4.yml b/bosh/opsfiles/enable-cflinuxfs4.yml index 56d598e6..49d4feb3 100644 --- a/bosh/opsfiles/enable-cflinuxfs4.yml +++ b/bosh/opsfiles/enable-cflinuxfs4.yml @@ -3,8 +3,8 @@ # Used to pull out credhub_tls certificate -- type: remove - path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs +#- type: remove +# path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs - type: replace path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs From 73c8e6e7bd61627ac22956d7d440c3d86ec1e9de Mon Sep 17 00:00:00 2001 From: Christopher Weibel Date: Tue, 2 Jan 2024 16:22:59 -0500 Subject: [PATCH 3/3] Tested in dev --- bosh/opsfiles/enable-cflinuxfs4.yml | 4 ---- ci/pipeline.yml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bosh/opsfiles/enable-cflinuxfs4.yml b/bosh/opsfiles/enable-cflinuxfs4.yml index 49d4feb3..a63490fc 100644 --- a/bosh/opsfiles/enable-cflinuxfs4.yml +++ b/bosh/opsfiles/enable-cflinuxfs4.yml @@ -2,10 +2,6 @@ # Used to pull out credhub_tls certificate - -#- type: remove -# path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs - - type: replace path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs value: diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 903a930d..dd182da1 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -69,6 +69,7 @@ jobs: - cf-manifests/bosh/opsfiles/diego-overcommit.yml - cf-manifests/bosh/opsfiles/scaling-development.yml - cf-manifests/bosh/opsfiles/cf-networking.yml + - cf-manifests/bosh/opsfiles/enable-cflinuxfs4.yml - cf-manifests/bosh/opsfiles/disable-secure-service-credentials.yml - cf-manifests/bosh/opsfiles/diego-rds-certs.yml - cf-manifests/bosh/opsfiles/smoke-tests.yml @@ -1088,7 +1089,6 @@ jobs: - cf-manifests/bosh/opsfiles/diego-dns.yml - cf-manifests/bosh/opsfiles/diego-overcommit.yml - cf-manifests/bosh/opsfiles/scaling-production.yml - - cf-manifests/bosh/opsfiles/enable-cflinuxfs4.yml - cf-manifests/bosh/opsfiles/cf-networking.yml - cf-manifests/bosh/opsfiles/routing.yml - cf-manifests/bosh/opsfiles/smoke-tests.yml @@ -1654,4 +1654,4 @@ groups: - uaa-client-auditing-production - uaa-monitor-account-creation-production - tic-smoke-tests-production - - test-space-egress-production + - test-space-egress-production \ No newline at end of file