Skip to content

ci-operator/templates/openshift: Drop clusterID #3320

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
Apr 2, 2019
Merged

ci-operator/templates/openshift: Drop clusterID #3320

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: 0 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 @@ -226,15 +226,13 @@ objects:
fi

export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
export CLUSTER_ID=$(uuidgen --random)
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")

if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
baseDomain: ${BASE_DOMAIN}
clusterID: ${CLUSTER_ID}
metadata:
name: ${CLUSTER_NAME}
controlPlane:
Expand Down
2 changes: 0 additions & 2 deletions 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 @@ -227,14 +227,12 @@ objects:
fi

export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
export CLUSTER_ID=$(uuidgen --random)
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")

cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
baseDomain: ${BASE_DOMAIN}
clusterID: ${CLUSTER_ID}
metadata:
name: ${CLUSTER_NAME}
networking:
Expand Down
3 changes: 0 additions & 3 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 @@ -220,15 +220,13 @@ objects:
mkdir /tmp/artifacts/installer

export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
export CLUSTER_ID=$(uuidgen --random)
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")

if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
baseDomain: ${BASE_DOMAIN}
clusterID: ${CLUSTER_ID}
metadata:
name: ${CLUSTER_NAME}
controlPlane:
Expand Down Expand Up @@ -271,7 +269,6 @@ objects:
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
baseDomain: ${BASE_DOMAIN}
clusterID: ${CLUSTER_ID}
metadata:
name: ${CLUSTER_NAME}
networking:
Expand Down
3 changes: 0 additions & 3 deletions ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,13 @@ objects:

mkdir /tmp/artifacts/installer

export CLUSTER_ID=$(uuidgen --random)
export SSH_PUB_KEY=$(cat "${OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${OPENSHIFT_INSTALL_PULL_SECRET_PATH}")

if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
baseDomain: origin-ci-int-gce.dev.rhcloud.com
clusterID: ${CLUSTER_ID}
compute:
- name: worker
replicas: ${WORKERS}
Expand Down Expand Up @@ -256,7 +254,6 @@ objects:
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
baseDomain: test.ose
clusterID: ${CLUSTER_ID}
controlPlane:
name: master
replicas: ${MASTERS}
Expand Down
3 changes: 0 additions & 3 deletions ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,13 @@ objects:
mkdir /tmp/artifacts/installer

export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
export CLUSTER_ID=$(uuidgen --random)
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")

if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
baseDomain: ${BASE_DOMAIN}
clusterID: ${CLUSTER_ID}
metadata:
name: ${CLUSTER_NAME}
controlPlane:
Expand Down Expand Up @@ -362,7 +360,6 @@ objects:
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
baseDomain: ${BASE_DOMAIN}
clusterID: ${CLUSTER_ID}
metadata:
name: ${CLUSTER_NAME}
networking:
Expand Down