diff --git a/chart/assets/operations/instance_groups/database.yaml b/chart/assets/operations/instance_groups/database.yaml index a72b310aa7..db3465926c 100644 --- a/chart/assets/operations/instance_groups/database.yaml +++ b/chart/assets/operations/instance_groups/database.yaml @@ -78,13 +78,6 @@ path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/ccdb/ca_cert? value: *pxc-cluster-ca -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/address? - value: *pxc-cluster-address -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/ca_cert? - value: *pxc-cluster-ca - {{- if .Values.features.credhub.enabled }} - type: replace path: /instance_groups/name=credhub/jobs/name=credhub/properties/credhub/data_storage/host? @@ -353,38 +346,6 @@ path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/ccdb/ssl_verify_hostname? value: {{ .Values.features.external_database.require_ssl }} -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/db_scheme - value: *external_cc_database_scheme -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/port - value: *external_cc_database_port -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/databases/tag=cc/name - value: *external_cc_database_name -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/address? - value: *external_cc_database_address -{{- if not .Values.features.external_database.seed }} -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/roles/name=cloud_controller/password - value: *external_cc_database_password -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/roles/name=cloud_controller/name - value: *external_cc_database_username -{{- end }}{{/* not .Values.features.external_database.seed */}} -{{- if .Values.features.external_database.ca_cert }} -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/ca_cert? - value: {{- toYaml .Values.features.external_database.ca_cert | indent 2 }} -{{- else }} -- type: remove - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/ca_cert? -{{- end }} -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/ccdb/ssl_verify_hostname? - value: {{ .Values.features.external_database.require_ssl }} - - type: replace path: /instance_groups/name=diego-api/jobs/name=bbs/properties/diego/bbs/sql/db_driver value: {{ .Values.features.external_database.type | quote }} diff --git a/chart/assets/operations/instance_groups/scheduler.yaml b/chart/assets/operations/instance_groups/scheduler.yaml index c3d4045175..1278a35b56 100644 --- a/chart/assets/operations/instance_groups/scheduler.yaml +++ b/chart/assets/operations/instance_groups/scheduler.yaml @@ -6,23 +6,6 @@ exec: command: ["pgrep", "--full", "clock:start"] -- type: replace - path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/quarks?/run/healthcheck/cc_deployment_updater - value: - readiness: - exec: - command: - # We should sleep about once every 5 seconds; check that the last entry was no more than 2 cycles ago - - /bin/sh - - -c - - > - tac /var/vcap/sys/log/cc_deployment_updater/cc_deployment_updater.log - | grep --max-count=1 Sleeping - | jq -e '.timestamp | gsub(".[0-9]+Z$"; "Z") | fromdate | now - . | . < 10' - liveness: - exec: - command: ["pgrep", "--full", "deployment_updater:start"] - - type: replace path: /instance_groups/name=scheduler/jobs/name=statsd_injector/properties/quarks?/run/healthcheck/statsd_injector/readiness/exec/command value: ["/bin/sh", "-c", "ss -nlu src localhost:8125 | grep :8125"] @@ -102,6 +85,9 @@ protocol: TCP internal: 9000 +- type: remove + path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater + {{- if not .Values.features.eirini.enabled }} {{- range $bytes := .Files.Glob "assets/operations/pre_render_scripts/scheduler_*" }} diff --git a/chart/config/jobs.yaml b/chart/config/jobs.yaml index cda998ac57..71160f3e8c 100644 --- a/chart/config/jobs.yaml +++ b/chart/config/jobs.yaml @@ -139,6 +139,7 @@ jobs: routing-api: '$default': 'features.routing_api.enabled' scheduler: + cc_deployment_updater: false cfdot: processes: [] ssh_proxy: '!features.eirini.enabled' diff --git a/chart/config/resources.yaml b/chart/config/resources.yaml index c91a725ffd..339da8fe0c 100644 --- a/chart/config/resources.yaml +++ b/chart/config/resources.yaml @@ -149,7 +149,6 @@ resources: rotate: {memory: {limit: 512, request: 192}} router: 200 scheduler: - cc_deployment_updater: 320 cloud_controller_clock: 512 singleton-blobstore: blobstore: diff --git a/chart/templates/_capi.tpl b/chart/templates/_capi.tpl index a2f900f147..1295234866 100644 --- a/chart/templates/_capi.tpl +++ b/chart/templates/_capi.tpl @@ -28,7 +28,6 @@ {{- /* The buildpacks properties are only defined for the ng/worker/clock jobs */}} {{- if not (hasPrefix "buildpacks" $property) }} - {{- $_ := set $ig "cc_deployment_updater" "scheduler" }} {{- /* XXX cc_route_syncer is not in cf-deployment; see CF-K8s-Networking */}} {{- /* $_ := set $ig "cc_route_syncer" "???" */}} {{- end }}