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.

Sign up for GitHub

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

Jump to bottom

remove flows v1alpha1 api #3264

Merged
merged 2 commits into from
Jun 4, 2020
Merged

remove flows v1alpha1 api #3264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf5a8a7
remove flows v1alpha1 api
vaikas Jun 3, 2020
6e740fe
point to v1beta1 reconciler testing
vaikas Jun 3, 2020
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
24 changes: 0 additions & 24 deletions cmd/webhook/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ import (
defaultconfig "knative.dev/eventing/pkg/apis/config"
configsv1alpha1 "knative.dev/eventing/pkg/apis/configs/v1alpha1"
eventingv1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1"
"knative.dev/eventing/pkg/apis/flows"
flowsv1alpha1 "knative.dev/eventing/pkg/apis/flows/v1alpha1"
flowsv1beta1 "knative.dev/eventing/pkg/apis/flows/v1beta1"
"knative.dev/eventing/pkg/apis/messaging"
channeldefaultconfig "knative.dev/eventing/pkg/apis/messaging/config"
Expand Down Expand Up @@ -87,9 +85,6 @@ var ourTypes = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
sourcesv1alpha2.SchemeGroupVersion.WithKind("ContainerSource"): &sourcesv1alpha2.ContainerSource{},

// For group flows.knative.dev
// v1alpha1
flowsv1alpha1.SchemeGroupVersion.WithKind("Parallel"): &flowsv1alpha1.Parallel{},
flowsv1alpha1.SchemeGroupVersion.WithKind("Sequence"): &flowsv1alpha1.Sequence{},
// v1beta1
flowsv1beta1.SchemeGroupVersion.WithKind("Parallel"): &flowsv1beta1.Parallel{},
flowsv1beta1.SchemeGroupVersion.WithKind("Sequence"): &flowsv1beta1.Sequence{},
Expand Down Expand Up @@ -224,8 +219,6 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
var (
messagingv1alpha1_ = messagingv1alpha1.SchemeGroupVersion.Version
messagingv1beta1_ = messagingv1beta1.SchemeGroupVersion.Version
flowsv1alpha1_ = flowsv1alpha1.SchemeGroupVersion.Version
flowsv1beta1_ = flowsv1beta1.SchemeGroupVersion.Version
sourcesv1alpha1_ = sourcesv1alpha1.SchemeGroupVersion.Version
sourcesv1alpha2_ = sourcesv1alpha2.SchemeGroupVersion.Version
)
Expand Down Expand Up @@ -253,23 +246,6 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
messagingv1beta1_: &messagingv1beta1.InMemoryChannel{},
},
},
// flows
flowsv1beta1.Kind("Sequence"): {
DefinitionName: flows.SequenceResource.String(),
HubVersion: flowsv1alpha1_,
Zygotes: map[string]conversion.ConvertibleObject{
flowsv1alpha1_: &flowsv1alpha1.Sequence{},
flowsv1beta1_: &flowsv1beta1.Sequence{},
},
},
flowsv1beta1.Kind("Parallel"): {
DefinitionName: flows.ParallelResource.String(),
HubVersion: flowsv1alpha1_,
Zygotes: map[string]conversion.ConvertibleObject{
flowsv1alpha1_: &flowsv1alpha1.Parallel{},
flowsv1beta1_: &flowsv1beta1.Parallel{},
},
},
// Sources
sourcesv1alpha2.Kind("ApiServerSource"): {
DefinitionName: sources.ApiServerSourceResource.String(),
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/parallel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
JSONPath: .metadata.creationTimestamp
versions:
- name: v1alpha1
served: true
served: false
storage: false
- name: v1beta1
served: true
Expand Down
2 changes: 1 addition & 1 deletion config/core/resources/sequence.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
JSONPath: .metadata.creationTimestamp
versions:
- name: v1alpha1
served: true
served: false
storage: false
- name: v1beta1
served: true
Expand Down
4 changes: 2 additions & 2 deletions hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ chmod +x ${CODEGEN_PKG}/generate-groups.sh
# instead of the $GOPATH directly. For normal projects this can be dropped.
${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
knative.dev/eventing/pkg/client knative.dev/eventing/pkg/apis \
"eventing:v1beta1 messaging:v1alpha1 messaging:v1beta1 flows:v1alpha1 flows:v1beta1 sources:v1alpha1 sources:v1alpha2 configs:v1alpha1" \
"eventing:v1beta1 messaging:v1alpha1 messaging:v1beta1 flows:v1beta1 sources:v1alpha1 sources:v1alpha2 configs:v1alpha1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

# Deep copy config
Expand All @@ -65,7 +65,7 @@ ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
chmod +x ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh
${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
knative.dev/eventing/pkg/client knative.dev/eventing/pkg/apis \
"eventing:v1beta1 messaging:v1alpha1 messaging:v1beta1 flows:v1alpha1 flows:v1beta1 sources:v1alpha1 sources:v1alpha2 duck:v1alpha1 duck:v1beta1 configs:v1alpha1" \
"eventing:v1beta1 messaging:v1alpha1 messaging:v1beta1 flows:v1beta1 sources:v1alpha1 sources:v1alpha2 duck:v1alpha1 duck:v1beta1 configs:v1alpha1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

# Make sure our dependencies are up-to-date
Expand Down
20 changes: 0 additions & 20 deletions pkg/apis/flows/v1alpha1/doc.go
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions pkg/apis/flows/v1alpha1/implements_test.go
View file
Open in desktop

This file was deleted.

132 changes: 0 additions & 132 deletions pkg/apis/flows/v1alpha1/parallel_conversion.go
View file
Open in desktop

This file was deleted.

Loading