Merge pull request #6010 from berkeley-dsep-infra/staging

merging 6005/6006/6007/6008/6009 to prod
berkeley-dsep-infra · Aug 23, 2024 · 65224ec · 65224ec
2 parents 8411a0d + afd12b9
commit 65224ec
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 139 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -337,124 +337,6 @@ jobs:
             hubploy deploy --timeout 30m workshop hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-
-  deploy-node-placeholder:
-    docker:
-      - image: buildpack-deps:bionic-scm
-    working_directory: ~/repo
-    steps:
-      - checkout
-
-      - run:
-          name: install google-cloud-sdk
-          command: |
-            export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-457.0.0-linux-x86_64.tar.gz
-            curl -sSL $GCLOUD_URL | tar -xzf - -C ${HOME}
-            # Be careful with quote ordering here. ${PATH} must not be expanded
-            # Don't use ~ here - bash can interpret PATHs containing ~, but most other things can't.
-            # Always use full PATHs in PATH!
-            echo 'export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"' >> ${BASH_ENV}
-
-      - run:
-          name: Setup helm3
-          command: |
-            curl -L https://get.helm.sh/helm-v3.13.3-linux-amd64.tar.gz | \
-              tar -xzf -
-            mv linux-amd64/helm /usr/local/bin
-            helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
-
-      - run:
-          name: Install sops
-          command: |
-            echo $SOPS_ACCOUNT_KEY > ${HOME}/repo/sops.key
-            echo 'export GOOGLE_APPLICATION_CREDENTIALS=${HOME}/repo/sops.key' >> ${BASH_ENV}
-            mkdir -p ${HOME}/repo/bin
-            curl -sSL https://github.com/mozilla/sops/releases/download/v3.7.0/sops-v3.7.0.linux -o ${HOME}/repo/bin/sops
-            chmod 755 ${HOME}/repo/bin/sops
-            echo 'export PATH="${HOME}/repo/bin:${PATH}"' >> ${BASH_ENV}
-
-      - run:
-          name: Activate credentials for datahub cluster (spring-2024)
-          command: |
-            gcloud components install gke-gcloud-auth-plugin
-            sops -d -i deployments/datahub/secrets/gke-key.json
-            gcloud auth \
-              activate-service-account \
-              --key-file deployments/datahub/secrets/gke-key.json
-
-            gcloud container clusters \
-              --region=us-central1 --project=ucb-datahub-2018 \
-              get-credentials spring-2024
-
-      - run:
-          name: Deploy node placeholder chart
-          command: |
-            sops -d -i node-placeholder/secrets.yaml
-            helm upgrade \
-              --install --wait \
-              --namespace=node-placeholder node-placeholder node-placeholder \
-              -f node-placeholder/secrets.yaml --debug
-
-  deploy-support:
-    docker:
-      - image: buildpack-deps:bionic-scm
-    working_directory: ~/repo
-    steps:
-      - checkout
-
-      - run:
-          name: install google-cloud-sdk
-          command: |
-            export GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-457.0.0-linux-x86_64.tar.gz
-            curl -sSL $GCLOUD_URL | tar -xzf - -C ${HOME}
-            # Be careful with quote ordering here. ${PATH} must not be expanded
-            # Don't use ~ here - bash can interpret PATHs containing ~, but most other things can't.
-            # Always use full PATHs in PATH!
-            echo 'export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"' >> ${BASH_ENV}
-
-      - run:
-          name: Install sops
-          command: |
-            echo $SOPS_ACCOUNT_KEY > ${HOME}/repo/sops.key
-            echo 'export GOOGLE_APPLICATION_CREDENTIALS=${HOME}/repo/sops.key' >> ${BASH_ENV}
-            mkdir -p ${HOME}/repo/bin
-            curl -sSL https://github.com/mozilla/sops/releases/download/v3.7.0/sops-v3.7.0.linux -o ${HOME}/repo/bin/sops
-            chmod 755 ${HOME}/repo/bin/sops
-            echo 'export PATH="${HOME}/repo/bin:${PATH}"' >> ${BASH_ENV}
-
-      - run:
-          name: Setup helm3
-          command: |
-            curl -L https://get.helm.sh/helm-v3.13.3-linux-amd64.tar.gz | \
-              tar -xzf -
-            mv linux-amd64/helm /usr/local/bin
-            helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
-
-      - run:
-          name: Activate credentials for datahub cluster (spring-2024)
-          command: |
-            gcloud components install gke-gcloud-auth-plugin
-            sops -d -i deployments/datahub/secrets/gke-key.json
-            gcloud auth \
-              activate-service-account \
-              --key-file deployments/datahub/secrets/gke-key.json
-
-            gcloud container clusters \
-              --region=us-central1 --project=ucb-datahub-2018 \
-              get-credentials spring-2024
-
-      - run:
-          name: Deploy support helm chart
-          command: |
-            sops -d -i support/secrets.yaml
-            helm dep up support
-            helm upgrade \
-              --install --wait \
-              --namespace=support \
-              support support/ \
-              -f support/secrets.yaml \
-              --set installCRDs=true --debug
-
 workflows:
   version: 2
   test-build-images:
@@ -857,20 +739,3 @@ workflows:
             branches:
               only:
                 - prod
-  deploy-node-placeholder:
-    jobs:
-      - deploy-node-placeholder:
-          filters:
-            branches:
-              # We don't have staging / prod for our node placeholder pods
-              # So we deploy only when deploying staging
-              only: staging
-
-  deploy-support:
-    jobs:
-      - deploy-support:
-          filters:
-            branches:
-              # We don't have staging / prod for our support cluster
-              # So we deploy only when deploying staging
-              only: staging
diff --git a/...ows/deploy-node-placeholder.yaml.disabled → ...ub/workflows/deploy-node-placeholder.yaml b/...ows/deploy-node-placeholder.yaml.disabled → ...ub/workflows/deploy-node-placeholder.yaml
@@ -74,7 +74,7 @@ jobs:
           sops -d -i deployments/datahub/secrets/gke-key.json
           gcloud auth \
             activate-service-account \
-            --key-file deployments/datahub/secrets/gke-key.json \
+            --key-file deployments/datahub/secrets/gke-key.json
           gcloud container clusters \
             --region=us-central1 --project=ucb-datahub-2018 \
             get-credentials spring-2024
@@ -86,4 +86,4 @@ jobs:
           helm upgrade \
             --install --wait \
             --namespace=node-placeholder node-placeholder node-placeholder \
-            -f node-placeholder/secrets.yaml --debug
+            -f node-placeholder/secrets.yaml
diff --git a/...ub/workflows/deploy-support.yaml.disabled → .github/workflows/deploy-support.yaml b/...ub/workflows/deploy-support.yaml.disabled → .github/workflows/deploy-support.yaml
@@ -89,4 +89,4 @@ jobs:
             --namespace=support \
             support support/ \
             -f support/secrets.yaml \
-            --set installCRDs=true --debug
+            --set installCRDs=true
diff --git a/requirements.txt b/requirements.txt
@@ -8,6 +8,5 @@ jupyter-repo2docker==2024.3.0
 myst-parser
 chardet
 requests==2.31.0
-# requests==2.32.3
 urllib3<2.0.0
 yamllint==1.35.1