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

Separating Upgrade test and ClickHouse Migration Tests #383

Merged
merged 3 commits into from
Jul 20, 2023
Merged

Separating Upgrade test and ClickHouse Migration Tests #383

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fef4c2b
Separating Upgrade test and ClickHouse Migration Tests
Jul 18, 2023
ed3fe31
Addressed comments
Jul 20, 2023
f63c4f2
nits
Jul 20, 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
58 changes: 58 additions & 0 deletions .github/workflows/kind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,63 @@ jobs:
name: upgrade-from-theia-version-n-1.tar.gz
path: log.tar.gz
retention-days: 30

test-ClickHouse-migrate-from-N-1:
name: Migrate ClickHouse from Theia version N-1
needs:
- build-clickhouse-monitor-image
- build-clickhouse-server-image
runs-on: [ubuntu-latest]
steps:
- name: Free disk space
# https://github.com/actions/virtual-environments/issues/709
run: |
sudo apt-get clean
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
sudo rm -rf "/usr/local/lib/android"
df -h
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
- name: Download ClickHouse monitor images from previous jobs
uses: actions/download-artifact@v3
with:
name: clickhouse-monitor
- name: Load Theia image
run: |
docker load -i clickhouse-monitor.tar
docker tag antrea/theia-clickhouse-monitor:latest projects.registry.vmware.com/antrea/theia-clickhouse-monitor:latest
- name: Download ClickHouse server images from previous jobs
uses: actions/download-artifact@v3
with:
name: clickhouse-server
- name: Load Theia image
run: |
docker load -i clickhouse-server.tar
docker tag antrea/theia-clickhouse-server:latest projects.registry.vmware.com/antrea/theia-clickhouse-server:latest
- name: Install Kind
run: |
curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64
chmod +x ./kind
sudo mv kind /usr/local/bin
- name: Run migrate test
run: |
mkdir log
ANTREA_LOG_DIR=$PWD/log ./ci/kind/test-clickhouse-migrate.sh --from-version-n-minus 1
- name: Tar log files
if: ${{ failure() }}
run: tar -czf log.tar.gz log
- name: Upload test log
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: migrate-clickhouse-from-theia-version-n-1.tar.gz
path: log.tar.gz
retention-days: 30

# Runs after all other jobs in the workflow succeed and deletes Theia Docker images uploaded as temporary
# artifacts. It uses a third-party, MIT-licensed action (geekyeggo/delete-artifact). While Github
Expand All @@ -236,6 +293,7 @@ jobs:
- build-theia-manager-image
- test-e2e-encap
- test-upgrade-from-N-1
- test-ClickHouse-migrate-from-N-1
runs-on: [ubuntu-latest]
steps:
- name: Delete spark-jobs
Expand Down
2 changes: 1 addition & 1 deletion build/charts/theia/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Kubernetes: `>= 1.16.0-0`
| theiaManager.apiServer.selfSignedCert | bool | `true` | Indicates whether to use auto-generated self-signed TLS certificates. If false, a Secret named "theia-manager-tls" must be provided with the following keys: ca.crt, tls.crt, tls.key. |
| theiaManager.apiServer.tlsCipherSuites | string | `""` | Comma-separated list of cipher suites that will be used by the Theia Manager APIservers. If empty, the default Go Cipher Suites will be used. |
| theiaManager.apiServer.tlsMinVersion | string | `""` | TLS min version from: VersionTLS10, VersionTLS11, VersionTLS12, VersionTLS13. |
| theiaManager.enable | bool | `true` | Determine whether to install Theia Manager. |
| theiaManager.enable | bool | `false` | Determine whether to install Theia Manager. |
| theiaManager.image | object | `{"pullPolicy":"IfNotPresent","repository":"projects.registry.vmware.com/antrea/theia-manager","tag":""}` | Container image used by Theia Manager. |
| theiaManager.logVerbosity | int | `0` | Log verbosity switch for Theia Manager. |

Expand Down
2 changes: 1 addition & 1 deletion build/charts/theia/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ sparkOperator:
tag: "v1beta2-1.3.3-3.1.1"
theiaManager:
# -- Determine whether to install Theia Manager.
enable: true
enable: false
Copy link
Contributor

Choose a reason for hiding this comment

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

If you would like to exclude theia-manager from the ClickHouse upgrading test, I would suggest to add an option in generate manifest script for this. Maybe add an option clickhouse-only, so that we can exclude other components in case there are more in the future.
We would like to enable theia-manager by default as theia CLI has dependency on it and we would like to provide users this default functionality.

# -- Container image used by Theia Manager.
image:
repository: "projects.registry.vmware.com/antrea/theia-manager"
Expand Down
Loading
Loading