From 2d14d19fe5777ea1d3b3cb47bb168d8e1785208b Mon Sep 17 00:00:00 2001
From: Irakli Janiashvili <irakli_janiashvili@epam.com>
Date: Thu, 1 Dec 2022 10:29:08 +0000
Subject: [PATCH] GONRG-5959 parameter partitionCleanUpEnabled is not
described/used
---
.../deploy/templates/configmap-bootstrap.yaml | 1 -
devops/gcp/deploy/values.yaml | 1 -
.../bootstrap/bootstrap_partition.sh | 34 -------------------
3 files changed, 36 deletions(-)
diff --git a/devops/gcp/deploy/templates/configmap-bootstrap.yaml b/devops/gcp/deploy/templates/configmap-bootstrap.yaml
index 2e50d55f0..1a32206bc 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 9c3e81532..eeb891731 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 ed438b331..70c86f77e 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}" \
--
GitLab