diff --git a/.concourse/pipeline.yaml.gomplate b/.concourse/pipeline.yaml.gomplate index d3d84b5737..a5b5b7525f 100644 --- a/.concourse/pipeline.yaml.gomplate +++ b/.concourse/pipeline.yaml.gomplate @@ -151,7 +151,7 @@ resources: access_key_id: ((aws-access-key)) secret_access_key: ((aws-secret-key)) region_name: {{ $config.s3_final_bucket_region }} - regexp: kubecf-v([0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+)?).tgz + regexp: kubecf-v?([0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+)?).tgz - name: s3.kubecf-bundle type: s3 @@ -160,7 +160,7 @@ resources: access_key_id: ((aws-access-key)) secret_access_key: ((aws-secret-key)) region_name: {{ $config.s3_final_bucket_region }} - regexp: kubecf-bundle-v([0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+)?).tgz + regexp: kubecf-bundle-v?([0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+)?).tgz deploy_args: &deploy_args - -ce diff --git a/chart/assets/operations/instance_groups/rotate-cc-database-key.yaml b/chart/assets/operations/instance_groups/rotate-cc-database-key.yaml new file mode 100644 index 0000000000..a572f5daac --- /dev/null +++ b/chart/assets/operations/instance_groups/rotate-cc-database-key.yaml @@ -0,0 +1,3 @@ +- path: /instance_groups/name=rotate-cc-database-key/env?/bosh/agent/settings/disable_log_sidecar + type: replace + value: true diff --git a/chart/config/resources.yaml b/chart/config/resources.yaml index 655977458a..a2c1277bc7 100644 --- a/chart/config/resources.yaml +++ b/chart/config/resources.yaml @@ -139,11 +139,14 @@ resources: rep: rep: {memory: {limit: 3072, request: 2048}} doppler: - doppler: 128 + doppler: 256 log-api: 128 log-cache: log-cache: 2048 nats: ~ + rotate-cc-database-key: + rotate_cc_database_key: + rotate: {memory: {limit: 512, request: 192}} router: 200 scheduler: cc_deployment_updater: 320 diff --git a/mixins/eirinix/templates/loggregator-bridge.yaml b/mixins/eirinix/templates/loggregator-bridge.yaml index cf1b5a5d87..8eb4896ed5 100644 --- a/mixins/eirinix/templates/loggregator-bridge.yaml +++ b/mixins/eirinix/templates/loggregator-bridge.yaml @@ -37,7 +37,7 @@ spec: {{- end }} env: - name: EIRINI_LOGGREGATOR_BRIDGE_LOGLEVEL - value: DEBUG + value: INFO - name: LOGGREGATOR_CERT_PATH value: /run/secrets/loggregator-cert/certificate - name: LOGGREGATOR_KEY_PATH diff --git a/testing/ccdb_key_rotation/rotate-ccdb-keys-test.sh b/testing/ccdb_key_rotation/rotate-ccdb-keys-test.sh index a2f71db84e..310f133c7f 100755 --- a/testing/ccdb_key_rotation/rotate-ccdb-keys-test.sh +++ b/testing/ccdb_key_rotation/rotate-ccdb-keys-test.sh @@ -84,10 +84,9 @@ wait_for_rotate_pod_to_end() { exit_code="$(kubectl get "${pod_name}" --namespace "${KUBECF_NAMESPACE}" --output "jsonpath=${jsonpath}")" if [[ -n "${exit_code}" ]]; then echo " $(blue "Completed")" - echo Terminating job - kubectl delete --namespace "${KUBECF_NAMESPACE}" "$(rotate_job_name)" + # shellcheck disable=SC2005 - echo "$(green "OK")" + echo "$(green "OK [${exit_code}]")" exit "${exit_code}" fi sleep 1