Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix kubernetes ci/cd #8362

Merged
merged 13 commits into from
Dec 22, 2023
Merged

Fix kubernetes ci/cd #8362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ee5741b
[ci] fix syft dev k8s pipeline
yashgorana Dec 21, 2023
d2d8745
[helm] cleanup secrets
yashgorana Dec 21, 2023
5c8d1a2
[helm] cleanup seaweedfs values
yashgorana Dec 21, 2023
b9e77e4
[helm] cleanup container+version
yashgorana Dec 21, 2023
a835d0a
[helm] cleanup mongo
yashgorana Dec 21, 2023
452f605
[helm] cleanup labels
yashgorana Dec 21, 2023
50dfabb
[ci] syft k8s build and push seaweedfs
yashgorana Dec 21, 2023
aeed49e
[ci] fix typo
yashgorana Dec 21, 2023
ab071c1
fix devspace k8s tests
rasswanth-s Dec 21, 2023
7e011de
[ci] follow conventions
yashgorana Dec 21, 2023
77528a3
sample commit to check CI
rasswanth-s Dec 21, 2023
3d82e5a
minor change to trigger creation of containers in dev environments
rasswanth-s Dec 22, 2023
cc0fdcf
removed deleted manifest file in cd-syft
rasswanth-s Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions .github/workflows/cd-syft-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ jobs:
- name: Set Grid package version
id: grid
shell: bash
run: echo "GRID_VERSION=$(python packages/grid/VERSION)" >> $GITHUB_OUTPUT
run: |
echo "GRID_VERSION=$(python packages/grid/VERSION)" >> $GITHUB_OUTPUT
echo "SEAWEEDFS_VERSION=$(grep 'SEAWEEDFS_VERSION' packages/grid/default.env | cut -d '=' -f2)" >> $GITHUB_OUTPUT

- name: Build and push `grid-backend` image to registry
uses: docker/build-push-action@v5
Expand All @@ -116,6 +118,19 @@ jobs:
${{ secrets.ACR_SERVER }}/openmined/grid-frontend:${{ steps.grid.outputs.GRID_VERSION }}
target: grid-ui-development

- name: Build and push `grid-seaweedfs` image to registry
uses: docker/build-push-action@v5
with:
context: ./packages/grid/seaweedfs
file: ./packages/grid/seaweedfs/seaweedfs.dockerfile
build-args: |
SEAWEEDFS_VERSION=${{ steps.grid.outputs.SEAWEEDFS_VERSION }}
push: true
tags: |
${{ secrets.ACR_SERVER }}/openmined/grid-seaweedfs:dev
${{ secrets.ACR_SERVER }}/openmined/grid-seaweedfs:dev-${{ github.sha }}
${{ secrets.ACR_SERVER }}/openmined/grid-seaweedfs:${{ steps.grid.outputs.GRID_VERSION }}

- name: Build Helm Chart & Copy to infra
if: github.ref == 'refs/heads/dev' || github.event.inputs.deploy-helm == 'true'
shell: bash
Expand Down Expand Up @@ -143,13 +158,15 @@ jobs:
python -m pip install --upgrade pip
pip install tox

export CONTAINER_REGISTRY=${{ secrets.ACR_SERVER }}
export VERSION=dev-${{github.sha}}
tox -e syft.build.helm

rm -rf infrastructure/gitops/environments/dev/
mkdir -p infrastructure/gitops/environments/dev/
cp -R packages/grid/helm/syft/. packages/grid/helm/manifests.yaml infrastructure/gitops/environments/dev/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: we could also remove packages/grid/helm/manifests.yaml in cd-syft.yaml


cp -R packages/grid/helm/syft/. infrastructure/gitops/environments/dev/

# write version to VERSION.txt file
echo "dev-${{github.sha}}" > infrastructure/gitops/environments/dev/VERSION.txt

- name: Commit & push changes to Infra Repo
if: github.ref == 'refs/heads/dev' || github.event.inputs.deploy-helm == 'true'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-syft.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,10 @@ jobs:
run: |
if $is_pre_release; then
rm -rf infrastructure/gitops/environments/pre-release/.
cp -R packages/grid/helm/syft/. packages/grid/helm/manifests.yaml infrastructure/gitops/environments/pre_release/
cp -R packages/grid/helm/syft/. infrastructure/gitops/environments/pre_release/
else
rm -rf infrastructure/gitops/environments/stable/.
cp -R packages/grid/helm/syft/. packages/grid/helm/manifests.yaml infrastructure/gitops/environments/stable/
cp -R packages/grid/helm/syft/. infrastructure/gitops/environments/stable/
fi
- name: Commit changes to Infra Repo
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/devspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ deployments:
chart:
name: ./helm/syft
values:
container:
syft:
registry: ${CONTAINER_REGISTRY}
syft_version: "dev-latest"
version: "dev-latest"
node:
settings:
nodeName: ${NODE_NAME}
Expand Down
Loading
Loading