remove deploy-via-container settings

We are now deploying via container everywhere so we can drop all these
options as they are no longer meaningful and won't cause any different
behavior if they are set or not.

Author: dustymabe

src/cmd-osbuild

@@ -183,7 +183,6 @@ generate_runvm_osbuild_config() {
     image_json=${workdir}/tmp/image.json
 
     # Grab a few values from $image_json
-    deploy_via_container=$(getconfig_def "deploy-via-container" "" "${image_json}")
     extra_kargs="$(python3 -c 'import sys, json; args = json.load(sys.stdin)["extra-kargs"]; print(" ".join(args))' < "${image_json}")"
 
     # OStree container ociarchive file path
@@ -222,7 +221,6 @@ generate_runvm_osbuild_config() {
 artifact-name-prefix: "${name}-${build}"
 build-version: "${build}"
 container-imgref: "${container_imgref}"
-deploy-via-container: "${deploy_via_container}"
 osname: "${name}"
 ostree-container: "${ostree_container}"
 extra-kargs-string: "${extra_kargs}"

src/image-default.yaml

@@ -14,8 +14,6 @@ extra-kargs: []
 ostree-format: oci-chunked-v1
 # Inject io.openshift.build.version-display-names for OpenShift CVO
 ostree-container-inject-openshift-cvo-labels: false
-# True if we should use `ostree container image deploy`
-deploy-via-container: false
 
 # Set this to a target container reference, e.g. ostree-unverified-registry:quay.io/example/os:latest
 # container-imgref: ""

src/runvm-osbuild

@@ -63,7 +63,6 @@ artifact_name_prefix=$(getconfig_def "artifact-name-prefix" "custom-coreos")
 build_version=$(getconfig_def "build-version" "0")
 ostree_container=$(getconfig "ostree-container")
 osname=$(getconfig "osname")
-deploy_via_container=$(getconfig_def "deploy-via-container" "")
 metal_image_size_mb=$(getconfig "metal-image-size")
 cloud_image_size_mb=$(getconfig "cloud-image-size")
 rootfs_size_mb=$(getconfig "rootfs-size")