Skip to content
This repository has been archived by the owner on Jun 4, 2021. It is now read-only.

Commit

Permalink
Remove kafka src channel (#1643)
Browse files Browse the repository at this point in the history 
* Removing Kafka folder

Signed-off-by: Matthias Wessendorf <[email protected]>

* Clean up hack scripts, and remove kafka tjere

Signed-off-by: Matthias Wessendorf <[email protected]>

* Remove conformance tests

Signed-off-by: Matthias Wessendorf <[email protected]>

* Remove some of tests

Signed-off-by: Matthias Wessendorf <[email protected]>

* Update deps...

Signed-off-by: Matthias Wessendorf <[email protected]>

* more dep updates

Signed-off-by: Matthias Wessendorf <[email protected]>

* More updates

Signed-off-by: Matthias Wessendorf <[email protected]>

* More updates

Signed-off-by: Matthias Wessendorf <[email protected]>

* More updates

Signed-off-by: Matthias Wessendorf <[email protected]>

* More updates

Signed-off-by: Matthias Wessendorf <[email protected]>
  • Loading branch information
@matzew
matzew authored Nov 9, 2020
1 parent e79738d commit f9bb196
Show file tree
Hide file tree
Showing 1,852 changed files with 1,066 additions and 244,263 deletions.
24 changes: 5 additions & 19 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,16 @@ module knative.dev/eventing-contrib
go 1.14

require (
github.com/Shopify/sarama v1.27.0
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.2.0
github.com/cloudevents/sdk-go/v2 v2.2.0
github.com/davecgh/go-spew v1.1.1
github.com/golang/protobuf v1.4.2
github.com/google/go-cmp v0.5.2
github.com/google/uuid v1.1.1
github.com/gorilla/websocket v1.4.2
github.com/influxdata/tdigest v0.0.1 // indirect
github.com/kelseyhightower/envconfig v1.4.0
github.com/slinkydeveloper/loadastic v0.0.0-20191203132749-9afe5a010a57
github.com/stretchr/testify v1.6.0
go.opencensus.io v0.22.5-0.20200716030834-3456e1d174b2
go.opentelemetry.io/otel v0.4.2 // indirect
go.uber.org/zap v1.15.0
golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 // indirect
honnef.co/go/tools v0.0.1-2020.1.5 // indirect
k8s.io/api v0.18.8
k8s.io/apimachinery v0.18.8
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
github.com/stretchr/testify v1.6.0 // indirect
go.opencensus.io v0.22.5-0.20200716030834-3456e1d174b2 // indirect
gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2 // indirect
knative.dev/eventing v0.17.1-0.20200925222044-b313bac67b1c
knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab
knative.dev/test-infra v0.0.0-20200921012245-37f1a12adbd3
knative.dev/hack v0.0.0-20201027221733-0d7f2f064b7b
knative.dev/pkg v0.0.0-20201027223833-826303ca0653
)

replace (
Expand Down
56 changes: 26 additions & 30 deletions go.sum
View file

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions hack/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,15 @@
# Documentation about this script and how to use it can be found
# at https://github.com/knative/test-infra/tree/master/ci

source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/release.sh
source $(dirname $0)/../vendor/knative.dev/hack/release.sh

export GO111MODULE=on

# Yaml files to generate, and the source config dir for them.
declare -A COMPONENTS
COMPONENTS=(
["appender.yaml"]="config/tools/appender"
["awssqs.yaml"]="awssqs/config"
["event-display.yaml"]="config/tools/event-display"
["kafka-source.yaml"]="kafka/source/config"
["kafka-channel.yaml"]="kafka/channel/config"
["websocket-source.yaml"]="config/tools/websocket-source"
)
readonly COMPONENTS
Expand Down
5 changes: 1 addition & 4 deletions hack/tools.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ limitations under the License.
package tools

import (
_ "knative.dev/hack"
_ "knative.dev/pkg/hack"
_ "knative.dev/test-infra/scripts"

// Test images from eventing
_ "knative.dev/eventing/test/test_images/event-sender"
_ "knative.dev/eventing/test/test_images/filterevents"
_ "knative.dev/eventing/test/test_images/heartbeats"
_ "knative.dev/eventing/test/test_images/performance"
_ "knative.dev/eventing/test/test_images/print"
_ "knative.dev/eventing/test/test_images/recordevents"
_ "knative.dev/eventing/test/test_images/sequencestepper"
_ "knative.dev/eventing/test/test_images/transformevents"
)
47 changes: 1 addition & 46 deletions hack/update-codegen.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if [ -z "${GOPATH:-}" ]; then
export GOPATH=$(go env GOPATH)
fi

source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/library.sh
source $(dirname $0)/../vendor/knative.dev/hack/library.sh

CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 $(dirname $0)/../vendor/k8s.io/code-generator 2>/dev/null || echo ../../../k8s.io/code-generator)}

