From 43d6f83501e1c16c9d7fc7c0004e400468cc19f2 Mon Sep 17 00:00:00 2001 From: Lucas Telles Date: Wed, 4 Jun 2025 15:40:11 -0300 Subject: [PATCH] Change push script to use oci --- .drone.yml | 112 ------------------------------------------ push_and_tag.sh | 54 -------------------- upload_helm_charts.sh | 2 +- 3 files changed, 1 insertion(+), 167 deletions(-) delete mode 100644 .drone.yml delete mode 100644 push_and_tag.sh diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index c6bca0cd..00000000 --- a/.drone.yml +++ /dev/null @@ -1,112 +0,0 @@ -kind: pipeline -type: kubernetes -name: devops-service - -services: - - name: docker - image: docker:dind - command: [ "--storage-driver=vfs", "--tls=false" ] - privileged: true - environment: - DOCKER_TLS_CERTDIR: '' - -concurrency: - limit: 1 - -trigger: - event: - exclude: - - pull_request - -steps: - - - name: push containers - image: docker:latest - commands: - - sleep 30 - - docker --tls=false ps - - apk update && apk add curl python3 py3-pip - - pip3 install shyaml --break-system-packages - - sh ./push_and_tag.sh - - environment: - GCR_CREDENTIALS: - from_secret: gcr_credentials - HARBOR_PASSWORD: - from_secret: harbor_password - HARBOR_USERNAME: - from_secret: harbor_username - CRUNCHY_PASSWORD: - from_secret: crunchy_sa_password - CRUNCHY_USERNAME: - from_secret: crunchy_sa_username - DOCKER_HOST: tcp://docker:2375 - when: - branch: - - main - - - name: push helm charts - image: alpine/helm - commands: - - helm version - - helm plugin install https://github.com/chartmuseum/helm-push - - helm repo add --username $USERNAME --password $PASSWORD harbor https://harbor.devops.indico.io/chartrepo/indico-charts - - sh upload_helm_charts.sh - - environment: - HELM_EXPERIMENTAL_OCI: 1 - PASSWORD: - from_secret: harbor_password - USERNAME: - from_secret: harbor_username - when: - branch: - - main - - - - -image_pull_secrets: - - harbor_pull_secret - ---- -kind: secret -name: harbor_pull_secret -get: - path: tools/drone/devops_harbor_pull_secret - name: DOCKER_CONFIG_JSON - ---- -kind: secret -name: harbor_username -get: - path: tools/drone/harbor-push-token - name: username - ---- -kind: secret -name: harbor_password -get: - path: tools/drone/harbor-push-token - name: password - ---- -kind: secret -name: gcr_credentials -get: - path: tools/drone/devops_gcr_credentials - name: data - ---- -kind: secret -name: crunchy_sa_password -get: - path: tools/drone/crunchy_sa - name: password - ---- -kind: secret -name: crunchy_sa_username -get: - path: tools/drone/crunchy_sa - name: username \ No newline at end of file diff --git a/push_and_tag.sh b/push_and_tag.sh deleted file mode 100644 index c698f1cf..00000000 --- a/push_and_tag.sh +++ /dev/null @@ -1,54 +0,0 @@ -CRUNCHY_REGISTRY=registry.crunchydata.com -#Grab the images that need to be tagged and then pushed -CONTROLLER_IMAGE_CLUSTER=$(cat helm/install/values.yaml | shyaml get-value controllerImages.cluster) -CONTROLLER_IMAGE_UPGRADE=$(cat helm/install/values.yaml | shyaml get-value controllerImages.upgrade) -RELATED_IMAGES=$(cat helm/install/values.yaml | shyaml values relatedImages image | awk '{print $2}' | sed '/^$/d') - -# docker login -echo $GCR_CREDENTIALS | base64 -d > keyfile.json -docker login -u _json_key --password-stdin https://gcr.io < keyfile.json -echo $HARBOR_PASSWORD | docker login -u $HARBOR_USERNAME --password-stdin https://harbor.devops.indico.io -echo $CRUNCHY_PASSWORD | docker login -u $CRUNCHY_USERNAME --password-stdin https://$CRUNCHY_REGISTRY -# pull images - -#pull postgres-operator controller image -IMAGE_BASE=$(basename $CONTROLLER_IMAGE_CLUSTER) -PRIVATE_IMAGE=$CRUNCHY_REGISTRY/crunchydata/$IMAGE_BASE -docker pull $PRIVATE_IMAGE -#push to gcr -docker tag $PRIVATE_IMAGE gcr.io/new-indico/$IMAGE_BASE -docker push gcr.io/new-indico/$IMAGE_BASE -#push to harbor -docker tag $PRIVATE_IMAGE harbor.devops.indico.io/indico/$IMAGE_BASE -docker push harbor.devops.indico.io/indico/$IMAGE_BASE -#Remove Junk -docker rmi $PRIVATE_IMAGE gcr.io/new-indico/$IMAGE_BASE harbor.devops.indico.io/indico/$IMAGE_BASE - -#pull postgres-operator upgrade image -IMAGE_BASE=$(basename $CONTROLLER_IMAGE_UPGRADE) -PRIVATE_IMAGE=$CRUNCHY_REGISTRY/crunchydata/$IMAGE_BASE -docker pull $PRIVATE_IMAGE -#push to gcr -docker tag $PRIVATE_IMAGE gcr.io/new-indico/$IMAGE_BASE -docker push gcr.io/new-indico/$IMAGE_BASE -#push to harbor -docker tag $PRIVATE_IMAGE harbor.devops.indico.io/indico/$IMAGE_BASE -docker push harbor.devops.indico.io/indico/$IMAGE_BASE -#Remove Junk -docker rmi $PRIVATE_IMAGE gcr.io/new-indico/$IMAGE_BASE harbor.devops.indico.io/indico/$IMAGE_BASE - -for ri in $RELATED_IMAGES; -do - IMAGE=$ri - IMAGE_BASE=$(basename $IMAGE) - PRIVATE_IMAGE=$CRUNCHY_REGISTRY/crunchydata/$IMAGE_BASE - docker pull $PRIVATE_IMAGE - #push to gcr - docker tag $PRIVATE_IMAGE gcr.io/new-indico/$IMAGE_BASE - docker push gcr.io/new-indico/$IMAGE_BASE - #push to harbor - docker tag $PRIVATE_IMAGE harbor.devops.indico.io/indico/$IMAGE_BASE - docker push harbor.devops.indico.io/indico/$IMAGE_BASE - #Remove Junk - docker rmi $PRIVATE_IMAGE gcr.io/new-indico/$IMAGE_BASE harbor.devops.indico.io/indico/$IMAGE_BASE -done diff --git a/upload_helm_charts.sh b/upload_helm_charts.sh index 2fa8de24..32b5c322 100644 --- a/upload_helm_charts.sh +++ b/upload_helm_charts.sh @@ -12,6 +12,6 @@ do CHART=$(grep ^name ./$filename/Chart.yaml | awk '{print $2}' | tr -d '\n') helm dependency build ./$filename helm package $filename --version $VERSION - helm cm-push $CHART-$VERSION.tgz harbor --force + helm push $CHART-$VERSION.tgz oci://harbor.devops.indico.io/indico-charts fi done