reorg files (#380)

knative-extensions · Sep 29, 2022 · e1adff0 · e1adff0
1 parent 43c0f77
commit e1adff0
Show file tree

Hide file tree

Showing 160 changed files with 205 additions and 195 deletions.
diff --git a/sink/cmd/controller/main.go → cmd/sink/controller/main.go b/sink/cmd/controller/main.go → cmd/sink/controller/main.go
@@ -19,7 +19,7 @@ package main
 import (
 	"knative.dev/pkg/injection/sharedmain"
 
-	"knative.dev/eventing-redis/sink/pkg/reconciler/streamsink"
+	"knative.dev/eventing-redis/pkg/sink/reconciler/streamsink"
 )
 
 func main() {

diff --git a/sink/cmd/receiver/main.go → cmd/sink/receiver/main.go b/sink/cmd/receiver/main.go → cmd/sink/receiver/main.go
@@ -19,10 +19,11 @@ package main
 import (
 	"log"
 
-	"knative.dev/eventing-redis/sink/pkg/receiver"
 	adapter "knative.dev/eventing/pkg/adapter/v2"
 	"knative.dev/pkg/signals"
 
+	"knative.dev/eventing-redis/pkg/sink/receiver"
+
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 )
 

diff --git a/source/cmd/controller/main.go → cmd/source/controller/main.go b/source/cmd/controller/main.go → cmd/source/controller/main.go
@@ -19,7 +19,7 @@ package main
 import (
 	"knative.dev/pkg/injection/sharedmain"
 
-	"knative.dev/eventing-redis/source/pkg/reconciler/streamsource"
+	"knative.dev/eventing-redis/pkg/source/reconciler/streamsource"
 )
 
 func main() {

diff --git a/source/cmd/receive_adapter/main.go → cmd/source/receive_adapter/main.go b/source/cmd/receive_adapter/main.go → cmd/source/receive_adapter/main.go
@@ -19,7 +19,7 @@ package main
 import (
 	"knative.dev/eventing/pkg/adapter/v2"
 
-	kadapter "knative.dev/eventing-redis/source/pkg/adapter"
+	kadapter "knative.dev/eventing-redis/pkg/source/adapter"
 )
 
 func main() {

diff --git a/sink/config/100-namespace.yaml → config/sink/100-namespace.yaml b/sink/config/100-namespace.yaml → config/sink/100-namespace.yaml
diff --git a/sink/config/200-receiver-clusterrole.yaml → config/sink/200-receiver-clusterrole.yaml b/sink/config/200-receiver-clusterrole.yaml → config/sink/200-receiver-clusterrole.yaml
diff --git a/sink/config/200-serviceaccount.yaml → config/sink/200-serviceaccount.yaml b/sink/config/200-serviceaccount.yaml → config/sink/200-serviceaccount.yaml
diff --git a/sink/config/201-clusterrole.yaml → config/sink/201-clusterrole.yaml b/sink/config/201-clusterrole.yaml → config/sink/201-clusterrole.yaml
diff --git a/sink/config/201-webhook-clusterrole.yaml → config/sink/201-webhook-clusterrole.yaml b/sink/config/201-webhook-clusterrole.yaml → config/sink/201-webhook-clusterrole.yaml
diff --git a/sink/config/202-clusterrolebinding.yaml → config/sink/202-clusterrolebinding.yaml b/sink/config/202-clusterrolebinding.yaml → config/sink/202-clusterrolebinding.yaml
diff --git a/sink/config/300-redisstreamsink.yaml → config/sink/300-redisstreamsink.yaml b/sink/config/300-redisstreamsink.yaml → config/sink/300-redisstreamsink.yaml
diff --git a/sink/config/400-controller-service.yaml → config/sink/400-controller-service.yaml b/sink/config/400-controller-service.yaml → config/sink/400-controller-service.yaml
diff --git a/sink/config/400-webhook-service.yaml → config/sink/400-webhook-service.yaml b/sink/config/400-webhook-service.yaml → config/sink/400-webhook-service.yaml
diff --git a/sink/config/500-controller.yaml → config/sink/500-controller.yaml b/sink/config/500-controller.yaml → config/sink/500-controller.yaml
@@ -31,7 +31,7 @@ spec:
     spec:
       serviceAccountName: redis-controller-manager
       containers:
-      - image: ko://knative.dev/eventing-redis/sink/cmd/controller
+      - image: ko://knative.dev/eventing-redis/cmd/sink/controller
         name: manager
         env:
         - name: SYSTEM_NAMESPACE
@@ -47,7 +47,7 @@ spec:
         - name: CONFIG_LEADERELECTION_NAME
           value: config-leader-election-redis
         - name: STREAMSINK_RA_IMAGE
-          value: ko://knative.dev/eventing-redis/sink/cmd/receiver
+          value: ko://knative.dev/eventing-redis/cmd/sink/receiver
         - name: SECRET_TLS_TLSCERTIFICATE
           value: tls-secret
       terminationGracePeriodSeconds: 10

diff --git a/sink/README.md → config/sink/README.md b/sink/README.md → config/sink/README.md
diff --git a/sink/config/config-leader-election.yaml → config/sink/config-leader-election.yaml b/sink/config/config-leader-election.yaml → config/sink/config-leader-election.yaml
diff --git a/sink/config/config-logging.yaml → config/sink/config-logging.yaml b/sink/config/config-logging.yaml → config/sink/config-logging.yaml
diff --git a/sink/config/config-observability.yaml → config/sink/config-observability.yaml b/sink/config/config-observability.yaml → config/sink/config-observability.yaml
diff --git a/source/config/placeholder.go → config/sink/placeholder.go b/source/config/placeholder.go → config/sink/placeholder.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package config is a placeholder that allows us to pull in config files
 // via go mod vendor.
-package config
+package sink
diff --git a/sink/config/tls-secret.yaml → config/sink/tls-secret.yaml b/sink/config/tls-secret.yaml → config/sink/tls-secret.yaml
diff --git a/source/config/100-namespace.yaml → config/source/100-namespace.yaml b/source/config/100-namespace.yaml → config/source/100-namespace.yaml
diff --git a/source/config/200-adapter-clusterrole.yaml → config/source/200-adapter-clusterrole.yaml b/source/config/200-adapter-clusterrole.yaml → config/source/200-adapter-clusterrole.yaml
diff --git a/source/config/200-serviceaccount.yaml → config/source/200-serviceaccount.yaml b/source/config/200-serviceaccount.yaml → config/source/200-serviceaccount.yaml
diff --git a/source/config/201-clusterrole.yaml → config/source/201-clusterrole.yaml b/source/config/201-clusterrole.yaml → config/source/201-clusterrole.yaml
diff --git a/source/config/201-webhook-clusterrole.yaml → config/source/201-webhook-clusterrole.yaml b/source/config/201-webhook-clusterrole.yaml → config/source/201-webhook-clusterrole.yaml
diff --git a/source/config/202-clusterrolebinding.yaml → config/source/202-clusterrolebinding.yaml b/source/config/202-clusterrolebinding.yaml → config/source/202-clusterrolebinding.yaml
diff --git a/source/config/300-redisstreamsource.yaml → config/source/300-redisstreamsource.yaml b/source/config/300-redisstreamsource.yaml → config/source/300-redisstreamsource.yaml
diff --git a/source/config/400-controller-service.yaml → config/source/400-controller-service.yaml b/source/config/400-controller-service.yaml → config/source/400-controller-service.yaml
diff --git a/source/config/400-webhook-service.yaml → config/source/400-webhook-service.yaml b/source/config/400-webhook-service.yaml → config/source/400-webhook-service.yaml
diff --git a/source/config/500-controller.yaml → config/source/500-controller.yaml b/source/config/500-controller.yaml → config/source/500-controller.yaml
@@ -31,7 +31,7 @@ spec:
     spec:
       serviceAccountName: redis-controller-manager
       containers:
-      - image: ko://knative.dev/eventing-redis/source/cmd/controller
+      - image: ko://knative.dev/eventing-redis/cmd/source/controller
         name: manager
         env:
         - name: SYSTEM_NAMESPACE
@@ -47,7 +47,7 @@ spec:
         - name: CONFIG_LEADERELECTION_NAME
           value: config-leader-election-redis
         - name: STREAMSOURCE_RA_IMAGE
-          value: ko://knative.dev/eventing-redis/source/cmd/receive_adapter
+          value: ko://knative.dev/eventing-redis/cmd/source/receive_adapter
         - name: CONFIG_REDIS_NUMCONSUMERS
           value: config-redis
         - name: SECRET_TLS_TLSCERTIFICATE

diff --git a/source/README.md → config/source/README.md b/source/README.md → config/source/README.md
diff --git a/source/config/config-leader-election.yaml → config/source/config-leader-election.yaml b/source/config/config-leader-election.yaml → config/source/config-leader-election.yaml
diff --git a/source/config/config-logging.yaml → config/source/config-logging.yaml b/source/config/config-logging.yaml → config/source/config-logging.yaml
diff --git a/source/config/config-observability.yaml → config/source/config-observability.yaml b/source/config/config-observability.yaml → config/source/config-observability.yaml
diff --git a/source/config/config-redis.yaml → config/source/config-redis.yaml b/source/config/config-redis.yaml → config/source/config-redis.yaml
diff --git a/sink/config/placeholder.go → config/source/placeholder.go b/sink/config/placeholder.go → config/source/placeholder.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package config is a placeholder that allows us to pull in config files
 // via go mod vendor.
-package config
+package source
diff --git a/source/config/tls-secret.yaml → config/source/tls-secret.yaml b/source/config/tls-secret.yaml → config/source/tls-secret.yaml
diff --git a/hack/release.sh b/hack/release.sh
@@ -24,8 +24,8 @@ export GO111MODULE=on
 # Yaml files to generate, and the source config dir for them.
 declare -A COMPONENTS
 COMPONENTS=(
-  ["redis-source.yaml"]="source/config"
-  ["redis-sink.yaml"]="sink/config"
+  ["redis-source.yaml"]="config/source"
+  ["redis-sink.yaml"]="config/sink"
 )
 readonly COMPONENTS
 
@@ -42,7 +42,7 @@ function build_release() {
   local all_yamls=()
   for yaml in "${!COMPONENTS[@]}"; do
     local config="${COMPONENTS[${yaml}]}"
-    echo "Building Knative Eventing Contrib - ${config}"
+    echo "Building Knative Eventing Redis - ${config}"
     # TODO(chizhg): reenable --strict mode after https://github.com/knative/test-infra/issues/1262 is fixed.
     ko resolve ${KO_FLAGS} -f ${config}/ | "${LABEL_YAML_CMD[@]}" > ${yaml}
     all_yamls+=(${yaml})

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -32,25 +32,25 @@ group "Kubernetes Codegen"
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
 ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
-  knative.dev/eventing-redis/source/pkg/client knative.dev/eventing-redis/source/pkg/apis \
+  knative.dev/eventing-redis/pkg/source/client knative.dev/eventing-redis/pkg/source/apis \
   "sources:v1alpha1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt
 
 ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
-  knative.dev/eventing-redis/sink/pkg/client knative.dev/eventing-redis/sink/pkg/apis \
+  knative.dev/eventing-redis/pkg/sink/client knative.dev/eventing-redis/pkg/sink/apis \
   "sinks:v1alpha1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt
 
 group "Knative Codegen"
 
 # Knative Injection
 ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
-  knative.dev/eventing-redis/source/pkg/client knative.dev/eventing-redis/source/pkg/apis \
+  knative.dev/eventing-redis/pkg/source/client knative.dev/eventing-redis/pkg/source/apis \
   "sources:v1alpha1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt
 
 ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
-  knative.dev/eventing-redis/sink/pkg/client knative.dev/eventing-redis/sink/pkg/apis \
+  knative.dev/eventing-redis/pkg/sink/client knative.dev/eventing-redis/pkg/sink/apis \
   "sinks:v1alpha1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt
 

diff --git a/pkg/apis/v1alpha1/connection.go b/pkg/apis/v1alpha1/connection.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/pkg/reconciler/deployment.go b/pkg/reconciler/deployment.go
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package reconciler
 
 import (

diff --git a/pkg/reconciler/kservice.go b/pkg/reconciler/kservice.go
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package reconciler
 
 import (

diff --git a/pkg/reconciler/rolebinding.go b/pkg/reconciler/rolebinding.go
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package reconciler
 
 import (

diff --git a/pkg/reconciler/serviceaccount.go b/pkg/reconciler/serviceaccount.go
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package reconciler
 
 import (

diff --git a/sink/pkg/apis/sinks/register.go → pkg/sink/apis/sinks/register.go b/sink/pkg/apis/sinks/register.go → pkg/sink/apis/sinks/register.go
diff --git a/sink/pkg/apis/sinks/v1alpha1/doc.go → pkg/sink/apis/sinks/v1alpha1/doc.go b/sink/pkg/apis/sinks/v1alpha1/doc.go → pkg/sink/apis/sinks/v1alpha1/doc.go
diff --git a/...ks/v1alpha1/redisstream_lifecycle_test.go → ...ks/v1alpha1/redisstream_lifecycle_test.go b/...ks/v1alpha1/redisstream_lifecycle_test.go → ...ks/v1alpha1/redisstream_lifecycle_test.go
diff --git a/.../apis/sinks/v1alpha1/redisstream_types.go → .../apis/sinks/v1alpha1/redisstream_types.go b/.../apis/sinks/v1alpha1/redisstream_types.go → .../apis/sinks/v1alpha1/redisstream_types.go
diff --git a/.../sinks/v1alpha1/redisstream_types_test.go → .../sinks/v1alpha1/redisstream_types_test.go b/.../sinks/v1alpha1/redisstream_types_test.go → .../sinks/v1alpha1/redisstream_types_test.go
diff --git a/...is/sinks/v1alpha1/redistream_lifecycle.go → ...is/sinks/v1alpha1/redistream_lifecycle.go b/...is/sinks/v1alpha1/redistream_lifecycle.go → ...is/sinks/v1alpha1/redistream_lifecycle.go
diff --git a/sink/pkg/apis/sinks/v1alpha1/register.go → pkg/sink/apis/sinks/v1alpha1/register.go b/sink/pkg/apis/sinks/v1alpha1/register.go → pkg/sink/apis/sinks/v1alpha1/register.go
@@ -20,7 +20,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"knative.dev/eventing-redis/sink/pkg/apis/sinks"
+
+	"knative.dev/eventing-redis/pkg/sink/apis/sinks"
 )
 
 // SchemeGroupVersion is group version used to register these objects

diff --git a/.../pkg/apis/sinks/v1alpha1/register_test.go → ...sink/apis/sinks/v1alpha1/register_test.go b/.../pkg/apis/sinks/v1alpha1/register_test.go → ...sink/apis/sinks/v1alpha1/register_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/...s/sinks/v1alpha1/zz_generated.deepcopy.go → ...s/sinks/v1alpha1/zz_generated.deepcopy.go b/...s/sinks/v1alpha1/zz_generated.deepcopy.go → ...s/sinks/v1alpha1/zz_generated.deepcopy.go
diff --git a/...g/client/clientset/versioned/clientset.go → ...k/client/clientset/versioned/clientset.go b/...g/client/clientset/versioned/clientset.go → ...k/client/clientset/versioned/clientset.go
diff --git a/sink/pkg/client/clientset/versioned/doc.go → pkg/sink/client/clientset/versioned/doc.go b/sink/pkg/client/clientset/versioned/doc.go → pkg/sink/client/clientset/versioned/doc.go
diff --git a/...set/versioned/fake/clientset_generated.go → ...set/versioned/fake/clientset_generated.go b/...set/versioned/fake/clientset_generated.go → ...set/versioned/fake/clientset_generated.go
diff --git a/...kg/client/clientset/versioned/fake/doc.go → ...nk/client/clientset/versioned/fake/doc.go b/...kg/client/clientset/versioned/fake/doc.go → ...nk/client/clientset/versioned/fake/doc.go
diff --git a/...ient/clientset/versioned/fake/register.go → ...ient/clientset/versioned/fake/register.go b/...ient/clientset/versioned/fake/register.go → ...ient/clientset/versioned/fake/register.go
diff --git a/.../client/clientset/versioned/scheme/doc.go → .../client/clientset/versioned/scheme/doc.go b/.../client/clientset/versioned/scheme/doc.go → .../client/clientset/versioned/scheme/doc.go
diff --git a/...nt/clientset/versioned/scheme/register.go → ...nt/clientset/versioned/scheme/register.go b/...nt/clientset/versioned/scheme/register.go → ...nt/clientset/versioned/scheme/register.go
diff --git a/...set/versioned/typed/sinks/v1alpha1/doc.go → ...set/versioned/typed/sinks/v1alpha1/doc.go b/...set/versioned/typed/sinks/v1alpha1/doc.go → ...set/versioned/typed/sinks/v1alpha1/doc.go
diff --git a/...ersioned/typed/sinks/v1alpha1/fake/doc.go → ...ersioned/typed/sinks/v1alpha1/fake/doc.go b/...ersioned/typed/sinks/v1alpha1/fake/doc.go → ...ersioned/typed/sinks/v1alpha1/fake/doc.go
diff --git a/...nks/v1alpha1/fake/fake_redisstreamsink.go → ...nks/v1alpha1/fake/fake_redisstreamsink.go b/...nks/v1alpha1/fake/fake_redisstreamsink.go → ...nks/v1alpha1/fake/fake_redisstreamsink.go
diff --git a/.../sinks/v1alpha1/fake/fake_sinks_client.go → .../sinks/v1alpha1/fake/fake_sinks_client.go b/.../sinks/v1alpha1/fake/fake_sinks_client.go → .../sinks/v1alpha1/fake/fake_sinks_client.go
diff --git a/...ped/sinks/v1alpha1/generated_expansion.go → ...ped/sinks/v1alpha1/generated_expansion.go b/...ped/sinks/v1alpha1/generated_expansion.go → ...ped/sinks/v1alpha1/generated_expansion.go
diff --git a/...d/typed/sinks/v1alpha1/redisstreamsink.go → ...d/typed/sinks/v1alpha1/redisstreamsink.go b/...d/typed/sinks/v1alpha1/redisstreamsink.go → ...d/typed/sinks/v1alpha1/redisstreamsink.go
diff --git a/...oned/typed/sinks/v1alpha1/sinks_client.go → ...oned/typed/sinks/v1alpha1/sinks_client.go b/...oned/typed/sinks/v1alpha1/sinks_client.go → ...oned/typed/sinks/v1alpha1/sinks_client.go
diff --git a/...ent/informers/externalversions/factory.go → ...ent/informers/externalversions/factory.go b/...ent/informers/externalversions/factory.go → ...ent/informers/externalversions/factory.go
diff --git a/...ent/informers/externalversions/generic.go → ...ent/informers/externalversions/generic.go b/...ent/informers/externalversions/generic.go → ...ent/informers/externalversions/generic.go
diff --git a/.../internalinterfaces/factory_interfaces.go → .../internalinterfaces/factory_interfaces.go b/.../internalinterfaces/factory_interfaces.go → .../internalinterfaces/factory_interfaces.go
diff --git a/...rmers/externalversions/sinks/interface.go → ...rmers/externalversions/sinks/interface.go b/...rmers/externalversions/sinks/interface.go → ...rmers/externalversions/sinks/interface.go
diff --git a/...ernalversions/sinks/v1alpha1/interface.go → ...ernalversions/sinks/v1alpha1/interface.go b/...ernalversions/sinks/v1alpha1/interface.go → ...ernalversions/sinks/v1alpha1/interface.go
diff --git a/...ersions/sinks/v1alpha1/redisstreamsink.go → ...ersions/sinks/v1alpha1/redisstreamsink.go b/...ersions/sinks/v1alpha1/redisstreamsink.go → ...ersions/sinks/v1alpha1/redisstreamsink.go
diff --git a/sink/pkg/client/injection/client/client.go → pkg/sink/client/injection/client/client.go b/sink/pkg/client/injection/client/client.go → pkg/sink/client/injection/client/client.go
diff --git a/.../pkg/client/injection/client/fake/fake.go → ...sink/client/injection/client/fake/fake.go b/.../pkg/client/injection/client/fake/fake.go → ...sink/client/injection/client/fake/fake.go