diff --git a/.circleci/config.yml b/.circleci/config.yml index 1446c015..79ed6ae8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -351,6 +351,8 @@ references: helm dep build ./codacy echo "Adding 'https://charts.codacy.com/${CHANNEL}'" helm repo add --username "${CHARTS_REPO_USER}" --password "${CHARTS_REPO_PASS}" ${HELM_REPOSITORY} https://charts.codacy.com/${CHANNEL} + echo "Removing existing chart version from chart museum (if present)..." + curl -s -u "${CHARTS_REPO_USER}:${CHARTS_REPO_PASS}" -X DELETE "https://charts.codacy.com/${CHANNEL}/api/charts/codacy/$(cat .version)" || true helm push ./codacy ${HELM_REPOSITORY} - <<: *persist_to_workspace diff --git a/codacy/templates/fluentd/lifecycle-police-job.yaml b/codacy/templates/fluentd/lifecycle-police-job.yaml index eb32590b..a1fda355 100644 --- a/codacy/templates/fluentd/lifecycle-police-job.yaml +++ b/codacy/templates/fluentd/lifecycle-police-job.yaml @@ -35,7 +35,7 @@ spec: - | ENDPOINT="http://{{ .Values.global.minio.location }}:{{ .Values.global.minio.port }}" BUCKET="{{ .Values.fluentdoperator.bucketName }}" - LIFECYCLE='{"Rules":[{"Expiration":{"Days": {{ .Values.fluentdoperator.expirationDays }} },"ID":"Delete old logs","Status":"Enabled"}]}' + LIFECYCLE='{"Rules":[{"Expiration":{"Days": {{ .Values.fluentdoperator.expirationDays }} },"Filter":{},"ID":"Delete old logs","Status":"Enabled"}]}' MAX_WAIT=600 ELAPSED=0 echo "Waiting for MinIO at ${ENDPOINT}..."