Remove virt defaulter

Defaulting as described in kubevirt#281 was rejected for now. Removing related code. Signed-off-by: Roman Mohr <[email protected]>
portalgun-io · Dec 4, 2017 · a6e0fe3 · a6e0fe3
1 parent 3975198
commit a6e0fe3
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 750 deletions.
diff --git a/cluster/deploy.sh b/cluster/deploy.sh
@@ -26,7 +26,7 @@ externalServiceManifests()
   source hack/config.sh
 
   # Pretty much equivalent to `kubectl expose service ...`
-  for SVC in spice-proxy:3128 virt-api:8182 haproxy:8184 virt-manifest:8186;
+  for SVC in spice-proxy:3128 virt-api:8182 haproxy:8184;
   do
     IFS=: read NAME PORT <<<$SVC
     cat <<EOF

diff --git a/cmd/virt-manifest/Dockerfile b/cmd/virt-manifest/Dockerfile
diff --git a/cmd/virt-manifest/virt-manifest.go b/cmd/virt-manifest/virt-manifest.go
diff --git a/hack/config-default.sh b/hack/config-default.sh
@@ -1,5 +1,5 @@
-binaries="cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api cmd/virtctl cmd/virt-manifest cmd/fake-qemu-process cmd/virt-dhcp cmd/fake-dnsmasq-process"
-docker_images="cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api cmd/virt-manifest images/haproxy images/iscsi-demo-target-tgtd images/vm-killer images/libvirt-kubevirt images/spice-proxy cmd/virt-migrator cmd/registry-disk-v1alpha images/cirros-registry-disk-demo cmd/virt-dhcp"
+binaries="cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api cmd/virtctl cmd/fake-qemu-process cmd/virt-dhcp cmd/fake-dnsmasq-process"
+docker_images="cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api images/haproxy images/iscsi-demo-target-tgtd images/vm-killer images/libvirt-kubevirt images/spice-proxy cmd/virt-migrator cmd/registry-disk-v1alpha images/cirros-registry-disk-demo cmd/virt-dhcp"
 optional_docker_images="cmd/registry-disk-v1alpha images/fedora-atomic-registry-disk-demo"
 docker_prefix=kubevirt
 docker_tag=${DOCKER_TAG:-latest}

diff --git a/manifests/virt-manifest.yaml.in b/manifests/virt-manifest.yaml.in
diff --git a/pkg/virt-controller/watch/application.go b/pkg/virt-controller/watch/application.go
@@ -28,10 +28,8 @@ import (
 )
 
 const (
-	// Default port that virt-manifest listens on.
 	defaultPort = 8182
 
-	// Default address that virt-manifest listens on.
 	defaultHost = "0.0.0.0"
 
 	launcherImage = "virt-launcher"

diff --git a/pkg/virt-manifest/defaults.go b/pkg/virt-manifest/defaults.go
diff --git a/pkg/virt-manifest/defaults_test.go b/pkg/virt-manifest/defaults_test.go