Skip to content

[release-v1.10] Add eventshub service port name #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pierDipi merged 1 commit into from
Jul 28, 2023
Merged

[release-v1.10] Add eventshub service port name #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions openshift/patches/add-eventshub-port-name.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/102-service.yaml b/vendor/knative.dev/reconciler-test/pkg/eventshub/102-service.yaml
index c3d58ba09..b0400e7e9 100644
--- a/vendor/knative.dev/reconciler-test/pkg/eventshub/102-service.yaml
+++ b/vendor/knative.dev/reconciler-test/pkg/eventshub/102-service.yaml
@@ -22,5 +22,6 @@ spec:
app: eventshub-{{ .name }}
ports:
- protocol: TCP
+ name: http
port: 80
targetPort: 8080
10 changes: 9 additions & 1 deletion openshift/release/artifacts/eventing-kafka-controller.yaml
View file
Open in desktop
Copy link
Copy Markdown
Member Author

@pierDipi pierDipi Jul 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are generated changes (missing from previous PRs)

Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ metadata:
name: config-kafka-features
namespace: knative-eventing
annotations:
knative.dev/example-checksum: "330d9f60"
knative.dev/example-checksum: "1192895d"
data:
_example: |-
################################
Expand Down Expand Up @@ -910,10 +910,18 @@ data:
# The Go text/template used to generate consumergroup ID for triggers.
# The template can reference the trigger Kubernetes metadata only.
triggers.consumergroup.template: "knative-trigger-{{ .Namespace }}-{{ .Name }}"
# The Go text/template used to generate topics for Brokers.
# The template can reference the broker Kubernetes metadata only.
brokers.topic.template: "knative-broker-{{ .Namespace }}-{{ .Name }}"
# The Go text/template used to generate topics for Channels.
# The template can reference the channel Kubernetes metadata only.
channels.topic.template: "knative-channel-{{ .Namespace }}-{{ .Name }}"
dispatcher.rate-limiter: "disabled"
dispatcher.ordered-executor-metrics: "disabled"
controller.autoscaler: "disabled"
triggers.consumergroup.template: "knative-trigger-{{ .Namespace }}-{{ .Name }}"
brokers.topic.template: "knative-broker-{{ .Namespace }}-{{ .Name }}"
channels.topic.template: "knative-messaging-kafka.{{ .Namespace }}.{{ .Name }}"
---
apiVersion: v1
kind: ConfigMap
Expand Down
10 changes: 9 additions & 1 deletion openshift/release/artifacts/eventing-kafka.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ metadata:
name: config-kafka-features
namespace: knative-eventing
annotations:
knative.dev/example-checksum: "330d9f60"
knative.dev/example-checksum: "1192895d"
data:
_example: |-
################################
Expand Down Expand Up @@ -910,10 +910,18 @@ data:
# The Go text/template used to generate consumergroup ID for triggers.
# The template can reference the trigger Kubernetes metadata only.
triggers.consumergroup.template: "knative-trigger-{{ .Namespace }}-{{ .Name }}"
# The Go text/template used to generate topics for Brokers.
# The template can reference the broker Kubernetes metadata only.
brokers.topic.template: "knative-broker-{{ .Namespace }}-{{ .Name }}"
# The Go text/template used to generate topics for Channels.
# The template can reference the channel Kubernetes metadata only.
channels.topic.template: "knative-channel-{{ .Namespace }}-{{ .Name }}"
dispatcher.rate-limiter: "disabled"
dispatcher.ordered-executor-metrics: "disabled"
controller.autoscaler: "disabled"
triggers.consumergroup.template: "knative-trigger-{{ .Namespace }}-{{ .Name }}"
brokers.topic.template: "knative-broker-{{ .Namespace }}-{{ .Name }}"
channels.topic.template: "knative-messaging-kafka.{{ .Namespace }}.{{ .Name }}"
---
apiVersion: v1
kind: ConfigMap
Expand Down
4 changes: 3 additions & 1 deletion openshift/release/generate-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ source $(dirname $0)/resolve.sh
GITHUB_ACTIONS=true $(dirname $0)/../../hack/update-codegen.sh
git apply openshift/patches/disable-ko-publish-rekt.patch
git apply openshift/patches/override-min-version.patch
git apply openshift/patches/add-eventshub-port-name.patch
git apply openshift/patches/unique-secret-names.patch
Copy link
Copy Markdown

@ReToCode ReToCode Jul 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this should be here or not? If ok, feel free to unhold.

Copy link
Copy Markdown
Member Author

@pierDipi pierDipi Jul 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's missing, without this make generate-release will revert that patch


# Eventing core will bring the config tracing ConfigMap, so remove it from heret
rm -f control-plane/config/eventing-kafka-broker/200-controller/100-config-tracing.yaml

image_prefix="registry.ci.openshift.org/openshift/knative-eventing-kafka-broker"
tag=$(yq -r .project.tag openshift/project.yaml)
tag=$(yq r openshift/project.yaml project.tag)
release=${tag/knative-/} # This is used by resolve_resources function so it's not unused as the IDE suggests

echo "Release: $release"
Expand Down
1 change: 1 addition & 0 deletions vendor/knative.dev/reconciler-test/pkg/eventshub/102-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ spec:
app: eventshub-{{ .name }}
ports:
- protocol: TCP
name: http
port: 80
targetPort: 8080