add jetstream CRD & Re-optimized the directory structure and file nam…

…e to support streaming and jetstream
knative-extensions · Jul 8, 2021 · 3e23249 · 3e23249
1 parent deaf01f
commit 3e23249
Show file tree

Hide file tree

Showing 31 changed files with 962 additions and 70 deletions.
diff --git a/cmd/channel_controller/main.go b/cmd/channel_controller/main.go
@@ -27,7 +27,7 @@ import (
 	"knative.dev/pkg/injection/sharedmain"
 	"knative.dev/pkg/signals"
 
-	"knative.dev/eventing-natss/pkg/reconciler/controller"
+	"knative.dev/eventing-natss/pkg/reconciler/controller/natss"
 )
 
 const component = "natsschannel-controller"
@@ -41,6 +41,6 @@ func main() {
 	}
 
 	sharedmain.MainWithContext(ctx, component, func(ctx context.Context, watcher configmap.Watcher) *kncontroller.Impl {
-		return controller.NewController(ctx)
+		return natss.NewController(ctx)
 	})
 }
diff --git a/cmd/channel_dispatcher/main.go b/cmd/channel_dispatcher/main.go
@@ -19,12 +19,11 @@ package main
 import (
 	"os"
 
-	controller "knative.dev/eventing-natss/pkg/reconciler/dispatcher"
-
 	"knative.dev/pkg/injection"
 	"knative.dev/pkg/injection/sharedmain"
-
 	"knative.dev/pkg/signals"
+
+	"knative.dev/eventing-natss/pkg/reconciler/dispatcher/natss"
 )
 
 const component = "natsschannel-dispatcher"
@@ -36,5 +35,5 @@ func main() {
 		ctx = injection.WithNamespaceScope(ctx, ns)
 	}
 
