Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
80f8ac1
Fix: Update admission decoder type from pointer to value in handlers
vishal210893 Jun 18, 2025
2faa336
Chore: Upgrade controller-gen version to v0.18.0 and refactor decoder…
vishal210893 Jun 18, 2025
7886d41
Chore: Upgrade ginkgo to v2 and update import paths in test files
vishal210893 Jun 19, 2025
83b0e66
Chore: Refactor feature gate handling in workflow tests
vishal210893 Jun 22, 2025
8d90f36
Chore: Remove unused done channel from BeforeSuite in test files
vishal210893 Jun 22, 2025
daa557e
Chore: Refactor feature gate handling in workflow tests
vishal210893 Jun 22, 2025
f71dce2
Chore: Update decoder handling in test files for consistency
vishal210893 Jun 22, 2025
958a403
Chore: Upgrade Kubernetes version to v1.31.10 in unit-test.yaml
vishal210893 Jun 23, 2025
e21c63a
Chore: Removed KIND version from unit-test.yaml
vishal210893 Jun 23, 2025
3dc1ad0
Chore: Update backport action to use korthout/backport-action@v3
vishal210893 Jun 23, 2025
45af50b
Chore: Upgrade Kubernetes dependencies to v0.31.10 in go.mod
vishal210893 Jun 23, 2025
082b465
Chore: Upgrade K3D image version to v1.31.10 and refactor feature gat…
vishal210893 Jun 23, 2025
6a3d9c7
Chore: Downgrade controller-tools version to v0.16 in dependency.mk
vishal210893 Jun 23, 2025
d0d893d
Chore: Update K3D image version to v1.31 in e2e.yaml
vishal210893 Jun 23, 2025
302f81a
Chore: Downgrade go-cmp and ginkgo/gomega versions in go.mod and go.sum
vishal210893 Jun 23, 2025
787e718
chore: sets timeout in beforeeach nodes
roguepikachu Jun 25, 2025
764a727
chore: updates controller runtime version
roguepikachu Jun 25, 2025
aad3834
chore: fixes linter warnings
roguepikachu Jun 25, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/back-port.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
if: github.event.pull_request.merged
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Open Backport PR
uses: zeebe-io/backport-action@v0.0.6
uses: korthout/backport-action@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
github_workspace: ${{ github.workspace }}
19 changes: 10 additions & 9 deletions .github/workflows/chart.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: HelmChart

on:
push:
tags:
Expand All @@ -9,7 +10,7 @@ jobs:
publish-images:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4
- name: Get the vars
id: vars
run: |
Expand All @@ -20,22 +21,22 @@ jobs:
fi
echo "GITVERSION=git-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Login ghcr.io
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Login Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
with:
driver-opts: image=moby/buildkit:master

- uses: docker/build-push-action@v2
- uses: docker/build-push-action@v3
name: Build & Pushing vela-workflow for Dockerhub
with:
context: .
Expand All @@ -58,17 +59,17 @@ jobs:
HELM_CHART: charts/vela-workflow
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4
- name: Get the vars
id: vars
run: |
echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
- name: Install Helm
uses: azure/setup-helm@v1
uses: azure/setup-helm@v4.3.0
with:
version: v3.4.0
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '14'
- uses: oprypin/find-latest-tag@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Build Vela Workflow image from Dockerfile
run: |
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ env:
# Common versions
GO_VERSION: '1.23.8'
GOLANGCI_VERSION: 'v1.60.1'
K3D_IMAGE_VERSION: '[\"v1.29\"]'
K3D_IMAGE_VERSIONS: '[\"v1.29\"]'
K3D_IMAGE_VERSION: '[\"v1.31\"]'
K3D_IMAGE_VERSIONS: '[\"v1.31\"]'

jobs:

Expand Down Expand Up @@ -64,10 +64,10 @@ jobs:

steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
run: make end-e2e

- name: Upload coverage report
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: /tmp/e2e-profile.out
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ jobs:

steps:
- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

- name: Cache Go Dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .work/pkg
key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
Expand All @@ -68,17 +68,17 @@ jobs:

steps:
- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

