Skip to content

Commit

Permalink
[release-v1.3] Manual dep bump for ocp (#254)
Browse files Browse the repository at this point in the history
* 💫 Running 'go get -u knative.dev/eventing-kafka@release-1.3' for bumping eventing-kafka dependencies

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Running /hack/update-deps.sh && make RELEASE=v1.3.2 generate-release

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
  • Loading branch information
matzew committed May 10, 2022
1 parent e4fcdae commit 400cef5
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require (
k8s.io/client-go v0.22.5
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
knative.dev/eventing v0.30.3-0.20220420143529-0764365a1b4d
knative.dev/eventing-kafka v0.30.0
knative.dev/eventing-kafka v0.30.1-0.20220509122433-a5f80fcb248a
knative.dev/hack v0.0.0-20220224013837-e1785985d364
knative.dev/pkg v0.0.0-20220314165618-a637a96a1bd9
knative.dev/reconciler-test v0.0.0-20220303141206-84821d26ed1f
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1362,8 +1362,8 @@ knative.dev/control-protocol v0.0.0-20220303200406-7e6cdf939b2a/go.mod h1:tc6e+g
knative.dev/eventing v0.30.0/go.mod h1:JCqC8evTls1WiBTmYhPEGME6OQD8HFnLQjFPImwOEOg=
knative.dev/eventing v0.30.3-0.20220420143529-0764365a1b4d h1:OIDb44JxKnzl3tszyQ7SUrvtNcIuWz2pcNbNvnZPy6A=
knative.dev/eventing v0.30.3-0.20220420143529-0764365a1b4d/go.mod h1:JCqC8evTls1WiBTmYhPEGME6OQD8HFnLQjFPImwOEOg=
knative.dev/eventing-kafka v0.30.0 h1:lnPg5WtkmVDXi79rVyahdZdkWZLIuUOc6vs2FYHrJhU=
knative.dev/eventing-kafka v0.30.0/go.mod h1:lKCBbrb3BwzSardpZZuftbXjk/gScuHy7D7cwaOAQdk=
knative.dev/eventing-kafka v0.30.1-0.20220509122433-a5f80fcb248a h1:+61Y6qEl/JRGfmT9mbhrCRwQ3cigt5vulTeQFJ8Mw8U=
knative.dev/eventing-kafka v0.30.1-0.20220509122433-a5f80fcb248a/go.mod h1:lKCBbrb3BwzSardpZZuftbXjk/gScuHy7D7cwaOAQdk=
knative.dev/hack v0.0.0-20220224013837-e1785985d364 h1:wOysRDkzacHlM2OEQoM5ayNT+s/Zymzk5Tv17RL++3g=
knative.dev/hack v0.0.0-20220224013837-e1785985d364/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack/schema v0.0.0-20220224013837-e1785985d364/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,32 @@ import (

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"knative.dev/eventing-kafka/pkg/apis/messaging/v1beta1"
"knative.dev/pkg/kmeta"
"knative.dev/pkg/network"

"knative.dev/eventing-kafka/pkg/apis/messaging/v1beta1"
)

const (
portName = "http"
portNumber = 80
MessagingRoleLabel = "messaging.knative.dev/role"
MessagingRole = "kafka-channel"

ChannelSuffix = "-kn-channel"
// MaxResourceNameLength is the maximum number of characters for a Kubernetes resource name.
// See vendor/k8s.io/apiserver/pkg/storage/names/generate.go
MaxResourceNameLength = 63
)

// ServiceOption can be used to optionally modify the K8s service in MakeK8sService.
type ServiceOption func(*corev1.Service) error

func MakeChannelServiceName(name string) string {
return fmt.Sprintf("%s-kn-channel", name)
if len(name)+len(ChannelSuffix) > MaxResourceNameLength {
return name
}
return fmt.Sprintf("%s%s", name, ChannelSuffix)
}

// ExternalService is a functional option for MakeK8sService to create a K8s service of type ExternalName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func (b *brokerBackedByKafkaChannelSut) setKafkaAsDefaultForBroker(ctx sut.Conte
Name: "config-br-default-channel",
},
Data: map[string]string{
"channelTemplateSpec": fmt.Sprintf(`apiVersion: %s
"channel-template-spec": fmt.Sprintf(`apiVersion: %s
kind: %s
spec:
numPartitions: %d
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher
knative.dev/eventing/test/upgrade/prober/wathola/forwarder
knative.dev/eventing/test/upgrade/prober/wathola/receiver
knative.dev/eventing/test/upgrade/prober/wathola/sender
# knative.dev/eventing-kafka v0.30.0
# knative.dev/eventing-kafka v0.30.1-0.20220509122433-a5f80fcb248a
## explicit
knative.dev/eventing-kafka/pkg/apis/bindings
knative.dev/eventing-kafka/pkg/apis/bindings/v1beta1
Expand Down

0 comments on commit 400cef5

Please sign in to comment.