Enable storage of EventType v1b2 (#7594)

* Enable storage of EventType v1b2 * Add post install to setup * Refactor post install to standalone function
knative · Jan 23, 2024 · fd95228 · fd95228
1 parent 6962251
commit fd95228
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/config/core/resources/eventtype.yaml b/config/core/resources/eventtype.yaml
@@ -25,7 +25,7 @@ spec:
   - &version
     name: v1beta2
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
     schema:
@@ -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

diff --git a/test/e2e-common.sh b/test/e2e-common.sh
@@ -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}"
@@ -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:-}"

diff --git a/test/upgrade/installation/git_head.go b/test/upgrade/installation/git_head.go
@@ -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 {