From bc18fb0a386404c6252323d0a63ad5869c3a8a9a Mon Sep 17 00:00:00 2001 From: Karel Simon Date: Thu, 21 May 2020 11:04:26 +0200 Subject: [PATCH] removed labeller from manifests and csv generator labeller is now part of kubevirt core. Signed-off-by: Karel Simon --- _defaults.yml | 3 -- build/csv-generator.sh | 24 ------------- build/update-olm.py | 14 -------- cluster/latest/kubevirt-ssp-operator.yaml | 8 ----- deploy/operator.yaml | 8 ----- functests/testlib.sh | 34 ------------------- ...erator.vVERSION.clusterserviceversion.yaml | 4 --- ...operator.latest.clusterserviceversion.yaml | 8 ----- 8 files changed, 103 deletions(-) diff --git a/_defaults.yml b/_defaults.yml index 4335f9e5..50dff73c 100644 --- a/_defaults.yml +++ b/_defaults.yml @@ -20,9 +20,6 @@ # # Any version, or default, should not be set more than once in a place in the source tree. -kvm_info_nfd_plugin_tag: "{{ lookup('env','KVM_INFO_TAG')| default('v0.5.8', true) }}" -kubevirt_cpu_nfd_plugin_tag: "{{ lookup('env','CPU_PLUGIN_TAG')| default('v0.1.1', true) }}" -virt_launcher_tag: "{{ lookup('env','VIRT_LAUNCHER_TAG')| default('v0.21.0', true) }}" validator_tag: "{{ lookup('env','VALIDATOR_TAG')| default('v0.6.5', true) }}" image_name_prefix: "{{ lookup('env','IMAGE_NAME_PREFIX')| default('', true) }}" templates_version: v0.10.0 diff --git a/build/csv-generator.sh b/build/csv-generator.sh index 6ba0b5d2..e4b962bd 100755 --- a/build/csv-generator.sh +++ b/build/csv-generator.sh @@ -28,11 +28,7 @@ help_text() { echo " --namespace: (REQUIRED) The namespace set on the CSV file" echo " --operator-image: (REQUIRED) The operator container image to use in the CSV file" echo " --watch-namespace: (OPTIONAL)" - echo " --kvm-info-tag: (OPTIONAL)" echo " --validator-tag: (OPTIONAL)" - echo " --virt-launcher-tag: (OPTIONAL)" - echo " --node-labeller-tag: (OPTIONAL)" - echo " --cpu-plugin-tag: (OPTIONAL)" echo " --image-name-prefix: (OPTIONAL)" echo " --dump-crds: (OPTIONAL) Dumps CRD manifests with the CSV to stdout" } @@ -44,11 +40,7 @@ OPERATOR_IMAGE="" # OPTIONAL ARGS WATCH_NAMESPACE="" -KVM_INFO_TAG="" VALIDATOR_TAG="" -VIRT_LAUNCHER_TAG="" -NODE_LABELLER_TAG="" -CPU_PLUGIN_TAG="" IMAGE_NAME_PREFIX="" DUMP_CRDS="" @@ -70,21 +62,9 @@ while (( "$#" )); do --watch-namespace) WATCH_NAMESPACE=$VAL ;; - --kvm-info-tag) - KVM_INFO_TAG=$VAL - ;; --validator-tag) VALIDATOR_TAG=$VAL ;; - --virt-launcher-tag) - VIRT_LAUNCHER_TAG=$VAL - ;; - --node-labeller-tag) - NODE_LABELLER_TAG=$VAL - ;; - --cpu-plugin-tag) - CPU_PLUGIN_TAG=$VAL - ;; --image-name-prefix) IMAGE_NAME_PREFIX=$VAL ;; @@ -116,11 +96,7 @@ sed -i "s/namespace: placeholder/namespace: ${NAMESPACE}/g" ${TMP_FILE} sed -i "s|REPLACE_IMAGE|${OPERATOR_IMAGE}|g" ${TMP_FILE} replace_env_var "WATCH_NAMESPACE" $WATCH_NAMESPACE -replace_env_var "KVM_INFO_TAG" $KVM_INFO_TAG replace_env_var "VALIDATOR_TAG" $VALIDATOR_TAG -replace_env_var "VIRT_LAUNCHER_TAG" $VIRT_LAUNCHER_TAG -replace_env_var "NODE_LABELLER_TAG" $NODE_LABELLER_TAG -replace_env_var "CPU_PLUGIN_TAG" $CPU_PLUGIN_TAG replace_env_var "IMAGE_NAME_PREFIX" $IMAGE_NAME_PREFIX # dump CSV and CRD manifests to stdout diff --git a/build/update-olm.py b/build/update-olm.py index 90ba962d..874474aa 100755 --- a/build/update-olm.py +++ b/build/update-olm.py @@ -77,20 +77,6 @@ ], }], }, - 'kubevirtnodelabellerbundles.ssp.kubevirt.io': { - 'displayName': 'KubeVirt Node labeller', - 'description': \ - 'Represents a deployment of Node labeller component', - 'specDescriptors': [{ - 'description': \ - 'The version of the node labeller to deploy', - 'displayName': 'Version', - 'path': 'version', - 'x-descriptors': [ - 'urn:alm:descriptor:io.kubernetes.ssp:version', - ], - }], - }, 'kubevirtmetricsaggregations.ssp.kubevirt.io': { 'displayName': 'KubeVirt Metric Aggregation', 'description': \ diff --git a/cluster/latest/kubevirt-ssp-operator.yaml b/cluster/latest/kubevirt-ssp-operator.yaml index d95fcb6b..5b6ee34f 100644 --- a/cluster/latest/kubevirt-ssp-operator.yaml +++ b/cluster/latest/kubevirt-ssp-operator.yaml @@ -181,16 +181,8 @@ spec: value: quay.io/fromani/kubevirt-ssp-operator-container:latest - name: WATCH_NAMESPACE value: "" - - name: KVM_INFO_TAG - value: "" - name: VALIDATOR_TAG value: "" - - name: VIRT_LAUNCHER_TAG - value: "" - - name: NODE_LABELLER_TAG - value: "" - - name: CPU_PLUGIN_TAG - value: "" - name: IMAGE_NAME_PREFIX value: "" - name: OPERATOR_NAME diff --git a/deploy/operator.yaml b/deploy/operator.yaml index b9281997..6d2dc476 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -36,16 +36,8 @@ spec: value: REPLACE_IMAGE - name: WATCH_NAMESPACE value: "" - - name: KVM_INFO_TAG - value: "" - name: VALIDATOR_TAG value: "" - - name: VIRT_LAUNCHER_TAG - value: "" - - name: NODE_LABELLER_TAG - value: "" - - name: CPU_PLUGIN_TAG - value: "" - name: IMAGE_NAME_PREFIX value: "" - name: OPERATOR_NAME diff --git a/functests/testlib.sh b/functests/testlib.sh index b8f879d8..8a4d0878 100644 --- a/functests/testlib.sh +++ b/functests/testlib.sh @@ -59,25 +59,6 @@ is_template_validator_running() { return 1 } -is_node_labeller_running() { - NS="--all-namespaces" - if [ -n "$1" ]; then - NS="-n ${1}" - fi - VERB="${V}" - if [ -n "$2" ]; then - VERB="${2}" - fi - local labeller_pod=$( oc get pods --selector='app=kubevirt-node-labeller' ${NS} -o json ) - local labeller_status=$( echo ${labeller_pod} | jq -r '.items[0].status' ) - local labeller_phase=$( echo ${labeller_pod} | jq -r '.items[0].status.phase' ) - (( ${VERB} >= 1 )) && echo "node-labeller status: ${labeller_status}" - if [ "${labeller_phase}" == "Running" ]; then - return 0 - fi - return 1 -} - wait_template_validator_running() { # $1 passthrough local wait_secs=${2:-2} @@ -93,21 +74,6 @@ wait_template_validator_running() { return 1 } -wait_node_labeller_running() { - # $1 passthrough - local wait_secs=${2:-2} - local max_tries=${3:-15} - for num in $( seq 1 ${max_tries} ); do - (( ${V} >= 1 )) && echo "waiting for node-labeller availability: ${num}/${max_tries}" - sleep ${wait_secs}s - if is_node_labeller_running $1 0; then - return 0 - fi - done - dump_component_state "" 'app=kubevirt-node-labeller' - return 1 -} - wait_for_condition() { NS="--all-namespaces" if [ -n "$1" ]; then diff --git a/manifests/generated/kubevirt-ssp-operator.vVERSION.clusterserviceversion.yaml b/manifests/generated/kubevirt-ssp-operator.vVERSION.clusterserviceversion.yaml index 6d275c03..eff7354d 100644 --- a/manifests/generated/kubevirt-ssp-operator.vVERSION.clusterserviceversion.yaml +++ b/manifests/generated/kubevirt-ssp-operator.vVERSION.clusterserviceversion.yaml @@ -196,11 +196,7 @@ spec: - name: IMAGE_REFERENCE value: REPLACE_IMAGE - name: WATCH_NAMESPACE - - name: KVM_INFO_TAG - name: VALIDATOR_TAG - - name: VIRT_LAUNCHER_TAG - - name: NODE_LABELLER_TAG - - name: CPU_PLUGIN_TAG - name: IMAGE_NAME_PREFIX - name: OPERATOR_NAME value: kubevirt-ssp-operator diff --git a/manifests/kubevirt-ssp-operator/latest/kubevirt-ssp-operator.latest.clusterserviceversion.yaml b/manifests/kubevirt-ssp-operator/latest/kubevirt-ssp-operator.latest.clusterserviceversion.yaml index 908c4cba..29600b31 100644 --- a/manifests/kubevirt-ssp-operator/latest/kubevirt-ssp-operator.latest.clusterserviceversion.yaml +++ b/manifests/kubevirt-ssp-operator/latest/kubevirt-ssp-operator.latest.clusterserviceversion.yaml @@ -198,16 +198,8 @@ spec: value: REPLACE_IMAGE - name: WATCH_NAMESPACE value: "" - - name: KVM_INFO_TAG - value: "" - name: VALIDATOR_TAG value: "" - - name: VIRT_LAUNCHER_TAG - value: "" - - name: NODE_LABELLER_TAG - value: "" - - name: CPU_PLUGIN_TAG - value: "" - name: IMAGE_NAME_PREFIX value: "" - name: OPERATOR_NAME