Skip to content

Commit f512509

Browse files
committed
Merge branch 'main' of https://github.com/kubefleet-dev/kubefleet into fix/sort-bindings-in-scheduler
2 parents 7e4489d + 0f449dc commit f512509

29 files changed

+1403
-450
lines changed

.github/workflows/chart.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
deploy:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/[email protected].0
21+
- uses: actions/[email protected].1
2222
with:
2323
submodules: true
2424
fetch-depth: 0

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
go-version: ${{ env.GO_VERSION }}
4141

4242
- name: Check out code into the Go module directory
43-
uses: actions/[email protected].0
43+
uses: actions/[email protected].1
4444

4545
- name: Set up Ginkgo CLI
4646
run: |
@@ -91,7 +91,7 @@ jobs:
9191
go-version: ${{ env.GO_VERSION }}
9292

9393
- name: Check out code into the Go module directory
94-
uses: actions/[email protected].0
94+
uses: actions/[email protected].1
9595

9696
- name: Install Ginkgo CLI
9797
run: |

.github/workflows/code-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
go-version: ${{ env.GO_VERSION }}
4444

4545
- name: Checkout
46-
uses: actions/[email protected].0
46+
uses: actions/[email protected].1
4747
with:
4848
submodules: true
4949

@@ -64,7 +64,7 @@ jobs:
6464
go-version: ${{ env.GO_VERSION }}
6565

6666
- name: Check out code into the Go module directory
67-
uses: actions/[email protected].0
67+
uses: actions/[email protected].1
6868

6969
- name: golangci-lint
7070
run: make lint

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/[email protected].0
41+
uses: actions/[email protected].1
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL

.github/workflows/codespell.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Harden Runner
15-
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
15+
uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
1616
with:
1717
egress-policy: audit
1818

19-
- uses: actions/checkout@c2d88d3ecc89a9ef08eebf45d9637801dcee7eb5 # v4.1.7
19+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4.1.7
2020
- uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # master
2121
with:
2222
check_filenames: true

.github/workflows/markdown-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
markdown-link-check:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/[email protected].0
13+
- uses: actions/[email protected].1
1414
- uses: tcort/github-action-markdown-link-check@v1
1515
with:
1616
# this will only show errors in the output

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
tag: ${{ steps.export.outputs.tag }}
3131
steps:
3232
- name: Checkout code
33-
uses: actions/[email protected].0
33+
uses: actions/[email protected].1
3434

3535
- id: export
3636
run: |
@@ -64,7 +64,7 @@ jobs:
6464
go-version: ${{ env.GO_VERSION }}
6565

6666
- name: Checkout code
67-
uses: actions/[email protected].0
67+
uses: actions/[email protected].1
6868

6969
- name: Login to ghcr.io
7070
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef

.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
go-version: ${{ env.GO_VERSION }}
4545

4646
- name: Checkout code
47-
uses: actions/[email protected].0
47+
uses: actions/[email protected].1
4848

4949
- name: Login to ${{ env.REGISTRY }}
5050
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef

.github/workflows/upgrade.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
go-version: ${{ env.GO_VERSION }}
4545

4646
- name: Check out code into the Go module directory
47-
uses: actions/[email protected].0
47+
uses: actions/[email protected].1
4848
with:
4949
# Fetch the history of all branches and tags.
5050
# This is needed for the test suite to switch between releases.
@@ -127,7 +127,7 @@ jobs:
127127
go-version: ${{ env.GO_VERSION }}
128128

129129
- name: Check out code into the Go module directory
130-
uses: actions/[email protected].0
130+
uses: actions/[email protected].1
131131
with:
132132
# Fetch the history of all branches and tags.
133133
# This is needed for the test suite to switch between releases.
@@ -210,7 +210,7 @@ jobs:
210210
go-version: ${{ env.GO_VERSION }}
211211

212212
- name: Check out code into the Go module directory
213-
uses: actions/[email protected].0
213+
uses: actions/[email protected].1
214214
with:
215215
# Fetch the history of all branches and tags.
216216
# This is needed for the test suite to switch between releases.

apis/placement/v1beta1/commons.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,10 @@ const (
156156
UpdateRunFinalizer = FleetPrefix + "stagedupdaterun-finalizer"
157157

158158
// TargetUpdateRunLabel indicates the target update run on a staged run related object.
159-
TargetUpdateRunLabel = FleetPrefix + "targetupdaterun"
159+
TargetUpdateRunLabel = FleetPrefix + "targetUpdateRun"
160+
161+
// TaskTypeLabel indicates the task type (before-stage or after-stage) on a staged run related object.
162+
TaskTypeLabel = FleetPrefix + "taskType"
160163

161164
// UpdateRunDeleteStageName is the name of delete stage in the staged update run.
162165
UpdateRunDeleteStageName = FleetPrefix + "deleteStage"
@@ -167,6 +170,12 @@ const (
167170
// TargetUpdatingStageNameLabel indicates the updating stage name on a staged run related object.
168171
TargetUpdatingStageNameLabel = FleetPrefix + "targetUpdatingStage"
169172

173+
// BeforeStageTaskLabelValue is the before stage task label value.
174+
BeforeStageTaskLabelValue = "beforeStage"
175+
176+
// AfterStageTaskLabelValue is the after stage task label value.
177+
AfterStageTaskLabelValue = "afterStage"
178+
170179
// BeforeStageApprovalTaskNameFmt is the format of the before stage approval task name.
171180
BeforeStageApprovalTaskNameFmt = "%s-before-%s"
172181

0 commit comments

Comments
 (0)