- name: Cache Go Dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .work/pkg
key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/issue-commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout Actions
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: "oam-dev/kubevela-github-actions"
path: ./actions
ref: v0.4.2
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '14'
cache: 'npm'
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
allow-edits: "false"
permission-level: read
- name: Handle Command
uses: actions/github-script@v4
uses: actions/github-script@v7
env:
VERSION: ${{ steps.command.outputs.command-arguments }}
with:
Expand All @@ -65,7 +65,7 @@ jobs:
})
console.log("Added '" + label + "' label.")
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Open Backport PR
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/post-submit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{ env.GO_VERSION }}

Expand All @@ -61,7 +61,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ env:
# Common versions
GO_VERSION: '1.23.8'
GOLANGCI_VERSION: 'v1.60.1'
KIND_VERSION: 'v0.23.0'

jobs:

Expand All @@ -40,18 +39,18 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true

- name: Cache Go Dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .work/pkg
key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
Expand All @@ -62,19 +61,19 @@ jobs:
sudo apt-get install -y golang-ginkgo-dev

- name: install Kubebuilder
uses: RyanSiu1995/kubebuilder-action@v1.2
uses: RyanSiu1995/kubebuilder-action@v1.3.1
with:
version: 3.15.1
kubebuilderOnly: false
kubernetesVersion: v1.29.0
kubernetesVersion: v1.31.10

- name: Run Make test
run: make test

- name: Upload coverage report
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.txt
files: ./coverage.txt
flags: unit-test
name: codecov-umbrella
23 changes: 3 additions & 20 deletions charts/vela-workflow/crds/core.oam.dev_workflowruns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.18.0
name: workflowruns.core.oam.dev
spec:
group: core.oam.dev
Expand Down Expand Up @@ -246,24 +246,8 @@ spec:
type: object
type: array
contextBackend:
description: |-
ObjectReference contains enough information to let you inspect or modify the referred object.
---
New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs.
1. Ignored fields. It includes many fields which are not generally honored. For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage.
2. Invalid usage help. It is impossible to add specific help for individual usage. In most embedded usages, there are particular
restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted".
Those cannot be well described when embedded.
3. Inconsistent validation. Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen.
4. The fields are both imprecise and overly precise. Kind is not a precise mapping to a URL. This can produce ambiguity
during interpretation and require a REST mapping. In most cases, the dependency is on the group,resource tuple
and the version of the actual struct is irrelevant.
5. We cannot easily change it. Because this type is embedded in many locations, updates to this type
will affect numerous schemas. Don't make new APIs embed an underspecified API type they do not control.


Instead of using this type, create a locally provided and used type that is well-focused on your reference.
For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 .
description: ObjectReference contains enough information to let you
inspect or modify the referred object.
properties:
apiVersion:
description: API version of the referent.
Expand All @@ -277,7 +261,6 @@ spec:
the event) or if no container name is specified "spec.containers[2]" (container with
index 2 in this pod). This syntax is chosen only to have some well-defined way of
referencing a part of an object.
TODO: this design is not final and this field is subject to change in the future.
type: string
kind:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion charts/vela-workflow/crds/core.oam.dev_workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.18.0
name: workflows.core.oam.dev
spec:
group: core.oam.dev
Expand Down
2 changes: 1 addition & 1 deletion controllers/backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"time"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
8 changes: 4 additions & 4 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ package controllers
import (
"path/filepath"
"testing"
"time"

"github.com/crossplane/crossplane-runtime/pkg/event"
cuexv1alpha1 "github.com/kubevela/pkg/apis/cue/v1alpha1"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down Expand Up @@ -56,7 +57,7 @@ func TestAPIs(t *testing.T) {
RunSpecs(t, "Controller Suite")
}

var _ = BeforeSuite(func() {
var _ = BeforeSuite(func(ctx SpecContext) {
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))

By("bootstrapping test environment")
Expand Down Expand Up @@ -91,8 +92,7 @@ var _ = BeforeSuite(func() {
Scheme: testScheme,
Recorder: event.NewAPIRecorder(recorder),
}

}, 60)
}, NodeTimeout(1*time.Minute))

var _ = AfterSuite(func() {
By("tearing down the test environment")
Expand Down
Loading
Loading