Skip to content

Commit 4db6bee

Browse files
authored
Merge branch 'main' into feat/memory-optimization-hub-2
2 parents 614f090 + bc8c9a9 commit 4db6bee

File tree

263 files changed

+13452
-25613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+13452
-25613
lines changed

.github/copilot-instructions.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ The main idea is that we are creating a multi-cluster application management sol
4949
- `test/apis` - The tests for the CRDs.
5050
- `test/upgrade` - The tests for the upgrade tests to test compatibility between versions.
5151
- `test/e2e` - The end to end tests for the member and hub agent.
52-
- `test/integration` - The integration tests for the v1alpha1 member and hub agent.
5352
- `test/scheduler` - The integration tests for the scheduler.
5453
- `test/utils` - folder contains the utils code which is used to provide common functions for tests
5554
- The `tools/` folder contains client-side tools for helping manage the fleet.

.github/workflows/ci.yml

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,7 @@ jobs:
5555
## Repository upload token - get it from codecov.io. Required only for private repositories
5656
token: ${{ secrets.CODECOV_TOKEN }}
5757
## Comma-separated list of files to upload
58-
files: ./it-coverage.xml;./ut-coverage.xml
59-
60-
e2e-tests-v1alpha1:
61-
runs-on: ubuntu-latest
62-
needs: [
63-
detect-noop,
64-
]
65-
if: needs.detect-noop.outputs.noop != 'true'
66-
steps:
67-
- name: Set up Go
68-
uses: actions/setup-go@v6
69-
with:
70-
go-version: ${{ env.GO_VERSION }}
71-
72-
- name: Check out code into the Go module directory
73-
uses: actions/checkout@v5
74-
75-
- name: Install Kind
76-
# Before updating the kind version to use, verify that the current kind image
77-
# is still supported by the version.
78-
run: |
79-
go install sigs.k8s.io/[email protected]
80-
81-
- name: Run e2e tests
82-
run: |
83-
OUTPUT_TYPE=type=docker make docker-build-member-agent docker-build-hub-agent docker-build-refresh-token e2e-tests-v1alpha1
84-
env:
85-
KUBECONFIG: '/home/runner/.kube/config'
86-
HUB_SERVER_URL: 'https://172.19.0.2:6443'
58+
files: ./ut-coverage.xml
8759

8860
e2e-tests:
8961
strategy:
@@ -106,19 +78,13 @@ jobs:
10678
- customized-settings: custom
10779
resource-snapshot-creation-minimum-interval: 30s
10880
resource-changes-collection-duration: 15s
109-
runs-on: ubuntu-latest
81+
runs-on:
82+
labels: ubuntu-latest-16-cores
11083
needs: [
11184
detect-noop,
11285
]
11386
if: needs.detect-noop.outputs.noop != 'true'
11487
steps:
115-
- name: Remove unnecessary files
116-
run: |
117-
sudo rm -rf /usr/share/dotnet
118-
sudo rm -rf /opt/ghc
119-
sudo rm -rf "/usr/local/share/boost"
120-
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
121-
12288
- name: Set up Go
12389
uses: actions/setup-go@v6
12490
with:
@@ -129,13 +95,13 @@ jobs:
12995

13096
- name: Install Ginkgo CLI
13197
run: |
132-
go install github.com/onsi/ginkgo/v2/ginkgo@v2.19.1
98+
go install github.com/onsi/ginkgo/v2/ginkgo@v2.23.4
13399
134100
- name: Install Kind
135101
# Before updating the kind version to use, verify that the current kind image
136102
# is still supported by the version.
137103
run: |
138-
go install sigs.k8s.io/kind@v0.22.0
104+
go install sigs.k8s.io/kind@v0.30.0
139105
140106
- name: Run e2e tests
141107
run: |
@@ -162,15 +128,18 @@ jobs:
162128

163129
- name: Collect logs
164130
if: always()
131+
# Wait for a bit before log collection; this gives the agent pods some time to shut down
132+
# gracefully and flush their logs.
165133
run: |
134+
sleep 30
166135
make collect-e2e-logs
167136
env:
168137
KUBECONFIG: '/home/runner/.kube/config'
169138
LOG_DIR: 'logs-${{ matrix.customized-settings }}'
170139

171140
- name: Upload logs
172141
if: always()
173-
uses: actions/upload-artifact@v4
142+
uses: actions/upload-artifact@v5
174143
with:
175144
name: e2e-logs-${{ matrix.customized-settings }}
176145
path: test/e2e/logs-${{ matrix.customized-settings }}/

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v3
45+
uses: github/codeql-action/init@v4
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v3
59+
uses: github/codeql-action/autobuild@v4
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,4 +69,4 @@ jobs:
6969
# ./location_of_script_within_repo/buildscript.sh
7070

7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v3
72+
uses: github/codeql-action/analyze@v4

.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/checkout@v5
4848

4949
- name: Login to ${{ env.REGISTRY }}
50-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
50+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
5151
with:
5252
registry: ${{ env.REGISTRY }}
5353
username: ${{ github.actor }}

CLAUDE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ All controllers follow standard Kubernetes controller patterns:
209209
- Custom properties supported for scheduling decisions
210210

211211
### Multi-API Version Support
212-
- v1alpha1 APIs maintained for backward compatibility
213212
- v1beta1 APIs are current stable version
214213
- Feature flags control API version enablement
215214

0 commit comments

Comments
 (0)