Skip to content

Commit 58fdc4f

Browse files
authored
Merge branch 'karmada-io:master' into master
2 parents a239529 + ba1e68d commit 58fdc4f

File tree

4,176 files changed

+326555
-144782
lines changed

Some content is hidden

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

4,176 files changed

+326555
-144782
lines changed

Diff for: .github/dependabot.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ updates:
1919

2020
- package-ecosystem: docker
2121
directory: /cluster/images/
22-
target-branch: "release-1.10"
22+
target-branch: "release-1.12"
2323
schedule:
2424
interval: weekly
2525

2626
- package-ecosystem: docker
2727
directory: /cluster/images/
28-
target-branch: "release-1.9"
28+
target-branch: "release-1.11"
2929
schedule:
3030
interval: weekly
3131

3232
- package-ecosystem: docker
3333
directory: /cluster/images/
34-
target-branch: "release-1.8"
34+
target-branch: "release-1.10"
3535
schedule:
3636
interval: weekly

Diff for: .github/workflows/ci-image-scanning-on-schedule.yml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: image-scanning-on-schedule
2+
on:
3+
schedule:
4+
# Run this workflow "At 00:00 UTC on Sunday"
5+
- cron: '0 0 * * 0'
6+
permissions:
7+
contents: read
8+
jobs:
9+
use-trivy-to-scan-image:
10+
permissions:
11+
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
12+
name: image-scanning
13+
if: ${{ github.repository == 'karmada-io/karmada' }}
14+
runs-on: ubuntu-22.04
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
target:
19+
- karmada-controller-manager
20+
- karmada-scheduler
21+
- karmada-descheduler
22+
- karmada-webhook
23+
- karmada-agent
24+
- karmada-scheduler-estimator
25+
- karmada-interpreter-webhook-example
26+
- karmada-aggregated-apiserver
27+
- karmada-search
28+
- karmada-operator
29+
- karmada-metrics-adapter
30+
karmada-version: [ release-1.12, release-1.11, release-1.10 ]
31+
steps:
32+
- name: checkout code
33+
uses: actions/checkout@v4
34+
with:
35+
ref: ${{ matrix.karmada-version }}
36+
- name: install Go
37+
uses: actions/setup-go@v5
38+
with:
39+
go-version-file: go.mod
40+
- id: gen_git_info
41+
run: |
42+
echo "ref=$(git rev-parse --symbolic-full-name HEAD)" >> "$GITHUB_OUTPUT"
43+
echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
44+
- name: Build images from Dockerfile
45+
run: |
46+
export VERSION=${{ matrix.karmada-version }}
47+
export REGISTRY="docker.io/karmada"
48+
make image-${{ matrix.target }}
49+
- name: Run Trivy vulnerability scanner
50+
uses: aquasecurity/[email protected]
51+
env:
52+
ACTIONS_RUNTIME_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53+
TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
54+
with:
55+
image-ref: 'docker.io/karmada/${{ matrix.target }}:${{ matrix.karmada-version }}'
56+
format: 'sarif'
57+
ignore-unfixed: true
58+
vuln-type: 'os,library'
59+
output: '${{ matrix.target }}:${{ matrix.karmada-version }}.trivy-results.sarif'
60+
- name: display scan results
61+
uses: aquasecurity/[email protected]
62+
env:
63+
TRIVY_SKIP_DB_UPDATE: true # Avoid updating the vulnerability db as it was cached in the previous step.
64+
with:
65+
image-ref: 'docker.io/karmada/${{ matrix.target }}:${{ matrix.karmada-version }}'
66+
format: 'table'
67+
ignore-unfixed: true
68+
vuln-type: 'os,library'
69+
- name: Upload Trivy scan results to GitHub Security tab
70+
uses: github/codeql-action/upload-sarif@v3
71+
with:
72+
sarif_file: '${{ matrix.target }}:${{ matrix.karmada-version }}.trivy-results.sarif'
73+
ref: ${{steps.gen_git_info.outputs.ref}}
74+
sha: ${{steps.gen_git_info.outputs.sha}}

Diff for: .github/workflows/ci-image-scanning.yaml