-	sharedmain.MainWithContext(ctx, component, controller.NewController)
+	sharedmain.MainWithContext(ctx, component, natss.NewController)
 }
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -97,10 +97,10 @@ func NewValidationAdmissionController(ctx context.Context, cmw configmap.Watcher
 func main() {
 	// Set up a signal context with our webhook options
 	ctx := webhook.WithOptions(signals.NewContext(), webhook.Options{
-		ServiceName: "natss-webhook",
+		ServiceName: "nats-webhook",
 		Port:        webhook.PortFromEnv(8443),
 		// SecretName must match the name of the Secret created in the configuration.
-		SecretName: "natss-webhook-certs",
+		SecretName: "nats-webhook-certs",
 	})
 
 	sharedmain.WebhookMainWithContext(ctx, "natss-webhook",

diff --git a/config/200-addressable-resolver-clusterrole.yaml b/config/200-addressable-resolver-clusterrole.yaml
@@ -15,9 +15,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: natss-addressable-resolver
+  name: nats-addressable-resolver
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
     duck.knative.dev/addressable: "true"
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -26,6 +26,8 @@ rules:
     resources:
       - natsschannels
       - natsschannels/status
+      - jetstreamschannels
+      - jetstreamchannels/status
     verbs:
       - get
       - list

diff --git a/config/200-channelable-manipulator-clusterrole.yaml b/config/200-channelable-manipulator-clusterrole.yaml
@@ -15,9 +15,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: natss-channelable-manipulator
+  name: nats-channelable-manipulator
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
     duck.knative.dev/channelable: "true"
 # Do not use this role directly. These rules will be added to the "channelable-manipulator" role.
 rules:
@@ -26,6 +26,8 @@ rules:
     resources:
       - natsschannels
       - natsschannels/status
+      - jetstreamschannels
+      - jetstreamschannels/status
     verbs:
       - create
       - get

diff --git a/config/200-controller-clusterrole.yaml b/config/200-controller-clusterrole.yaml
@@ -15,15 +15,17 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: natss-ch-controller
+  name: nats-ch-controller
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 rules:
   - apiGroups:
       - messaging.knative.dev
     resources:
       - natsschannels
       - natsschannels/status
+      - jetstreamchannels
+      - jetstreamchannels/status
     verbs:
       - get
       - list
@@ -34,6 +36,7 @@ rules:
       - messaging.knative.dev
     resources:
       - natsschannels/finalizers
+      - jetstreamchannels/finalizers
     verbs:
       - update
   - apiGroups:

diff --git a/config/200-dispatcher-clusterrole.yaml b/config/200-dispatcher-clusterrole.yaml
@@ -15,13 +15,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: natss-ch-dispatcher
+  name: nats-ch-dispatcher
 rules:
   - apiGroups:
       - messaging.knative.dev
     resources:
       - natsschannels
       - natsschannels/status
+      - jetstreamchannels
+      - jetstreamchannels/status
     verbs:
       - get
       - list
@@ -32,6 +34,7 @@ rules:
       - messaging.knative.dev
     resources:
       - natsschannels/finalizers
+      - jetstreamchannels/finalizers
     verbs:
       - update
   - apiGroups:

diff --git a/config/200-dispatcher-service.yaml b/config/200-dispatcher-service.yaml
@@ -18,7 +18,7 @@ metadata:
   name: natss-ch-dispatcher
   namespace: knative-eventing
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
     messaging.knative.dev/channel: natss-channel
     messaging.knative.dev/role: dispatcher
 spec:

diff --git a/config/200-serviceaccount.yaml b/config/200-serviceaccount.yaml
@@ -15,16 +15,16 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: natss-ch-controller
+  name: nats-ch-controller
   namespace: knative-eventing
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: natss-ch-dispatcher
+  name: nats-ch-dispatcher
   namespace: knative-eventing
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
diff --git a/config/200-webhook-clusterrole.yaml b/config/200-webhook-clusterrole.yaml
@@ -15,9 +15,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: natss-webhook
+  name: nats-webhook
   labels:
-    natss.messaging.knative.dev/release: devel
+    nats.messaging.knative.dev/release: devel
 rules:
   # For watching logging configuration and getting certs.
   - apiGroups:

diff --git a/config/201-clusterrolebinding.yaml b/config/201-clusterrolebinding.yaml
@@ -15,30 +15,30 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: natss-ch-controller
+  name: nats-ch-controller
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 subjects:
   - kind: ServiceAccount
-    name: natss-ch-controller
+    name: nats-ch-controller
     namespace: knative-eventing
 roleRef:
   kind: ClusterRole
-  name: natss-ch-controller
+  name: nats-ch-controller
   apiGroup: rbac.authorization.k8s.io
 
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: natss-ch-dispatcher
+  name: nats-ch-dispatcher
 subjects:
   - kind: ServiceAccount
-    name: natss-ch-dispatcher
+    name: nats-ch-dispatcher
     namespace: knative-eventing
 roleRef:
   kind: ClusterRole
-  name: natss-ch-dispatcher
+  name: nats-ch-dispatcher
   apiGroup: rbac.authorization.k8s.io
 
diff --git a/config/201-webhook-serviceaccount.yaml b/config/201-webhook-serviceaccount.yaml
@@ -15,24 +15,24 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: natss-webhook
+  name: nats-webhook
   namespace: knative-eventing
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: natss-webhook
+  name: nats-webhook
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 subjects:
   - kind: ServiceAccount
-    name: natss-webhook
+    name: nats-webhook
     namespace: knative-eventing
 roleRef:
   kind: ClusterRole
-  name: natss-webhook
+  name: nats-webhook
   apiGroup: rbac.authorization.k8s.io
diff --git a/config/300-natss-channel.yaml b/config/300-natss-channel.yaml
@@ -17,7 +17,7 @@ kind: CustomResourceDefinition
 metadata:
   name: natsschannels.messaging.knative.dev
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
     knative.dev/crd-install: "true"
     messaging.knative.dev/subscribable: "true"
     duck.knative.dev/addressable: "true"

diff --git a/config/400-webhook-service.yaml b/config/400-webhook-service.yaml
@@ -15,8 +15,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: natss-webhook-certs
+  name: nats-webhook-certs
   namespace: knative-eventing
   labels:
-    natss.messaging.knative.dev/release: devel
+    nats.messaging.knative.dev/release: devel
 # The data is populated at install time.
diff --git a/config/500-controller.yaml b/config/500-controller.yaml
@@ -18,7 +18,7 @@ metadata:
   name: natss-ch-controller
   namespace: knative-eventing
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 spec:
   replicas: 1
   selector:
@@ -29,7 +29,7 @@ spec:
     metadata:
       labels: *labels
     spec:
-      serviceAccountName: natss-ch-controller
+      serviceAccountName: nats-ch-controller
       containers:
         - name: controller
           image: ko://knative.dev/eventing-natss/cmd/channel_controller

diff --git a/config/500-dispatcher.yaml b/config/500-dispatcher.yaml
@@ -18,7 +18,7 @@ metadata:
   name: natss-ch-dispatcher
   namespace: knative-eventing
   labels:
-    natss.eventing.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 spec:
   replicas: 1
   selector:
@@ -29,7 +29,7 @@ spec:
     metadata:
       labels: *labels
     spec:
-      serviceAccountName: natss-ch-dispatcher
+      serviceAccountName: nats-ch-dispatcher
       containers:
         - name: dispatcher
           image: ko://knative.dev/eventing-natss/cmd/channel_dispatcher

diff --git a/config/500-webhook-defaulting.yaml b/config/500-webhook-defaulting.yaml
@@ -15,16 +15,16 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  name: webhook.natss.messaging.knative.dev
+  name: webhook.nats.messaging.knative.dev
   labels:
-    natss.messaging.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 webhooks:
 - admissionReviewVersions: ["v1beta1"]
   clientConfig:
     service:
-      name: natss-webhook
+      name: nats-webhook
       namespace: knative-eventing
   sideEffects: None
   failurePolicy: Fail
-  name: webhook.natss.messaging.knative.dev
+  name: webhook.nats.messaging.knative.dev
   timeoutSeconds: 2
diff --git a/config/500-webhook-resource-validation.yaml b/config/500-webhook-resource-validation.yaml
@@ -15,16 +15,16 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  name: validation.webhook.natss.messaging.knative.dev
+  name: validation.webhook.nats.messaging.knative.dev
   labels:
-    natss.messaging.knative.dev/release: devel
+    nats.eventing.knative.dev/release: devel
 webhooks:
 - admissionReviewVersions: ["v1beta1"]
   clientConfig:
     service:
-      name: natss-webhook
+      name: nats-webhook
       namespace: knative-eventing
   sideEffects: None
   failurePolicy: Fail
-  name: validation.webhook.natss.messaging.knative.dev
+  name: validation.webhook.nats.messaging.knative.dev
   timeoutSeconds: 2