diff --git a/devops/gcp/deploy/templates/configmap-bootstrap.yaml b/devops/gcp/deploy/templates/configmap-bootstrap.yaml index 2e50d55f0c8bb261b74eb90ed94af0039a658555..1a32206bcde59fad9588eb7d961c98d520aebd80 100644 --- a/devops/gcp/deploy/templates/configmap-bootstrap.yaml +++ b/devops/gcp/deploy/templates/configmap-bootstrap.yaml @@ -8,7 +8,6 @@ metadata: data: PARTITION_NAME: "{{ .Values.data.partitionName }}" DATA_PARTITION_ID: "{{ .Values.data.dataPartitionId }}" - PARTITION_CLEAN_UP_ENABLED: "{{ .Values.data.partitionCleanUpEnabled }}" ENVIRONMENT: "{{ .Values.data.springProfilesActive }}" {{- if .Values.conf.onPremEnabled }} SERVICE_ACCOUNT: {{ printf "%s@service.local" .Values.data.datafierSa | quote }} diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml index 9c3e8153200375c08153fd2a378e2613cb8d51f6..eeb891731b73026dc4c3a6306884b10158e37ce3 100644 --- a/devops/gcp/deploy/values.yaml +++ b/devops/gcp/deploy/values.yaml @@ -11,7 +11,6 @@ data: partitionNamespace: "partition" datafierSa: "datafier" bucketPrefix: "" - partitionCleanUpEnabled: "false" minioExternalEndpoint: "" # use only if external minio is configured # deployments requestsCpu: "0.1" diff --git a/provider/partition-gcp/bootstrap/bootstrap_partition.sh b/provider/partition-gcp/bootstrap/bootstrap_partition.sh index ed438b33135d3d03b50378dbdafb78d019d94d9e..70c86f77e4caee5e717c4da918f524975b53534d 100644 --- a/provider/partition-gcp/bootstrap/bootstrap_partition.sh +++ b/provider/partition-gcp/bootstrap/bootstrap_partition.sh @@ -11,23 +11,6 @@ bootstrap_anthos() { DATA_PARTITION_ID=$1 DATA_PARTITION_ID_UPPER=$2 - if [[ "${PARTITION_CLEAN_UP_ENABLED}" == "true" ]]; then - echo "Partition cleanup enabled, will delete partition ${DATA_PARTITION_ID}" - - delete_status_code=$(curl -X DELETE \ - --url "http://${PARTITION_NAME}/api/partition/v1/partitions/${DATA_PARTITION_ID}" --write-out "%{http_code}" --silent --output "/dev/null" \ - -H "Content-Type: application/json") - - if [[ "${delete_status_code}" == 204 ]] || [[ "${delete_status_code}" == 404 ]]; then - echo "Partition deletion was successful with status code: ${delete_status_code}" - else - echo "Not able to delete partition with status code: ${delete_status_code}" - exit 1 - fi - else - echo "Partition cleanup is not enabled, skipping deletion" - fi - status_code=$(curl -X POST \ --url "http://${PARTITION_NAME}/api/partition/v1/partitions/${DATA_PARTITION_ID}" --write-out "%{http_code}" --silent --output "/dev/null" \ -H "Content-Type: application/json" \ @@ -60,23 +43,6 @@ bootstrap_gcp() { DATA_PARTITION_ID_UPPER=$2 IDENTITY_TOKEN=$(gcloud auth print-identity-token) - if [[ "${PARTITION_CLEAN_UP_ENABLED}" == "true" ]]; then - echo "Partition cleanup enabled, will delete partition ${DATA_PARTITION_ID}" - - delete_status_code=$(curl -X DELETE \ - --url "http://${PARTITION_NAME}/api/partition/v1/partitions/${DATA_PARTITION_ID}" --write-out "%{http_code}" --silent --output "/dev/null" \ - -H "Authorization: Bearer ${IDENTITY_TOKEN}") - - if [[ "${delete_status_code}" == 204 ]] || [[ "${delete_status_code}" == 404 ]]; then - echo "Partition deletion was successful with status code: ${delete_status_code}" - else - echo "Not able to delete partition with status code: ${delete_status_code}" - exit 1 - fi - else - echo "Partition cleanup not enabled, skipping deletion" - fi - status_code=$(curl -X POST \ --url "http://${PARTITION_NAME}/api/partition/v1/partitions/${DATA_PARTITION_ID}" --write-out "%{http_code}" --silent --output "/dev/null" \ -H "Authorization: Bearer ${IDENTITY_TOKEN}" \