+67-58
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,67 @@
1-
name: image-scanning
2-
on:
3-
push:
4-
# Exclude branches created by Dependabot to avoid triggering current workflow
5-
# for PRs initiated by Dependabot.
6-
branches-ignore:
7-
- 'dependabot/**'
8-
permissions:
9-
contents: read
10-
jobs:
11-
use-trivy-to-scan-image:
12-
permissions:
13-
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
14-
name: image-scanning
15-
if: ${{ github.repository == 'karmada-io/karmada' }}
16-
runs-on: ubuntu-22.04
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
target:
21-
- karmada-controller-manager
22-
- karmada-scheduler
23-
- karmada-descheduler
24-
- karmada-webhook
25-
- karmada-agent
26-
- karmada-scheduler-estimator
27-
- karmada-interpreter-webhook-example
28-
- karmada-aggregated-apiserver
29-
- karmada-search
30-
- karmada-operator
31-
- karmada-metrics-adapter
32-
steps:
33-
- name: checkout code
34-
uses: actions/checkout@v4
35-
- name: Build an image from Dockerfile
36-
run: |
37-
export VERSION="latest"
38-
export REGISTRY="docker.io/karmada"
39-
make image-${{ matrix.target }}
40-
- name: Run Trivy vulnerability scanner
41-
uses: aquasecurity/[email protected]
42-
with:
43-
image-ref: 'docker.io/karmada/${{ matrix.target }}:latest'
44-
format: 'sarif'
45-
ignore-unfixed: true
46-
vuln-type: 'os,library'
47-
output: 'trivy-results.sarif'
48-
- name: display scan results
49-
uses: aquasecurity/[email protected]
50-
with:
51-
image-ref: 'docker.io/karmada/${{ matrix.target }}:latest'
52-
format: 'table'
53-
ignore-unfixed: true
54-
vuln-type: 'os,library'
55-
- name: Upload Trivy scan results to GitHub Security tab
56-
uses: github/codeql-action/upload-sarif@v3
57-
with:
58-
sarif_file: 'trivy-results.sarif'
1+
name: image-scanning
2+
on:
3+
push:
4+
# Exclude branches created by Dependabot to avoid triggering current workflow
5+
# for PRs initiated by Dependabot.
6+
branches-ignore:
7+
- 'dependabot/**'
8+
permissions:
9+
contents: read
10+
jobs:
11+
use-trivy-to-scan-image:
12+
permissions:
13+
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
14+
name: image-scanning
15+
if: ${{ github.repository == 'karmada-io/karmada' }}
16+
runs-on: ubuntu-22.04
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
target:
21+
- karmada-controller-manager
22+
- karmada-scheduler
23+
- karmada-descheduler
24+
- karmada-webhook
25+
- karmada-agent
26+
- karmada-scheduler-estimator
27+
- karmada-interpreter-webhook-example
28+
- karmada-aggregated-apiserver
29+
- karmada-search
30+
- karmada-operator
31+
- karmada-metrics-adapter
32+
steps:
33+
- name: checkout code
34+
uses: actions/checkout@v4
35+
- name: install Go
36+
uses: actions/setup-go@v5
37+
with:
38+
go-version-file: go.mod
39+
- name: Build an image from Dockerfile
40+
run: |
41+
export VERSION="latest"
42+
export REGISTRY="docker.io/karmada"
43+
make image-${{ matrix.target }}
44+
- name: Run Trivy vulnerability scanner
45+
uses: aquasecurity/[email protected]
46+
env:
47+
ACTIONS_RUNTIME_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48+
TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
49+
with:
50+
image-ref: 'docker.io/karmada/${{ matrix.target }}:latest'
51+
format: 'sarif'
52+
ignore-unfixed: true
53+
vuln-type: 'os,library'
54+
output: 'trivy-results.sarif'
55+
- name: display scan results
56+
uses: aquasecurity/[email protected]
57+
env:
58+
TRIVY_SKIP_DB_UPDATE: true # Avoid updating the vulnerability db as it was cached in the previous step.
59+
with:
60+
image-ref: 'docker.io/karmada/${{ matrix.target }}:latest'
61+
format: 'table'
62+
ignore-unfixed: true
63+
vuln-type: 'os,library'
64+
- name: Upload Trivy scan results to GitHub Security tab
65+
uses: github/codeql-action/upload-sarif@v3
66+
with:
67+
sarif_file: 'trivy-results.sarif'

Diff for: .github/workflows/ci-schedule-compatibility.yaml

+7-17
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
# Run this workflow "At 20:00 UTC on Sunday and Saturday"
55
- cron: '0 20 * * 0,6'
66

