diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a585f7..10e530c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,20 +100,20 @@ jobs: name: Cloning config repository command: git clone --single-branch git@github.com:triggermesh/config.git tmconfig - run: - name: Updating overlays/<< parameters.cluster >>/filter manifests + name: Updating overlays/<< parameters.cluster >>/routing manifests working_directory: tmconfig/ command: | for cmd in $(sed -n -e 's/^COMMANDS[[:space:]]*=[[:space:]]*\(.*\)$/\1/p' ~/project/Makefile); do - sed -i overlays/<< parameters.cluster >>/filter/${cmd}.yaml \ + sed -i overlays/<< parameters.cluster >>/routing/${cmd}.yaml \ -e "s|\(gcr.io/triggermesh-private/${cmd}:\).*|\1${CIRCLE_TAG:-${CIRCLE_SHA1}}|g" done git --no-pager diff - run: - name: Committing overlays/<< parameters.cluster >>/filter updates + name: Committing overlays/<< parameters.cluster >>/routing updates working_directory: tmconfig/ command: | git add overlays - git commit -m "Update overlays/<< parameters.cluster >>/filter deployments to '${CIRCLE_TAG:-${CIRCLE_SHA1}}'" + git commit -m "Update overlays/<< parameters.cluster >>/routing deployments to '${CIRCLE_TAG:-${CIRCLE_SHA1}}'" git push origin master release: diff --git a/Makefile b/Makefile index 16d37f0..14e2eea 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -KREPO = filter -KREPO_DESC = Triggermesh Filter -COMMANDS = filter-controller filter-deployment filter-webhook +KREPO = routing +KREPO_DESC = Triggermesh Routing +COMMANDS = routing-controller routing-webhook filter-deployment TARGETS ?= linux/amd64 diff --git a/cloudbuild.yaml b/cloudbuild.yaml index d0cb76b..d318d88 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -24,4 +24,4 @@ options: substitution_option: ALLOW_LOOSE tags: -- filter +- routing diff --git a/cmd/filter-deployment/main.go b/cmd/filter-deployment/main.go index 8f45d7c..ba9cdce 100644 --- a/cmd/filter-deployment/main.go +++ b/cmd/filter-deployment/main.go @@ -32,10 +32,10 @@ import ( "knative.dev/pkg/signals" "knative.dev/pkg/system" - filterv1alpha1 "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset" - filterinformers "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions" - "github.com/triggermesh/filter/pkg/reconciler/config" - "github.com/triggermesh/filter/pkg/reconciler/filter" + "github.com/triggermesh/routing/pkg/adapter/filter" + clientset "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset" + informers "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions" + "github.com/triggermesh/routing/pkg/reconciler/config" ) const ( @@ -45,10 +45,7 @@ const ( type envConfig struct { Namespace string `envconfig:"NAMESPACE" required:"true"` - // TODO: change this environment variable to something like "PodGroupName". - PodName string `envconfig:"POD_NAME" required:"true"` - ContainerName string `envconfig:"CONTAINER_NAME" required:"true"` - Port int `envconfig:"FILTER_PORT" default:"8080"` + Port int `envconfig:"FILTER_PORT" default:"8080"` } func main() { @@ -77,9 +74,9 @@ func main() { logger.Info("Starting the Filter") - filterClient := filterv1alpha1.NewForConfigOrDie(cfg) - filterFactory := filterinformers.NewSharedInformerFactory(filterClient, controller.GetResyncPeriod(ctx)) - filterInformer := filterFactory.Routing().V1alpha1().Filters() + routingClient := clientset.NewForConfigOrDie(cfg) + routingFactory := informers.NewSharedInformerFactory(routingClient, controller.GetResyncPeriod(ctx)) + filterInformer := routingFactory.Routing().V1alpha1().Filters() // Watch the logging config map and dynamically update logging levels. configMapWatcher := configmap.NewInformedWatcher(kubeClient, system.Namespace()) @@ -96,8 +93,6 @@ func main() { // Watch the observability config map and dynamically update request logs. configMapWatcher.Watch(logging.ConfigMapName(), logging.UpdateLevelFromConfigMap(sl, atomicLevel, component)) - // reporter := filter.NewStatsReporter(env.ContainerName, kmeta.ChildName(env.PodName, uuid.New().String())) - // We are running both the receiver (takes messages in from the Broker) and the dispatcher (send // the messages to the triggers' subscribers) in this binary. handler, err := filter.NewHandler(logger, filterInformer.Lister(), env.Port) @@ -113,8 +108,8 @@ func main() { // Start all of the informers and wait for them to sync. logger.Info("Starting informer.") - go filterFactory.Start(ctx.Done()) - filterFactory.WaitForCacheSync(ctx.Done()) + go routingFactory.Start(ctx.Done()) + routingFactory.WaitForCacheSync(ctx.Done()) // Start blocks forever. logger.Info("Filter starting...") diff --git a/cmd/filter-controller/Dockerfile b/cmd/routing-controller/Dockerfile similarity index 67% rename from cmd/filter-controller/Dockerfile rename to cmd/routing-controller/Dockerfile index 3916ff6..63d0e62 100644 --- a/cmd/filter-controller/Dockerfile +++ b/cmd/routing-controller/Dockerfile @@ -4,13 +4,13 @@ ENV CGO_ENABLED 0 ENV GOOS linux ENV GOARCH amd64 -WORKDIR /go/src/filter-controller +WORKDIR /go/src/routing-controller COPY go.mod go.sum ./ RUN go mod download COPY . . -RUN BIN_OUTPUT_DIR=/bin make filter-controller && \ +RUN BIN_OUTPUT_DIR=/bin make routing-controller && \ mkdir /kodata && \ ls -lah hack && \ mv .git/* /kodata/ && \ @@ -20,7 +20,7 @@ RUN BIN_OUTPUT_DIR=/bin make filter-controller && \ FROM scratch COPY --from=builder /kodata/ ${KO_DATA_PATH}/ -COPY --from=builder /bin/filter-controller / +COPY --from=builder /bin/routing-controller / COPY licenses/ /licenses/ -ENTRYPOINT ["/filter-controller"] +ENTRYPOINT ["/routing-controller"] diff --git a/cmd/filter-controller/kodata/HEAD b/cmd/routing-controller/kodata/HEAD similarity index 100% rename from cmd/filter-controller/kodata/HEAD rename to cmd/routing-controller/kodata/HEAD diff --git a/cmd/filter-controller/kodata/refs b/cmd/routing-controller/kodata/refs similarity index 100% rename from cmd/filter-controller/kodata/refs rename to cmd/routing-controller/kodata/refs diff --git a/cmd/filter-controller/main.go b/cmd/routing-controller/main.go similarity index 83% rename from cmd/filter-controller/main.go rename to cmd/routing-controller/main.go index 3781291..ff8766f 100644 --- a/cmd/filter-controller/main.go +++ b/cmd/routing-controller/main.go @@ -27,21 +27,21 @@ import ( "knative.dev/pkg/injection/sharedmain" "knative.dev/pkg/signals" - "github.com/triggermesh/filter/pkg/reconciler/config" - "github.com/triggermesh/filter/pkg/reconciler/controller" + "github.com/triggermesh/routing/pkg/reconciler/config" + "github.com/triggermesh/routing/pkg/reconciler/filter" ) const ( - component = "filter-service" + component = "routing-service" ) func main() { - var filterEnv controller.FilterService + var filterEnv filter.FilterService if err := envconfig.Process("", &filterEnv); err != nil { log.Fatal("Failed to process env var", zap.Error(err)) } ctx := signals.NewContext() sharedmain.MainWithContext(config.WithFilterService(ctx, filterEnv), - component, controller.New) + component, filter.New) } diff --git a/cmd/filter-webhook/Dockerfile b/cmd/routing-webhook/Dockerfile similarity index 69% rename from cmd/filter-webhook/Dockerfile rename to cmd/routing-webhook/Dockerfile index 4d3ab77..04be7d4 100644 --- a/cmd/filter-webhook/Dockerfile +++ b/cmd/routing-webhook/Dockerfile @@ -4,13 +4,13 @@ ENV CGO_ENABLED 0 ENV GOOS linux ENV GOARCH amd64 -WORKDIR /go/src/filter-webhook +WORKDIR /go/src/routing-webhook COPY go.mod go.sum ./ RUN go mod download COPY . . -RUN BIN_OUTPUT_DIR=/bin make filter-webhook && \ +RUN BIN_OUTPUT_DIR=/bin make routing-webhook && \ mkdir /kodata && \ ls -lah hack && \ mv .git/* /kodata/ && \ @@ -20,7 +20,7 @@ RUN BIN_OUTPUT_DIR=/bin make filter-webhook && \ FROM scratch COPY --from=builder /kodata/ ${KO_DATA_PATH}/ -COPY --from=builder /bin/filter-webhook / +COPY --from=builder /bin/routing-webhook / COPY licenses/ /licenses/ -ENTRYPOINT ["/filter-webhook"] +ENTRYPOINT ["/routing-webhook"] diff --git a/cmd/filter-webhook/kodata/HEAD b/cmd/routing-webhook/kodata/HEAD similarity index 100% rename from cmd/filter-webhook/kodata/HEAD rename to cmd/routing-webhook/kodata/HEAD diff --git a/cmd/filter-webhook/kodata/refs b/cmd/routing-webhook/kodata/refs similarity index 100% rename from cmd/filter-webhook/kodata/refs rename to cmd/routing-webhook/kodata/refs diff --git a/cmd/filter-webhook/main.go b/cmd/routing-webhook/main.go similarity index 95% rename from cmd/filter-webhook/main.go rename to cmd/routing-webhook/main.go index d46d33c..613ea12 100644 --- a/cmd/filter-webhook/main.go +++ b/cmd/routing-webhook/main.go @@ -29,7 +29,7 @@ import ( "knative.dev/pkg/webhook/resourcesemantics" "knative.dev/pkg/webhook/resourcesemantics/validation" - "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" + "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" ) var types = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{ @@ -72,7 +72,7 @@ func main() { ServiceName: webhook.NameFromEnv(), Port: webhook.PortFromEnv(8443), // SecretName must match the name of the Secret created in the configuration. - SecretName: "filter-webhook-certs", + SecretName: "routing-webhook-certs", }) sharedmain.WebhookMainWithContext(ctx, webhook.NameFromEnv(), diff --git a/config/100-namespace.yaml b/config/100-namespace.yaml index 1672baf..9ae25a8 100644 --- a/config/100-namespace.yaml +++ b/config/100-namespace.yaml @@ -15,4 +15,4 @@ apiVersion: v1 kind: Namespace metadata: - name: filter + name: routing diff --git a/config/200-clusterrole.yaml b/config/200-clusterrole.yaml index 2f6a9fb..4c782fd 100644 --- a/config/200-clusterrole.yaml +++ b/config/200-clusterrole.yaml @@ -15,19 +15,19 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: triggermesh-filter-admin + name: triggermesh-routing-admin aggregationRule: clusterRoleSelectors: - matchLabels: - filter.triggermesh.io/controller: "true" + routing.triggermesh.io/controller: "true" rules: [] # Rules are automatically filled in by the controller manager. --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: triggermesh-filter-core + name: triggermesh-routing-core labels: - filter.triggermesh.io/controller: "true" + routing.triggermesh.io/controller: "true" rules: - apiGroups: - "" diff --git a/config/200-serviceaccount.yaml b/config/200-serviceaccount.yaml index e8ca962..11d52eb 100644 --- a/config/200-serviceaccount.yaml +++ b/config/200-serviceaccount.yaml @@ -15,11 +15,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: triggermesh-filter-controller - namespace: filter + name: triggermesh-routing-controller + namespace: routing --- apiVersion: v1 kind: ServiceAccount metadata: name: triggermesh-filter-deployment - namespace: filter + namespace: routing diff --git a/config/201-clusterrolebinding.yaml b/config/201-clusterrolebinding.yaml index 6cd7324..937622f 100644 --- a/config/201-clusterrolebinding.yaml +++ b/config/201-clusterrolebinding.yaml @@ -15,14 +15,14 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: triggermesh-filter-controller-admin + name: triggermesh-routing-controller-admin subjects: - kind: ServiceAccount - name: triggermesh-filter-controller - namespace: filter + name: triggermesh-routing-controller + namespace: routing roleRef: kind: ClusterRole - name: triggermesh-filter-admin + name: triggermesh-routing-admin apiGroup: rbac.authorization.k8s.io --- @@ -34,7 +34,7 @@ metadata: subjects: - kind: ServiceAccount name: triggermesh-filter-deployment - namespace: filter + namespace: routing roleRef: kind: ClusterRole name: triggermesh-filter-deployment @@ -45,11 +45,11 @@ roleRef: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: triggermesh-filter-controller-resolver + name: triggermesh-routing-controller-resolver subjects: - kind: ServiceAccount - name: triggermesh-filter-controller - namespace: filter + name: triggermesh-routing-controller + namespace: routing roleRef: kind: ClusterRole name: addressable-resolver diff --git a/config/300-filter.yaml b/config/300-filter-crd.yaml similarity index 100% rename from config/300-filter.yaml rename to config/300-filter-crd.yaml diff --git a/config/400-webhook-service.yaml b/config/400-webhook-service.yaml index b635a68..bc46a5a 100644 --- a/config/400-webhook-service.yaml +++ b/config/400-webhook-service.yaml @@ -16,12 +16,12 @@ apiVersion: v1 kind: Service metadata: labels: - role: filter-webhook - name: filter-webhook - namespace: filter + role: routing-webhook + name: routing-webhook + namespace: routing spec: ports: - port: 443 targetPort: 8443 selector: - role: filter-webhook + role: routing-webhook diff --git a/config/500-webhook-configuration.yaml b/config/500-webhook-configuration.yaml index 6048c30..1a31275 100644 --- a/config/500-webhook-configuration.yaml +++ b/config/500-webhook-configuration.yaml @@ -21,8 +21,8 @@ webhooks: - v1beta1 clientConfig: service: - name: filter-webhook - namespace: filter + name: routing-webhook + namespace: routing sideEffects: None failurePolicy: Fail name: validation.webhook.routing.triggermesh.io @@ -30,6 +30,6 @@ webhooks: apiVersion: v1 kind: Secret metadata: - name: filter-webhook-certs - namespace: filter + name: routing-webhook-certs + namespace: routing # The data is populated at install time. diff --git a/config/config-leader-election.yaml b/config/config-leader-election.yaml index 1c50644..54eec05 100644 --- a/config/config-leader-election.yaml +++ b/config/config-leader-election.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-leader-election - namespace: filter + namespace: routing data: _example: | ################################ diff --git a/config/config-logging.yaml b/config/config-logging.yaml index 3263847..8f8ee78 100644 --- a/config/config-logging.yaml +++ b/config/config-logging.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-logging - namespace: filter + namespace: routing data: _example: | diff --git a/config/config-observability.yaml b/config/config-observability.yaml index ccad1b5..458c572 100644 --- a/config/config-observability.yaml +++ b/config/config-observability.yaml @@ -16,7 +16,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: config-observability - namespace: filter + namespace: routing data: _example: | diff --git a/config/controller.yaml b/config/controller.yaml index d550920..139363a 100644 --- a/config/controller.yaml +++ b/config/controller.yaml @@ -15,17 +15,17 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: filter-controller - namespace: filter + name: routing-controller + namespace: routing spec: replicas: 1 selector: matchLabels: - app: filter-controller + app: routing-controller template: metadata: labels: - app: filter-controller + app: routing-controller spec: # To avoid node becoming SPOF, spread our replicas to different nodes. affinity: @@ -34,16 +34,16 @@ spec: - podAffinityTerm: labelSelector: matchLabels: - app: filter-controller + app: routing-controller topologyKey: kubernetes.io/hostname weight: 100 - serviceAccountName: triggermesh-filter-controller + serviceAccountName: triggermesh-routing-controller containers: - name: controller # This is the Go import path for the binary that is containerized # and substituted here. - image: ko://github.com/triggermesh/filter/cmd/filter-controller + image: ko://github.com/triggermesh/routing/cmd/routing-controller resources: requests: cpu: 100m diff --git a/config/filter.yaml b/config/filter.yaml index 96213b7..5c3f6b5 100644 --- a/config/filter.yaml +++ b/config/filter.yaml @@ -16,7 +16,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: filter-service - namespace: filter + namespace: routing spec: selector: matchLabels: @@ -31,7 +31,7 @@ spec: containers: - name: filter terminationMessagePolicy: FallbackToLogsOnError - image: ko://github.com/triggermesh/filter/cmd/filter-deployment + image: ko://github.com/triggermesh/routing/cmd/filter-deployment readinessProbe: &probe failureThreshold: 3 httpGet: @@ -90,7 +90,7 @@ metadata: labels: routing.triggermesh.io/role: filter name: filter-service - namespace: filter + namespace: routing spec: ports: - name: http diff --git a/config/samples/filter.yaml b/config/samples/filter.yaml index 99c930e..8793b30 100644 --- a/config/samples/filter.yaml +++ b/config/samples/filter.yaml @@ -15,14 +15,14 @@ apiVersion: routing.triggermesh.io/v1alpha1 kind: Filter metadata: - name: filter-test + name: filter-benchmark spec: - expression: $id.first.(int64) + $id.second.(int64) == 8 + expression: ($id.first.(int64) + $id.second.(int64) >= 8) || $company.(string) == "bar" || $0.name.first.(string) == "Jo" sink: ref: - apiVersion: serving.knative.dev/v1 + apiVersion: v1 kind: Service - name: sockeye + name: thrpt-receiver --- apiVersion: sources.knative.dev/v1beta2 kind: PingSource diff --git a/config/webhook.yaml b/config/webhook.yaml index 88da9fe..f3a7be6 100644 --- a/config/webhook.yaml +++ b/config/webhook.yaml @@ -15,19 +15,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: filter-webhook - namespace: filter + name: routing-webhook + namespace: routing spec: replicas: 1 selector: matchLabels: - app: filter-webhook - role: filter-webhook + app: routing-webhook + role: routing-webhook template: metadata: labels: - app: filter-webhook - role: filter-webhook + app: routing-webhook + role: routing-webhook spec: # To avoid node becoming SPOF, spread our replicas to different nodes. affinity: @@ -36,16 +36,16 @@ spec: - podAffinityTerm: labelSelector: matchLabels: - app: filter-webhook + app: routing-webhook topologyKey: kubernetes.io/hostname weight: 100 - serviceAccountName: triggermesh-filter-controller + serviceAccountName: triggermesh-routing-controller containers: - name: webhook # This is the Go import path for the binary that is containerized # and substituted here. - image: ko://github.com/triggermesh/filter/cmd/filter-webhook + image: ko://github.com/triggermesh/routing/cmd/routing-webhook resources: requests: cpu: 20m @@ -63,7 +63,7 @@ spec: - name: METRICS_DOMAIN value: triggermesh.io/routing - name: WEBHOOK_NAME - value: filter-webhook + value: routing-webhook - name: WEBHOOK_PORT value: "8443" @@ -82,7 +82,7 @@ spec: port: 8443 httpHeaders: - name: k-kubelet-probe - value: "filter-webhook" + value: "routing-webhook" livenessProbe: *probe # Our webhook should gracefully terminate by lame ducking first, set this to a sufficiently diff --git a/go.mod b/go.mod index 2b6bb81..1d03c75 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/triggermesh/filter +module github.com/triggermesh/routing go 1.15 diff --git a/hack/inc.Codegen.mk b/hack/inc.Codegen.mk index 63a2d53..62fbd14 100644 --- a/hack/inc.Codegen.mk +++ b/hack/inc.Codegen.mk @@ -3,7 +3,7 @@ # see https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api_changes.md#generate-code # Name of the Go package for this repository -PKG := github.com/triggermesh/filter +PKG := github.com/triggermesh/routing # List of API groups to generate code for # e.g. "filter/v1alpha1 filter/v1alpha2" diff --git a/pkg/reconciler/filter/handler.go b/pkg/adapter/filter/adapter.go similarity index 97% rename from pkg/reconciler/filter/handler.go rename to pkg/adapter/filter/adapter.go index 059d385..8022a54 100644 --- a/pkg/reconciler/filter/handler.go +++ b/pkg/adapter/filter/adapter.go @@ -33,10 +33,10 @@ import ( "knative.dev/eventing/pkg/kncloudevents" "knative.dev/eventing/pkg/utils" - filterv1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" - filterlisters "github.com/triggermesh/filter/pkg/client/generated/listers/filter/v1alpha1" - "github.com/triggermesh/filter/pkg/eventfilter" - "github.com/triggermesh/filter/pkg/eventfilter/cel" + filterv1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" + filterlisters "github.com/triggermesh/routing/pkg/client/generated/listers/filter/v1alpha1" + "github.com/triggermesh/routing/pkg/eventfilter" + "github.com/triggermesh/routing/pkg/eventfilter/cel" ) const ( diff --git a/pkg/reconciler/filter/storage.go b/pkg/adapter/filter/storage.go similarity index 96% rename from pkg/reconciler/filter/storage.go rename to pkg/adapter/filter/storage.go index 70f7f7e..297ae90 100644 --- a/pkg/reconciler/filter/storage.go +++ b/pkg/adapter/filter/storage.go @@ -19,7 +19,7 @@ package filter import ( "sync" - "github.com/triggermesh/filter/pkg/eventfilter/cel" + "github.com/triggermesh/routing/pkg/eventfilter/cel" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/apis/filter/v1alpha1/deepcopy_generated.go b/pkg/apis/filter/v1alpha1/deepcopy_generated.go index 992b445..e9f78f5 100644 --- a/pkg/apis/filter/v1alpha1/deepcopy_generated.go +++ b/pkg/apis/filter/v1alpha1/deepcopy_generated.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ func (in *Filter) DeepCopyInto(out *Filter) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec + in.Spec.DeepCopyInto(&out.Spec) in.Status.DeepCopyInto(&out.Status) return } @@ -89,6 +89,11 @@ func (in *FilterList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FilterSpec) DeepCopyInto(out *FilterSpec) { *out = *in + if in.Sink != nil { + in, out := &in.Sink, &out.Sink + *out = new(v1.Destination) + (*in).DeepCopyInto(*out) + } return } @@ -105,7 +110,7 @@ func (in *FilterSpec) DeepCopy() *FilterSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FilterStatus) DeepCopyInto(out *FilterStatus) { *out = *in - in.Status.DeepCopyInto(&out.Status) + in.SourceStatus.DeepCopyInto(&out.SourceStatus) if in.Address != nil { in, out := &in.Address, &out.Address *out = new(v1.Addressable) diff --git a/pkg/apis/filter/v1alpha1/filter_validation.go b/pkg/apis/filter/v1alpha1/filter_validation.go index db29009..853ad9f 100644 --- a/pkg/apis/filter/v1alpha1/filter_validation.go +++ b/pkg/apis/filter/v1alpha1/filter_validation.go @@ -22,7 +22,7 @@ import ( "knative.dev/pkg/apis" - "github.com/triggermesh/filter/pkg/eventfilter/cel" + "github.com/triggermesh/routing/pkg/eventfilter/cel" ) // Validate implements apis.Validatable diff --git a/pkg/apis/filter/v1alpha1/register.go b/pkg/apis/filter/v1alpha1/register.go index 84d5f54..fb79ee7 100644 --- a/pkg/apis/filter/v1alpha1/register.go +++ b/pkg/apis/filter/v1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/triggermesh/filter/pkg/apis/filter" + "github.com/triggermesh/routing/pkg/apis/filter" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/client/generated/clientset/internalclientset/clientset.go b/pkg/client/generated/clientset/internalclientset/clientset.go index 73ab01e..ce6279b 100644 --- a/pkg/client/generated/clientset/internalclientset/clientset.go +++ b/pkg/client/generated/clientset/internalclientset/clientset.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ package internalclientset import ( "fmt" - routingv1alpha1 "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1" + routingv1alpha1 "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/generated/clientset/internalclientset/doc.go b/pkg/client/generated/clientset/internalclientset/doc.go index 323b55c..b21ca34 100644 --- a/pkg/client/generated/clientset/internalclientset/doc.go +++ b/pkg/client/generated/clientset/internalclientset/doc.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/generated/clientset/internalclientset/fake/clientset_generated.go b/pkg/client/generated/clientset/internalclientset/fake/clientset_generated.go index f6c9b86..ca68e63 100644 --- a/pkg/client/generated/clientset/internalclientset/fake/clientset_generated.go +++ b/pkg/client/generated/clientset/internalclientset/fake/clientset_generated.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset" - routingv1alpha1 "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1" - fakeroutingv1alpha1 "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake" + clientset "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset" + routingv1alpha1 "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1" + fakeroutingv1alpha1 "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/generated/clientset/internalclientset/fake/doc.go b/pkg/client/generated/clientset/internalclientset/fake/doc.go index cbfdb73..b605836 100644 --- a/pkg/client/generated/clientset/internalclientset/fake/doc.go +++ b/pkg/client/generated/clientset/internalclientset/fake/doc.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/generated/clientset/internalclientset/fake/register.go b/pkg/client/generated/clientset/internalclientset/fake/register.go index 991b895..81aa010 100644 --- a/pkg/client/generated/clientset/internalclientset/fake/register.go +++ b/pkg/client/generated/clientset/internalclientset/fake/register.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - routingv1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" + routingv1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/generated/clientset/internalclientset/scheme/doc.go b/pkg/client/generated/clientset/internalclientset/scheme/doc.go index 3aa3bcd..2a5d73b 100644 --- a/pkg/client/generated/clientset/internalclientset/scheme/doc.go +++ b/pkg/client/generated/clientset/internalclientset/scheme/doc.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/generated/clientset/internalclientset/scheme/register.go b/pkg/client/generated/clientset/internalclientset/scheme/register.go index a77fbbd..3e815d9 100644 --- a/pkg/client/generated/clientset/internalclientset/scheme/register.go +++ b/pkg/client/generated/clientset/internalclientset/scheme/register.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - routingv1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" + routingv1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/doc.go b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/doc.go index e378ce5..5b67846 100644 --- a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/doc.go +++ b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/doc.go b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/doc.go index 0ceb97b..f7b4d3f 100644 --- a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/doc.go +++ b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/doc.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/fake_filter.go b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/fake_filter.go index f6d3e30..b6ca06d 100644 --- a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/fake_filter.go +++ b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/fake_filter.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ package fake import ( "context" - v1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" + v1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/fake_filter_client.go b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/fake_filter_client.go index 406c50d..8dada37 100644 --- a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/fake_filter_client.go +++ b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/fake/fake_filter_client.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1" + v1alpha1 "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/filter.go b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/filter.go index 3945bd1..c677648 100644 --- a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/filter.go +++ b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/filter.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import ( "context" "time" - v1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" - scheme "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/scheme" + v1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" + scheme "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/filter_client.go b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/filter_client.go index b6c4881..3afc975 100644 --- a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/filter_client.go +++ b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/filter_client.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" - "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/scheme" + v1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" + "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/generated_expansion.go b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/generated_expansion.go index 066ef73..e9daf67 100644 --- a/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/generated_expansion.go +++ b/pkg/client/generated/clientset/internalclientset/typed/filter/v1alpha1/generated_expansion.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/generated/informers/externalversions/factory.go b/pkg/client/generated/informers/externalversions/factory.go index 4d3a369..f8dd1c4 100644 --- a/pkg/client/generated/informers/externalversions/factory.go +++ b/pkg/client/generated/informers/externalversions/factory.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - internalclientset "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset" - filter "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/filter" - internalinterfaces "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/internalinterfaces" + internalclientset "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset" + filter "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/filter" + internalinterfaces "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/generated/informers/externalversions/filter/interface.go b/pkg/client/generated/informers/externalversions/filter/interface.go index cfe455e..daa552b 100644 --- a/pkg/client/generated/informers/externalversions/filter/interface.go +++ b/pkg/client/generated/informers/externalversions/filter/interface.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ limitations under the License. package filter import ( - v1alpha1 "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/filter/v1alpha1" - internalinterfaces "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/filter/v1alpha1" + internalinterfaces "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/generated/informers/externalversions/filter/v1alpha1/filter.go b/pkg/client/generated/informers/externalversions/filter/v1alpha1/filter.go index d7390da..c13ebf2 100644 --- a/pkg/client/generated/informers/externalversions/filter/v1alpha1/filter.go +++ b/pkg/client/generated/informers/externalversions/filter/v1alpha1/filter.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,10 +22,10 @@ import ( "context" time "time" - filterv1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" - internalclientset "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset" - internalinterfaces "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/triggermesh/filter/pkg/client/generated/listers/filter/v1alpha1" + filterv1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" + internalclientset "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset" + internalinterfaces "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/triggermesh/routing/pkg/client/generated/listers/filter/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/generated/informers/externalversions/filter/v1alpha1/interface.go b/pkg/client/generated/informers/externalversions/filter/v1alpha1/interface.go index 279a7da..ddd122c 100644 --- a/pkg/client/generated/informers/externalversions/filter/v1alpha1/interface.go +++ b/pkg/client/generated/informers/externalversions/filter/v1alpha1/interface.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/generated/informers/externalversions/generic.go b/pkg/client/generated/informers/externalversions/generic.go index 88c27ac..6cfd429 100644 --- a/pkg/client/generated/informers/externalversions/generic.go +++ b/pkg/client/generated/informers/externalversions/generic.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" + v1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index 34fbfd4..17cbccb 100644 --- a/pkg/client/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - internalclientset "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset" + internalclientset "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/generated/injection/client/client.go b/pkg/client/generated/injection/client/client.go index 6408d53..51bc1d5 100644 --- a/pkg/client/generated/injection/client/client.go +++ b/pkg/client/generated/injection/client/client.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ package client import ( context "context" - internalclientset "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset" + internalclientset "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset" rest "k8s.io/client-go/rest" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -44,10 +44,10 @@ func Get(ctx context.Context) internalclientset.Interface { if untyped == nil { if injection.GetConfig(ctx) == nil { logging.FromContext(ctx).Panic( - "Unable to fetch github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset.Interface from context. This context is not the application context (which is typically given to constructors via sharedmain).") + "Unable to fetch github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset.Interface from context. This context is not the application context (which is typically given to constructors via sharedmain).") } else { logging.FromContext(ctx).Panic( - "Unable to fetch github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset.Interface from context.") + "Unable to fetch github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset.Interface from context.") } } return untyped.(internalclientset.Interface) diff --git a/pkg/client/generated/injection/client/fake/fake.go b/pkg/client/generated/injection/client/fake/fake.go index 6eab9b2..29a2c2c 100644 --- a/pkg/client/generated/injection/client/fake/fake.go +++ b/pkg/client/generated/injection/client/fake/fake.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ package fake import ( context "context" - fake "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/fake" - client "github.com/triggermesh/filter/pkg/client/generated/injection/client" + fake "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/fake" + client "github.com/triggermesh/routing/pkg/client/generated/injection/client" runtime "k8s.io/apimachinery/pkg/runtime" rest "k8s.io/client-go/rest" injection "knative.dev/pkg/injection" @@ -48,7 +48,7 @@ func Get(ctx context.Context) *fake.Clientset { untyped := ctx.Value(client.Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/fake.Clientset from context.") + "Unable to fetch github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/fake.Clientset from context.") } return untyped.(*fake.Clientset) } diff --git a/pkg/client/generated/injection/informers/factory/factory.go b/pkg/client/generated/injection/informers/factory/factory.go index 86fe529..961f656 100644 --- a/pkg/client/generated/injection/informers/factory/factory.go +++ b/pkg/client/generated/injection/informers/factory/factory.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ package factory import ( context "context" - externalversions "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions" - client "github.com/triggermesh/filter/pkg/client/generated/injection/client" + externalversions "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions" + client "github.com/triggermesh/routing/pkg/client/generated/injection/client" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -50,7 +50,7 @@ func Get(ctx context.Context) externalversions.SharedInformerFactory { untyped := ctx.Value(Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch github.com/triggermesh/filter/pkg/client/generated/informers/externalversions.SharedInformerFactory from context.") + "Unable to fetch github.com/triggermesh/routing/pkg/client/generated/informers/externalversions.SharedInformerFactory from context.") } return untyped.(externalversions.SharedInformerFactory) } diff --git a/pkg/client/generated/injection/informers/factory/fake/fake.go b/pkg/client/generated/injection/informers/factory/fake/fake.go index 08ffbbc..01156be 100644 --- a/pkg/client/generated/injection/informers/factory/fake/fake.go +++ b/pkg/client/generated/injection/informers/factory/fake/fake.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ package fake import ( context "context" - externalversions "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions" - fake "github.com/triggermesh/filter/pkg/client/generated/injection/client/fake" - factory "github.com/triggermesh/filter/pkg/client/generated/injection/informers/factory" + externalversions "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions" + fake "github.com/triggermesh/routing/pkg/client/generated/injection/client/fake" + factory "github.com/triggermesh/routing/pkg/client/generated/injection/informers/factory" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" ) diff --git a/pkg/client/generated/injection/informers/factory/filtered/fake/fake_filtered_factory.go b/pkg/client/generated/injection/informers/factory/filtered/fake/fake_filtered_factory.go index 20dc1f2..683ef71 100644 --- a/pkg/client/generated/injection/informers/factory/filtered/fake/fake_filtered_factory.go +++ b/pkg/client/generated/injection/informers/factory/filtered/fake/fake_filtered_factory.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ package fakeFilteredFactory import ( context "context" - externalversions "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions" - fake "github.com/triggermesh/filter/pkg/client/generated/injection/client/fake" - filtered "github.com/triggermesh/filter/pkg/client/generated/injection/informers/factory/filtered" + externalversions "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions" + fake "github.com/triggermesh/routing/pkg/client/generated/injection/client/fake" + filtered "github.com/triggermesh/routing/pkg/client/generated/injection/informers/factory/filtered" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" diff --git a/pkg/client/generated/injection/informers/factory/filtered/filtered_factory.go b/pkg/client/generated/injection/informers/factory/filtered/filtered_factory.go index 75bb9e1..602d7aa 100644 --- a/pkg/client/generated/injection/informers/factory/filtered/filtered_factory.go +++ b/pkg/client/generated/injection/informers/factory/filtered/filtered_factory.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ package filteredFactory import ( context "context" - externalversions "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions" - client "github.com/triggermesh/filter/pkg/client/generated/injection/client" + externalversions "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions" + client "github.com/triggermesh/routing/pkg/client/generated/injection/client" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" @@ -71,7 +71,7 @@ func Get(ctx context.Context, selector string) externalversions.SharedInformerFa untyped := ctx.Value(Key{Selector: selector}) if untyped == nil { logging.FromContext(ctx).Panicf( - "Unable to fetch github.com/triggermesh/filter/pkg/client/generated/informers/externalversions.SharedInformerFactory with selector %s from context.", selector) + "Unable to fetch github.com/triggermesh/routing/pkg/client/generated/informers/externalversions.SharedInformerFactory with selector %s from context.", selector) } return untyped.(externalversions.SharedInformerFactory) } diff --git a/pkg/client/generated/injection/informers/filter/v1alpha1/filter/fake/fake.go b/pkg/client/generated/injection/informers/filter/v1alpha1/filter/fake/fake.go index 70a676d..fd59e30 100644 --- a/pkg/client/generated/injection/informers/filter/v1alpha1/filter/fake/fake.go +++ b/pkg/client/generated/injection/informers/filter/v1alpha1/filter/fake/fake.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ package fake import ( context "context" - fake "github.com/triggermesh/filter/pkg/client/generated/injection/informers/factory/fake" - filter "github.com/triggermesh/filter/pkg/client/generated/injection/informers/filter/v1alpha1/filter" + fake "github.com/triggermesh/routing/pkg/client/generated/injection/informers/factory/fake" + filter "github.com/triggermesh/routing/pkg/client/generated/injection/informers/filter/v1alpha1/filter" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" ) diff --git a/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filter.go b/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filter.go index e19f8b6..c40ed52 100644 --- a/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filter.go +++ b/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filter.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ package filter import ( context "context" - v1alpha1 "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/filter/v1alpha1" - factory "github.com/triggermesh/filter/pkg/client/generated/injection/informers/factory" + v1alpha1 "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/filter/v1alpha1" + factory "github.com/triggermesh/routing/pkg/client/generated/injection/informers/factory" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -46,7 +46,7 @@ func Get(ctx context.Context) v1alpha1.FilterInformer { untyped := ctx.Value(Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/filter/v1alpha1.FilterInformer from context.") + "Unable to fetch github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/filter/v1alpha1.FilterInformer from context.") } return untyped.(v1alpha1.FilterInformer) } diff --git a/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered/fake/fake.go b/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered/fake/fake.go index c2e96e6..0431e02 100644 --- a/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered/fake/fake.go +++ b/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered/fake/fake.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ package fake import ( context "context" - factoryfiltered "github.com/triggermesh/filter/pkg/client/generated/injection/informers/factory/filtered" - filtered "github.com/triggermesh/filter/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered" + factoryfiltered "github.com/triggermesh/routing/pkg/client/generated/injection/informers/factory/filtered" + filtered "github.com/triggermesh/routing/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" diff --git a/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered/filter.go b/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered/filter.go index 2f8bb51..f9138be 100644 --- a/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered/filter.go +++ b/pkg/client/generated/injection/informers/filter/v1alpha1/filter/filtered/filter.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ package filtered import ( context "context" - v1alpha1 "github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/filter/v1alpha1" - filtered "github.com/triggermesh/filter/pkg/client/generated/injection/informers/factory/filtered" + v1alpha1 "github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/filter/v1alpha1" + filtered "github.com/triggermesh/routing/pkg/client/generated/injection/informers/factory/filtered" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -59,7 +59,7 @@ func Get(ctx context.Context, selector string) v1alpha1.FilterInformer { untyped := ctx.Value(Key{Selector: selector}) if untyped == nil { logging.FromContext(ctx).Panicf( - "Unable to fetch github.com/triggermesh/filter/pkg/client/generated/informers/externalversions/filter/v1alpha1.FilterInformer with selector %s from context.", selector) + "Unable to fetch github.com/triggermesh/routing/pkg/client/generated/informers/externalversions/filter/v1alpha1.FilterInformer with selector %s from context.", selector) } return untyped.(v1alpha1.FilterInformer) } diff --git a/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/controller.go b/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/controller.go index 86b8905..188114c 100644 --- a/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/controller.go +++ b/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/controller.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import ( reflect "reflect" strings "strings" - internalclientsetscheme "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset/scheme" - client "github.com/triggermesh/filter/pkg/client/generated/injection/client" - filter "github.com/triggermesh/filter/pkg/client/generated/injection/informers/filter/v1alpha1/filter" + internalclientsetscheme "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset/scheme" + client "github.com/triggermesh/routing/pkg/client/generated/injection/client" + filter "github.com/triggermesh/routing/pkg/client/generated/injection/informers/filter/v1alpha1/filter" zap "go.uber.org/zap" corev1 "k8s.io/api/core/v1" labels "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/reconciler.go b/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/reconciler.go index bdd3a2d..dbac6a1 100644 --- a/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/reconciler.go +++ b/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/reconciler.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import ( fmt "fmt" reflect "reflect" - v1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" - internalclientset "github.com/triggermesh/filter/pkg/client/generated/clientset/internalclientset" - filterv1alpha1 "github.com/triggermesh/filter/pkg/client/generated/listers/filter/v1alpha1" + v1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" + internalclientset "github.com/triggermesh/routing/pkg/client/generated/clientset/internalclientset" + filterv1alpha1 "github.com/triggermesh/routing/pkg/client/generated/listers/filter/v1alpha1" zap "go.uber.org/zap" v1 "k8s.io/api/core/v1" equality "k8s.io/apimachinery/pkg/api/equality" diff --git a/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/state.go b/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/state.go index ca30dfd..854ac68 100644 --- a/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/state.go +++ b/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter/state.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ package filter import ( fmt "fmt" - v1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" + v1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" types "k8s.io/apimachinery/pkg/types" cache "k8s.io/client-go/tools/cache" reconciler "knative.dev/pkg/reconciler" diff --git a/pkg/client/generated/listers/filter/v1alpha1/expansion_generated.go b/pkg/client/generated/listers/filter/v1alpha1/expansion_generated.go index ebc1710..9b9d855 100644 --- a/pkg/client/generated/listers/filter/v1alpha1/expansion_generated.go +++ b/pkg/client/generated/listers/filter/v1alpha1/expansion_generated.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/client/generated/listers/filter/v1alpha1/filter.go b/pkg/client/generated/listers/filter/v1alpha1/filter.go index 9873864..8e13304 100644 --- a/pkg/client/generated/listers/filter/v1alpha1/filter.go +++ b/pkg/client/generated/listers/filter/v1alpha1/filter.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 TriggerMesh Inc. +Copyright (c) 2021 TriggerMesh Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" + v1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/eventfilter/cel/filter.go b/pkg/eventfilter/cel/filter.go index 21d189c..4a5ac61 100644 --- a/pkg/eventfilter/cel/filter.go +++ b/pkg/eventfilter/cel/filter.go @@ -23,7 +23,7 @@ import ( "github.com/google/cel-go/cel" "github.com/tidwall/gjson" - "github.com/triggermesh/filter/pkg/eventfilter" + "github.com/triggermesh/routing/pkg/eventfilter" ) // ConditionalFilter structure holds both CEL Program and variable definitions diff --git a/pkg/reconciler/controller/controller.go b/pkg/reconciler/filter/controller.go similarity index 87% rename from pkg/reconciler/controller/controller.go rename to pkg/reconciler/filter/controller.go index 36bbba4..32eecd8 100644 --- a/pkg/reconciler/controller/controller.go +++ b/pkg/reconciler/filter/controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package controller +package filter import ( "context" @@ -27,9 +27,9 @@ import ( "knative.dev/pkg/resolver" "knative.dev/pkg/tracker" - filterinformer "github.com/triggermesh/filter/pkg/client/generated/injection/informers/filter/v1alpha1/filter" - filterreconciler "github.com/triggermesh/filter/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter" - "github.com/triggermesh/filter/pkg/reconciler/config" + filterinformer "github.com/triggermesh/routing/pkg/client/generated/injection/informers/filter/v1alpha1/filter" + filterreconciler "github.com/triggermesh/routing/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter" + "github.com/triggermesh/routing/pkg/reconciler/config" ) type FilterService struct { diff --git a/pkg/reconciler/controller/filter.go b/pkg/reconciler/filter/reconciler.go similarity index 93% rename from pkg/reconciler/controller/filter.go rename to pkg/reconciler/filter/reconciler.go index f71c67b..06c6101 100644 --- a/pkg/reconciler/controller/filter.go +++ b/pkg/reconciler/filter/reconciler.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package controller +package filter import ( "context" @@ -30,8 +30,8 @@ import ( "knative.dev/pkg/resolver" "knative.dev/pkg/tracker" - filterv1alpha1 "github.com/triggermesh/filter/pkg/apis/filter/v1alpha1" - filterreconciler "github.com/triggermesh/filter/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter" + filterv1alpha1 "github.com/triggermesh/routing/pkg/apis/filter/v1alpha1" + filterreconciler "github.com/triggermesh/routing/pkg/client/generated/injection/reconciler/filter/v1alpha1/filter" ) const (