Skip to content

ci-operator/step-registry/ipi/install: Remove ClusterVersion channel #8631

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

Merged
openshift-merge-robot merged 1 commit into from
May 1, 2020
Merged

ci-operator/step-registry/ipi/install: Remove ClusterVersion channel #8631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/
openshift-install --dir="${dir}" create manifests &
wait "$!"

sed -i '/^ channel:/d' "${dir}/manifests/cvo-overrides.yaml"

while IFS= read -r -d '' item
do
manifest="$( basename "${item}" )"
Expand Down
6 changes: 5 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,13 @@ objects:
EOF
fi

openshift-install --dir=/tmp/artifacts/installer/ create manifests &
wait "$!"

sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml

# TODO: Replace with a more concise manifest injection approach
if [[ -n "${CLUSTER_NETWORK_MANIFEST}" ]]; then
openshift-install --dir=/tmp/artifacts/installer/ create manifests
echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml
fi

Expand Down
7 changes: 5 additions & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,9 +770,13 @@ objects:
export OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP=true
fi

openshift-install --dir=/tmp/artifacts/installer/ create manifests &
wait "$!"

sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml

# TODO: Replace with a more concise manifest injection approach
if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]]; then
openshift-install --dir=/tmp/artifacts/installer/ create manifests
echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml
fi

Expand All @@ -781,7 +785,6 @@ objects:
echo 'error: CLUSTER_NETWORK_MANIFEST is incompatible with the "rt" variant'
exit 1
fi
openshift-install --dir=/tmp/artifacts/installer/ create manifests
cat > /tmp/artifacts/installer/manifests/realtime-worker-machine-config.yml << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
Expand Down
5 changes: 4 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,10 @@ objects:
EOF
fi

openshift-install --dir=/tmp/artifacts/installer/ create manifests
openshift-install --dir=/tmp/artifacts/installer/ create manifests &
wait "$!"

sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml

# TODO: Replace with a more concise manifest injection approach
if [[ -n "${CLUSTER_NETWORK_MANIFEST}" ]]; then
Expand Down
6 changes: 5 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,11 @@ objects:

# What we're doing here is we generate manifests first and force that OpenShift SDN is configured. Kuryr is only
# allowed when KURYR_ENABLED variable is set to "true".
TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug
TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug &
wait "$!"

sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml

if [[ "${KURYR_ENABLED:-false}" != "true" ]]; then
echo "Forcing OpenShiftSDN by modifying manifests"
sed -i -e 's/networkType: .*$/networkType: OpenShiftSDN/g' /tmp/artifacts/installer/manifests/cluster-network-02-config.yml
Expand Down
2 changes: 2 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-upi-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,8 @@ objects:
echo "Creating manifest files"
TF_LOG=debug openshift-install --dir=${ASSETS_DIR} create manifests --log-level=debug 2>&1 | grep --line-buffered -v password

sed -i '/^ channel:/d' "${ASSETS_DIR}/manifests/cvo-overrides.yaml"

#Remove Machines from manifests
rm -f ${ASSETS_DIR}/openshift/99_openshift-cluster-api_master-machines-*.yaml

Expand Down
6 changes: 5 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,11 @@ objects:
mv /tmp/artifacts/installer/master.ign.out /tmp/artifacts/installer/master.ign

# What we're doing here is we generate manifests first and force that OpenShift SDN is configured.
TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug
TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create manifests --log-level=debug &
wait "$!"

sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml

# This is for debugging purposes, allows us to map a job to a VM
cat /tmp/artifacts/installer/manifests/cluster-infrastructure-02-config.yml

Expand Down
1 change: 1 addition & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ objects:
# Bump the libvirt masters memory to 16GB
export TF_VAR_libvirt_master_memory=16384
mock-nss.sh openshift-install create manifests --dir=/tmp/artifacts/installer
sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
ls /tmp/artifacts/installer/openshift
for ((i=0; i<$MASTER_REPLICAS; i++))
do
Expand Down
6 changes: 4 additions & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,9 +628,12 @@ objects:
export OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP=true
fi

openshift-install --dir=/tmp/artifacts/installer/ create manifests &
wait "$!"

sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
# TODO: Replace with a more concise manifest injection approach
if [[ -n "${CLUSTER_NETWORK_MANIFEST:-}" ]]; then
openshift-install --dir=/tmp/artifacts/installer/ create manifests
echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml
fi

Expand All @@ -639,7 +642,6 @@ objects:
echo 'error: CLUSTER_NETWORK_MANIFEST is incompatible with the "rt" variant'
exit 1
fi
openshift-install --dir=/tmp/artifacts/installer/ create manifests
cat > /tmp/artifacts/installer/manifests/realtime-worker-machine-config.yml << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
Expand Down
4 changes: 4 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,7 @@ objects:
fi

openshift-install --dir=/tmp/artifacts/installer create manifests
sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
Expand Down Expand Up @@ -1161,6 +1162,7 @@ objects:
EOF

openshift-install --dir=/tmp/artifacts/installer create manifests
sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
Expand Down Expand Up @@ -1219,6 +1221,7 @@ objects:
fi

openshift-install --dir=/tmp/artifacts/installer create manifests
sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
Expand Down Expand Up @@ -1269,6 +1272,7 @@ objects:
pushd /tmp/artifacts/installer

echo "Editing manifests"
sed -i '/^ channel:/d' manifests/cvo-overrides.yaml
rm -f openshift/99_openshift-cluster-api_master-machines-*.yaml
rm -f openshift/99_openshift-cluster-api_worker-machineset-*.yaml
sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" manifests/cluster-scheduler-02-config.yml
Expand Down
3 changes: 3 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ objects:
EOF

openshift-install --dir=/tmp/artifacts/installer create manifests
sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machinesets-*.yaml
elif [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
base_domain="${BASE_DOMAIN:-origin-ci-int-gce.dev.openshift.com}"
Expand All @@ -440,6 +441,7 @@ objects:
EOF

openshift-install --dir=/tmp/artifacts/installer create manifests
sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
Expand Down Expand Up @@ -499,6 +501,7 @@ objects:
fi

openshift-install --dir=/tmp/artifacts/installer create manifests
sed -i '/^ channel:/d' /tmp/artifacts/installer/manifests/cvo-overrides.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_master-machines-*.yaml
rm -f /tmp/artifacts/installer/openshift/99_openshift-cluster-api_worker-machineset-*.yaml
sed -i "s;mastersSchedulable: true;mastersSchedulable: false;g" /tmp/artifacts/installer/manifests/cluster-scheduler-02-config.yml
Expand Down