7+
permissions:
8+
contents: read # Required by actions/checkout to fetch the repository contents.
9+
710
jobs:
811
e2e:
912
name: e2e test
@@ -16,8 +19,10 @@ jobs:
1619
max-parallel: 5
1720
fail-fast: false
1821
matrix:
19-
kubeapiserver-version: [ v1.23.4, v1.24.2, v1.25.0, v1.26.0, v1.27.3, v1.28.0, v1.29.0, v1.30.0 ]
20-
karmada-version: [ release-1.10, release-1.9, release-1.8 ]
22+
kubeapiserver-version: [ v1.23.4, v1.24.2, v1.25.0, v1.26.0, v1.27.3, v1.28.0, v1.29.0, v1.30.0, v1.31.0 ]
23+
karmada-version: [ master, release-1.12, release-1.11, release-1.10 ]
24+
env:
25+
KARMADA_APISERVER_VERSION: ${{ matrix.kubeapiserver-version }}
2126
steps:
2227
# Free up disk space on Ubuntu
2328
- name: Free Disk Space (Ubuntu)
@@ -50,21 +55,6 @@ jobs:
5055
timeout_minutes: 20
5156
command: |
5257
hack/local-up-karmada.sh
53-
- name: change kube-apiserver and kube-controller-manager version
54-
run: |
55-
# Update images
56-
kubectl --kubeconfig=${HOME}/.kube/karmada.config --context=karmada-host \
57-
set image deployment/karmada-apiserver -nkarmada-system \
58-
karmada-apiserver=registry.k8s.io/kube-apiserver:${{ matrix.kubeapiserver-version }}
59-
kubectl --kubeconfig=${HOME}/.kube/karmada.config --context=karmada-host \
60-
set image deployment/karmada-kube-controller-manager -nkarmada-system \
61-
kube-controller-manager=registry.k8s.io/kube-controller-manager:${{ matrix.kubeapiserver-version }}
62-
63-
# Wait ready
64-
kubectl --kubeconfig=${HOME}/.kube/karmada.config --context=karmada-host \
65-
rollout status deployment/karmada-kube-controller-manager -nkarmada-system --timeout=5m
66-
kubectl --kubeconfig=${HOME}/.kube/karmada.config --context=karmada-host \
67-
rollout status deployment/karmada-apiserver -nkarmada-system --timeout=5m
6858
- name: run e2e
6959
run: |
7060
export ARTIFACTS_PATH=${{ github.workspace }}/karmada-e2e-logs/${{ matrix.kubeapiserver-version }}-${{ matrix.karmada-version }}/

Diff for: .github/workflows/ci-schedule.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ on:
33
schedule:
44
# Run this workflow "At 18:00 UTC on Sunday and Saturday"
55
- cron: '0 18 * * 0,6'
6+
7+
permissions:
8+
contents: read
69

710
jobs:
811
e2e:
@@ -16,7 +19,7 @@ jobs:
1619
max-parallel: 5
1720
fail-fast: false
1821
matrix:
19-
k8s: [ v1.23.4, v1.24.2, v1.25.0, v1.26.0, v1.27.3, v1.28.0, v1.29.0, v1.30.0 ]
22+
k8s: [ v1.23.4, v1.24.2, v1.25.0, v1.26.0, v1.27.3, v1.28.0, v1.29.0, v1.30.0, v1.31.0 ]
2023
steps:
2124
# Free up disk space on Ubuntu
2225
- name: Free Disk Space (Ubuntu)

Diff for: .github/workflows/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.actor }}-${{ github.head_ref || github.run_id }}
1414
cancel-in-progress: true
15+
permissions:
16+
contents: read # for actions/checkout to fetch code
1517
jobs:
1618
golangci:
1719
name: lint
@@ -94,7 +96,7 @@ jobs:
9496
# Prevent running from the forked repository that doesn't need to upload coverage.
9597
# In addition, running on the forked repository would fail as missing the necessary secret.
9698
if: ${{ github.repository == 'karmada-io/karmada' }}
97-
uses: codecov/codecov-action@v4
99+
uses: codecov/codecov-action@v5
98100
with:
99101
# Even though token upload token is not required for public repos,
100102
# but adding a token might increase successful uploads as per:
@@ -114,7 +116,7 @@ jobs:
114116
# Here support the latest three minor releases of Kubernetes, this can be considered to be roughly
115117
# the same as the End of Life of the Kubernetes release: https://kubernetes.io/releases/
116118
# Please remember to update the CI Schedule Workflow when we add a new version.
117-
k8s: [ v1.28.0, v1.29.0, v1.30.0 ]
119+
k8s: [ v1.29.0, v1.30.0, v1.31.0 ]
118120
steps:
119121
# Free up disk space on Ubuntu
120122
- name: Free Disk Space (Ubuntu)

Diff for: .github/workflows/cli.yaml

-58
This file was deleted.

Diff for: .github/workflows/dockerhub-latest-chart.yml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ jobs:
2222
# 0 indicates all history for all branches and tags.
2323
# for `git describe --tags` in Makefile.
2424
fetch-depth: 0
25+
- name: install Go
26+
uses: actions/setup-go@v5
27+
with:
28+
go-version-file: go.mod
2529
- name: login to DockerHub
2630
uses: docker/login-action@v3
2731
with:

Diff for: .github/workflows/dockerhub-latest-image.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
go-version-file: go.mod
4444
- name: Install Cosign
45-
uses: sigstore/cosign-installer@v3.5.0
45+
uses: sigstore/cosign-installer@v3.7.0
4646
with:
4747
cosign-release: 'v2.2.3'
4848
- name: install QEMU

0 commit comments

Comments
 (0)