serve flow v1 API

knative · Jun 29, 2020 · eaba468 · eaba468
1 parent 0332809
commit eaba468
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 17 deletions.
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -227,7 +227,6 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 	}
 
 	var (
-<<<<<<< HEAD
 		eventingv1beta1_  = eventingv1beta1.SchemeGroupVersion.Version
 		eventingv1_       = eventingv1.SchemeGroupVersion.Version
 		messagingv1beta1_ = messagingv1beta1.SchemeGroupVersion.Version
@@ -236,14 +235,6 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 		flowsv1_          = flowsv1.SchemeGroupVersion.Version
 		sourcesv1alpha1_  = sourcesv1alpha1.SchemeGroupVersion.Version
 		sourcesv1alpha2_  = sourcesv1alpha2.SchemeGroupVersion.Version
-=======
-		eventingv1beta1_ = eventingv1beta1.SchemeGroupVersion.Version
-		eventingv1_      = eventingv1.SchemeGroupVersion.Version
-		flowsv1beta1_    = flowsv1beta1.SchemeGroupVersion.Version
-		flowsv1_         = flowsv1.SchemeGroupVersion.Version
-		sourcesv1alpha1_ = sourcesv1alpha1.SchemeGroupVersion.Version
-		sourcesv1alpha2_ = sourcesv1alpha2.SchemeGroupVersion.Version
->>>>>>> v1 <-> v1beta1 flow conversion webhook
 	)
 
 	return conversion.NewConversionController(ctx,
@@ -269,7 +260,6 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 					eventingv1_:      &eventingv1.Broker{},
 				},
 			},
-<<<<<<< HEAD
 
 			// Messaging
 			messagingv1.Kind("Channel"): {
@@ -297,8 +287,6 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 				},
 			},
 
-=======
->>>>>>> v1 <-> v1beta1 flow conversion webhook
 			// flows
 			flowsv1.Kind("Sequence"): {
 				DefinitionName: flows.SequenceResource.String(),
@@ -316,10 +304,7 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 					flowsv1_:      &flowsv1.Parallel{},
 				},
 			},
-<<<<<<< HEAD
 
-=======
->>>>>>> v1 <-> v1beta1 flow conversion webhook
 			// Sources
 			sourcesv1alpha2.Kind("ApiServerSource"): {
 				DefinitionName: sources.ApiServerSourceResource.String(),

diff --git a/config/core/resources/parallel.yaml b/config/core/resources/parallel.yaml
@@ -53,6 +53,10 @@ spec:
     name: v1beta1
     served: true
     storage: true
+  - <<: *version
+    name: v1
+    served: true
+    storage: false
   names:
     kind: Parallel
     plural: parallels

diff --git a/config/core/resources/sequence.yaml b/config/core/resources/sequence.yaml
@@ -53,6 +53,10 @@ spec:
     name: v1beta1
     served: true
     storage: true
+  - <<: *version
+    name: v1
+    served: true
+    storage: false
   names:
     kind: Sequence
     plural: sequences
@@ -65,9 +69,36 @@ spec:
   scope: Namespaced
   conversion:
     strategy: Webhook
+<<<<<<< HEAD
     webhook:
       conversionReviewVersions: ["v1", "v1beta1"]
       clientConfig:
         service:
           name: eventing-webhook
           namespace: knative-eventing
+=======
+    webhookClientConfig:
+      service:
+        name: eventing-webhook
+        namespace: knative-eventing
+  additionalPrinterColumns:
+    - name: Ready
+      type: string
+      JSONPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      JSONPath: ".status.conditions[?(@.type==\"Ready\")].reason"
+    - name: URL
+      type: string
+      JSONPath: .status.address.url
+    - name: Age
+      type: date
+      JSONPath: .metadata.creationTimestamp
+  versions:
+  - name: v1beta1
+    served: true
+    storage: true
+  - name: v1
+    served: true
+    storage: false
+>>>>>>> serve flow v1 API
diff --git a/pkg/apis/flows/v1beta1/parallel_conversion_test.go b/pkg/apis/flows/v1beta1/parallel_conversion_test.go
@@ -157,9 +157,9 @@ func TestParallelRoundTripV1beta1(t *testing.T) {
 									APIVersion: "d2APIVersion",
 								},
 								URI: apis.HTTP("d2.example.com")},
-							Retry:         &one,
+							Retry:         pointer.Int32Ptr(1),
 							BackoffPolicy: &linear,
-							BackoffDelay:  &onemn,
+							BackoffDelay:  pointer.StringPtr("1m"),
 						},
 					},
 				},