remove v1alpha1 sources APIs

knative · Apr 27, 2021 · 0057654 · 0057654
1 parent 83a1713
commit 0057654
Show file tree

Hide file tree

Showing 67 changed files with 5 additions and 5,722 deletions.
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -49,7 +49,6 @@ import (
 	"knative.dev/eventing/pkg/apis/sources"
 	pingdefaultconfig "knative.dev/eventing/pkg/apis/sources/config"
 	sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1"
-	sourcesv1alpha1 "knative.dev/eventing/pkg/apis/sources/v1alpha1"
 	sourcesv1alpha2 "knative.dev/eventing/pkg/apis/sources/v1alpha2"
 	sourcesv1beta1 "knative.dev/eventing/pkg/apis/sources/v1beta1"
 	sourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2"
@@ -71,9 +70,6 @@ var ourTypes = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
 	messagingv1.SchemeGroupVersion.WithKind("Subscription"):    &messagingv1.Subscription{},
 
 	// For group sources.knative.dev.
-	// v1alpha1
-	sourcesv1alpha1.SchemeGroupVersion.WithKind("ApiServerSource"): &sourcesv1alpha1.ApiServerSource{},
-	sourcesv1alpha1.SchemeGroupVersion.WithKind("SinkBinding"):     &sourcesv1alpha1.SinkBinding{},
 	// v1alpha2
 	sourcesv1alpha2.SchemeGroupVersion.WithKind("ApiServerSource"): &sourcesv1alpha2.ApiServerSource{},
 	sourcesv1alpha2.SchemeGroupVersion.WithKind("PingSource"):      &sourcesv1alpha2.PingSource{},
@@ -223,7 +219,6 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 	}
 
 	var (
-		sourcesv1alpha1_ = sourcesv1alpha1.SchemeGroupVersion.Version
 		sourcesv1alpha2_ = sourcesv1alpha2.SchemeGroupVersion.Version
 		sourcesv1beta1_  = sourcesv1beta1.SchemeGroupVersion.Version
 		sourcesv1beta2_  = sourcesv1beta2.SchemeGroupVersion.Version
@@ -239,9 +234,8 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 			// Sources
 			sourcesv1.Kind("ApiServerSource"): {
 				DefinitionName: sources.ApiServerSourceResource.String(),
-				HubVersion:     sourcesv1alpha1_,
+				HubVersion:     sourcesv1alpha2_,
 				Zygotes: map[string]conversion.ConvertibleObject{
-					sourcesv1alpha1_: &sourcesv1alpha1.ApiServerSource{},
 					sourcesv1alpha2_: &sourcesv1alpha2.ApiServerSource{},
 					sourcesv1beta1_:  &sourcesv1beta1.ApiServerSource{},
 					sourcesv1_:       &sourcesv1.ApiServerSource{},
@@ -258,9 +252,8 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 			},
 			sourcesv1.Kind("SinkBinding"): {
 				DefinitionName: sources.SinkBindingResource.String(),
-				HubVersion:     sourcesv1alpha1_,
+				HubVersion:     sourcesv1alpha2_,
 				Zygotes: map[string]conversion.ConvertibleObject{
-					sourcesv1alpha1_: &sourcesv1alpha1.SinkBinding{},
 					sourcesv1alpha2_: &sourcesv1alpha2.SinkBinding{},
 					sourcesv1beta1_:  &sourcesv1beta1.SinkBinding{},
 					sourcesv1_:       &sourcesv1.SinkBinding{},

diff --git a/config/core/resources/apiserversource.yaml b/config/core/resources/apiserversource.yaml
diff --git a/config/core/resources/sinkbindings.yaml b/config/core/resources/sinkbindings.yaml
@@ -26,11 +26,9 @@ spec:
   group: sources.knative.dev
   versions:
     - &version
-      name: v1alpha1
+      name: v1alpha2
       served: true
       storage: false
-      subresources:
-        status: {}
       schema:
         openAPIV3Schema:
           type: object
@@ -52,10 +50,6 @@ spec:
         - name: Reason
           type: string
           jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
-    - <<: *version
-      name: v1alpha2
-      served: true
-      storage: false
     - <<: *version
       name: v1beta1
       served: true

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -38,7 +38,7 @@ group "Kubernetes Codegen"
 #                  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 eventing:v1 messaging:v1 flows:v1 sources:v1alpha1 sources:v1alpha2 sources:v1beta1 sources:v1beta2 sources:v1" \
+  "eventing:v1beta1 eventing:v1 messaging:v1 flows:v1 sources:v1alpha2 sources:v1beta1 sources:v1beta2 sources:v1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 
 # Deep copy config
@@ -59,7 +59,7 @@ group "Knative Codegen"
 # Knative Injection
 ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
   knative.dev/eventing/pkg/client knative.dev/eventing/pkg/apis \
-  "eventing:v1beta1 eventing:v1 messaging:v1 flows:v1 sources:v1alpha1 sources:v1alpha2 sources:v1beta1 sources:v1beta2 sources:v1 duck:v1beta1 duck:v1" \
+  "eventing:v1beta1 eventing:v1 messaging:v1 flows:v1 sources:v1alpha2 sources:v1beta1 sources:v1beta2 sources:v1 duck:v1beta1 duck:v1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 
 group "Update deps post-codegen"

diff --git a/pkg/apis/sources/v1alpha1/apiserver_conversion.go b/pkg/apis/sources/v1alpha1/apiserver_conversion.go