Skip to content
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

Jump to bottom

Enable storage of EventType v1b2 #7594

Merged
merged 3 commits into from
Jan 23, 2024
Merged

Enable storage of EventType v1b2 #7594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d472f6
Enable storage of EventType v1b2
dsimansk Jan 18, 2024
72601ae
Add post install to setup
dsimansk Jan 18, 2024
d30fa58
Refactor post install to standalone function
dsimansk Jan 19, 2024
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
4 changes: 2 additions & 2 deletions config/core/resources/eventtype.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- &version
name: v1beta2
served: true
storage: false
storage: true
subresources:
status: {}
schema:
Expand Down Expand Up @@ -157,7 +157,7 @@ spec:
- <<: *version
name: v1beta1
served: true
storage: true
storage: false
# This indicates the v1beta1 version of the custom resource is deprecated.
# API requests to this version receive a warning header in the server response.
deprecated: true
Expand Down
16 changes: 15 additions & 1 deletion test/e2e-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ function install_mt_broker() {
if [[ -z "${EVENTING_MT_CHANNEL_BROKER_YAML:-}" ]]; then
build_knative_from_source
else
echo "use exist EVENTING_MT_CHANNEL_BROKER_YAML"
echo "use existing EVENTING_MT_CHANNEL_BROKER_YAML"
fi
local EVENTING_MT_CHANNEL_BROKER_NAME=${TMP_DIR}/${EVENTING_MT_CHANNEL_BROKER_YAML##*/}
sed "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${SYSTEM_NAMESPACE}/g" "${EVENTING_MT_CHANNEL_BROKER_YAML}" > "${EVENTING_MT_CHANNEL_BROKER_NAME}"
Expand All @@ -233,6 +233,20 @@ function install_mt_broker() {
wait_until_pods_running "${SYSTEM_NAMESPACE}" || fail_test "Knative Eventing with MT Broker did not come up"
}

function install_post_install_job() {
# Var defined and populated by generate-yaml.sh
if [[ -z "${EVENTING_POST_INSTALL_YAML:-}" ]]; then
build_knative_from_source
else
echo "use existing EVENTING_POST_INSTALL_YAML"
fi
local EVENTING_POST_INSTALL_NAME=${TMP_DIR}/${EVENTING_POST_INSTALL_YAML##*/}
sed "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${SYSTEM_NAMESPACE}/g" "${EVENTING_POST_INSTALL_YAML}" > "${EVENTING_POST_INSTALL_NAME=}"
kubectl create \
-f "${EVENTING_POST_INSTALL_NAME}" || return 1
UNINSTALL_LIST+=( "${EVENTING_POST_INSTALL_NAME}" )
}

function enable_sugar() {
# Extra parameters for ko apply
KO_FLAGS="${KO_FLAGS:-}"
Expand Down
1 change: 1 addition & 0 deletions test/upgrade/installation/git_head.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func GitHead() pkgupgrade.Operation {
"install_head",
"install_channel_crds",
"install_mt_broker",
"install_post_install_job",
"enable_sugar",
}
for _, shellfunc := range ops {
Expand Down
Loading