diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a4582583..bc124d61f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -337,64 +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 diff --git a/.github/workflows/deploy-node-placeholder.yaml.disabled b/.github/workflows/deploy-node-placeholder.yaml similarity index 100% rename from .github/workflows/deploy-node-placeholder.yaml.disabled rename to .github/workflows/deploy-node-placeholder.yaml diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml index 2c3932b5b..8d485f037 100644 --- a/node-placeholder/values.yaml +++ b/node-placeholder/values.yaml @@ -143,7 +143,7 @@ nodePools: requests: # Some value slightly lower than allocatable RAM on the nodepool memory: 29247442944 - replicas: 0 + replicas: 1 dlab: nodeSelector: hub.jupyter.org/pool-name: dlab-pool