Expand All @@ -35,50 +35,5 @@ KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 $(dir
chmod +x ${CODEGEN_PKG}/generate-groups.sh
chmod +x ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh

# Apache Kafka Sources and Bindings
API_DIRS_SOURCES_AND_BINDINGS=(kafka/source/pkg )

for DIR in "${API_DIRS_SOURCES_AND_BINDINGS[@]}"; do
# generate the code with:
# --output-base because this script should also be able to run inside the vendor dir of
# 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-contrib/${DIR}/client" "knative.dev/eventing-contrib/${DIR}/apis" \
"sources:v1alpha1 sources:v1beta1 bindings:v1alpha1 bindings:v1beta1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt

# Knative Injection
${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
"knative.dev/eventing-contrib/${DIR}/client" "knative.dev/eventing-contrib/${DIR}/apis" \
"sources:v1alpha1 sources:v1beta1 bindings:v1alpha1 bindings:v1beta1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt
done

# KafkaChannel
API_DIRS_CHANNELS=(kafka/channel/pkg)

for DIR in "${API_DIRS_CHANNELS[@]}"; do
# generate the code with:
# --output-base because this script should also be able to run inside the vendor dir of
# 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-contrib/${DIR}/client" "knative.dev/eventing-contrib/${DIR}/apis" \
"messaging:v1alpha1 messaging:v1beta1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt

# Knative Injection
${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
"knative.dev/eventing-contrib/${DIR}/client" "knative.dev/eventing-contrib/${DIR}/apis" \
"messaging:v1alpha1 messaging:v1beta1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt
done

# Depends on generate-groups.sh to install bin/deepcopy-gen
${GOPATH}/bin/deepcopy-gen \
-O zz_generated.deepcopy \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt

# Make sure our dependencies are up-to-date
${REPO_ROOT_DIR}/hack/update-deps.sh
47 changes: 2 additions & 45 deletions hack/update-deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,49 +18,6 @@ set -o errexit
set -o nounset
set -o pipefail

export GO111MODULE=on
source $(dirname $0)/../vendor/knative.dev/hack/library.sh

source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/library.sh

cd ${REPO_ROOT_DIR}

VERSION="master"

# The list of dependencies that we track at HEAD and periodically
# float forward in this repository.
FLOATING_DEPS=(
"knative.dev/[email protected]"
"knative.dev/eventing@${VERSION}"
"knative.dev/serving@${VERSION}"
"knative.dev/[email protected]"
)

# Parse flags to determine any we should pass to dep.
GO_GET=0
while [[ $# -ne 0 ]]; do
parameter=$1
case ${parameter} in
--upgrade) GO_GET=1 ;;
*) abort "unknown option ${parameter}" ;;
esac
shift
done
readonly GO_GET

if (( GO_GET )); then
go get -d ${FLOATING_DEPS[@]}
fi

# Prune modules.
go mod tidy
go mod vendor

rm -rf $(find vendor/ -name 'OWNERS')
rm -rf $(find vendor/ -name 'OWNERS_ALIASES')
rm -rf $(find vendor/ -name 'BUILD')
rm -rf $(find vendor/ -name 'BUILD.bazel')
rm -rf $(find vendor/ -name '*_test.go')

export GOFLAGS=-mod=vendor

update_licenses third_party/VENDOR-LICENSE "./..."
go_update_deps "$@"
1 change: 0 additions & 1 deletion hack/update-k8s-deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,3 @@ done


./hack/update-deps.sh

2 changes: 1 addition & 1 deletion hack/verify-codegen.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -o pipefail

export GO111MODULE=on

source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/library.sh
source $(dirname $0)/../vendor/knative.dev/hack/library.sh

readonly TMP_DIFFROOT="$(mktemp -d ${REPO_ROOT_DIR}/tmpdiffroot.XXXXXX)"

Expand Down
9 changes: 0 additions & 9 deletions kafka/OWNERS
View file

This file was deleted.

13 changes: 0 additions & 13 deletions kafka/README.md
View file

This file was deleted.

141 changes: 0 additions & 141 deletions kafka/channel/README.md
View file

This file was deleted.

29 changes: 0 additions & 29 deletions kafka/channel/cmd/channel_controller/main.go
View file

This file was deleted.

Loading

0 comments on commit f9bb196

Please sign in to comment.