diff --git a/.github/workflows/offline.yml b/.github/workflows/offline.yml index 367b41cd7..a73289a0d 100644 --- a/.github/workflows/offline.yml +++ b/.github/workflows/offline.yml @@ -24,38 +24,38 @@ jobs: - name: Install nix environment run: nix-env -f default.nix -iA env - - name: Run offline build - run: ./offline/ci.sh - env: - GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}' - DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}' + # - name: Run offline build + # run: ./offline/ci.sh + # env: + # GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}' + # DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}' - name: Get upload name id: upload_name run: | # FIXME: Tag with a nice release name using the github tag... # SOURCE_TAG=${GITHUB_REF#refs/tags/} - echo ::set-output name=UPLOAD_NAME::$GITHUB_SHA + echo ::set-output name=UPLOAD_NAME::a51bca6e9f9184aad2322dd151964e1278cb4eb2 # echo ::set-output name=UPLOAD_NAME::${SOURCE_TAG:-$GITHUB_SHA} - - name: Copy assets tarball to S3 - run: | - aws s3 cp assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz - echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz" - env: - AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}' - AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}' - AWS_REGION: "eu-west-1" + # - name: Copy assets tarball to S3 + # run: | + # aws s3 cp assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz + # echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz" + # env: + # AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}' + # AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}' + # AWS_REGION: "eu-west-1" - - name: Build and upload wire-server-deploy container - run: | - container_image=$(nix-build --no-out-link -A container) + # - name: Build and upload wire-server-deploy container + # run: | + # container_image=$(nix-build --no-out-link -A container) - skopeo copy --retry-times 10 --dest-creds "$DOCKER_LOGIN" \ - docker-archive:"$container_image" \ - "docker://quay.io/wire/wire-server-deploy:${{ steps.upload_name.outputs.UPLOAD_NAME }}" - env: - DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}' + # skopeo copy --retry-times 10 --dest-creds "$DOCKER_LOGIN" \ + # docker-archive:"$container_image" \ + # "docker://quay.io/wire/wire-server-deploy:${{ steps.upload_name.outputs.UPLOAD_NAME }}" + # env: + # DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}' - name: Deploy offline environment to hetzner run: | diff --git a/ansible/setup-offline-sources.yml b/ansible/setup-offline-sources.yml index 986dad22a..f7afe7b92 100644 --- a/ansible/setup-offline-sources.yml +++ b/ansible/setup-offline-sources.yml @@ -16,27 +16,27 @@ dest: /opt/assets tags: - binaries - - name: Copy system containers - unarchive: - src: ../containers-system.tar - dest: /opt/assets - tags: - - containers-system - - containers - - name: Copy helm containers - unarchive: - src: ../containers-helm.tar - dest: /opt/assets - tags: - - containers-helm - - containers - - name: Copy other containers - unarchive: - src: ../containers-other.tar - dest: /opt/assets - tags: - - containers-other - - containers + # - name: Copy system containers + # unarchive: + # src: ../containers-system.tar + # dest: /opt/assets + # tags: + # - containers-system + # - containers + # - name: Copy helm containers + # unarchive: + # src: ../containers-helm.tar + # dest: /opt/assets + # tags: + # - containers-helm + # - containers + # - name: Copy other containers + # unarchive: + # src: ../containers-other.tar + # dest: /opt/assets + # tags: + # - containers-other + # - containers - copy: src: files/serve-assets.service dest: /etc/systemd/system/serve-assets.service diff --git a/bin/offline-cluster.sh b/bin/offline-cluster.sh index fb263f19d..435f93a6c 100755 --- a/bin/offline-cluster.sh +++ b/bin/offline-cluster.sh @@ -35,19 +35,19 @@ ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/setup-offline-sources.yml # Run kubespray until docker is installed and runs. This allows us to preseed the docker containers that # are part of the offline bundle -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/kubernetes.yml --tags bastion,bootstrap-os,preinstall,container-engine +#ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/kubernetes.yml --tags bastion,bootstrap-os,preinstall,container-engine # Install docker on the restund nodes -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/restund.yml --tags docker +#ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/restund.yml --tags docker # With ctr being installed on all nodes that need it, seed all container images: -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/seed-offline-containerd.yml +#ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/seed-offline-containerd.yml # Install NTP ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/sync_time.yml -v # Run the rest of kubespray. This should bootstrap a kubernetes cluster successfully: -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/kubernetes.yml --skip-tags bootstrap-os,preinstall,container-engine,multus +#ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/kubernetes.yml --skip-tags bootstrap-os,preinstall,container-engine,multus # Deploy all other services which don't run in kubernetes. ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/cassandra.yml @@ -56,4 +56,4 @@ ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/minio.yml ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/restund.yml # create helm values that tell our helm charts what the IP addresses of cassandra, elasticsearch and minio are: -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/helm_external.yml --skip-tags=rabbitmq-external +#ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/helm_external.yml --skip-tags=rabbitmq-external