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.

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

feat(api): drop v1alpha1 API #5934

Merged
merged 1 commit into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ resources:
- group: camel
kind: Kamelet
version: v1
- group: camel
kind: KameletBinding
version: v1alpha1
version: "3"
plugins:
go.sdk.operatorframework.io/v2-alpha: {}
5 changes: 1 addition & 4 deletions e2e/support/test_support.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ import (
"github.com/apache/camel-k/v2/e2e/support/util"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/client"
"github.com/apache/camel-k/v2/pkg/cmd"
"github.com/apache/camel-k/v2/pkg/install"
Expand All @@ -101,8 +100,7 @@ const ciPID = "/tmp/ci-k8s-pid"
// v1.Build, v1.Integration
// v1.IntegrationKit, v1.IntegrationPlatform, v1.IntegrationProfile
// v1.Kamelet, v1.Pipe,
// v1alpha1.Kamelet, v1alpha1.KameletBinding
const ExpectedCRDs = 9
const ExpectedCRDs = 7

// camel-k-operator,
// camel-k-operator-events,
Expand Down Expand Up @@ -2235,7 +2233,6 @@ func CRDs(t *testing.T) func() []metav1.APIResource {
reflect.TypeOf(v1.IntegrationProfile{}).Name(),
reflect.TypeOf(v1.Kamelet{}).Name(),
reflect.TypeOf(v1.Pipe{}).Name(),
reflect.TypeOf(v1alpha1.KameletBinding{}).Name(),
}

versions := []string{"v1", "v1alpha1"}
Expand Down
10,999 changes: 681 additions & 10,318 deletions helm/camel-k/crds/camel-k-crds.yaml

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions helm/camel-k/templates/operator-cluster-roles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ rules:
- integrationprofiles
- integrations
- pipes
# Deprecated: kameletbindings CR
- kameletbindings
- kamelets
verbs:
- create
- delete
Expand All @@ -61,9 +58,6 @@ rules:
- integrations/status
- pipes/status
- pipes/scale
# Deprecated: kameletbindings CR
- kameletbindings/status
- kameletbindings/scale
- kamelets/status
verbs:
- get
Expand All @@ -90,8 +84,6 @@ rules:
- integrationprofiles
- integrations
- pipes
# Deprecated: kameletbindings CR
- kameletbindings
- kamelets
verbs:
- create
Expand All @@ -118,9 +110,6 @@ rules:
- integrations/status
- pipes/status
- pipes/scale
# Deprecated: kameletbindings CR
- kameletbindings/status
- kameletbindings/scale
- kamelets/status
verbs:
- get
Expand Down Expand Up @@ -477,7 +466,6 @@ rules:
- integrationprofiles/finalizers
- integrations/finalizers
- pipes/finalizers
- kameletbindings/finalizers
verbs:
- update
- apiGroups:
Expand Down
6 changes: 0 additions & 6 deletions helm/camel-k/templates/operator-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ rules:
- integrationprofiles
- integrations
- pipes
# Deprecated: kameletbindings CR
- kameletbindings
- kamelets
verbs:
- create
Expand Down Expand Up @@ -70,9 +68,6 @@ rules:
- integrations/status
- pipes/status
- pipes/scale
# Deprecated: kameletbindings CR
- kameletbindings/status
- kameletbindings/scale
- kamelets/status
verbs:
- get
Expand Down Expand Up @@ -285,7 +280,6 @@ rules:
- integrationprofiles/finalizers
- integrations/finalizers
- pipes/finalizers
- kameletbindings/finalizers
verbs:
- update
- apiGroups:
Expand Down
25 changes: 0 additions & 25 deletions pkg/apis/addtoscheme_camel_v1alpha1.go

This file was deleted.

21 changes: 0 additions & 21 deletions pkg/apis/camel/v1alpha1/doc.go

This file was deleted.

57 changes: 0 additions & 57 deletions pkg/apis/camel/v1alpha1/error_handler_types.go

This file was deleted.

145 changes: 0 additions & 145 deletions pkg/apis/camel/v1alpha1/error_handler_types_support.go

This file was deleted.

Loading