Skip to content

Commit a4948da

Browse files
wkingwking
committed
ci-operator/templates/openshift: Drop KUBE_SSH_*
These are from b7cc916 (Set KUBE_SSH_USER for new installer for AWS tests, openshift#2274) and 43dde9e (Set KUBE_SSH_BASTION and KUBE_SSH_KEY_PATH in installer tests, 2018-12-23, openshift#2469). But moving forward, reliable SSH access direct to nodes will be hard, with things like openshift/installer@6add0ab447 (Remove public IPs from masters, 2019-01-10, openshift/installer#1045) making a SSH bastion a requirement for that sort of thing (at least on AWS). Going forward, ideally e2e tests can be ported to use privileged pods within the cluster to check what they need to check. But however that works out, stop carrying local dead code that is not affecting test results. We can always drag it back out of version control later if it turns out we actually want to go down the KUBE_SSH_* route.
1 parent b4fe336 commit a4948da

13 files changed

+0
-35
lines changed

‎ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,8 @@ objects:
145145
done
146146
147147
# set up cloud-provider-specific env vars
148-
export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
149-
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
150148
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
151149
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
152-
export KUBE_SSH_USER=cloud-user
153150
mkdir -p ~/.ssh
154151
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
155152
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'
@@ -160,7 +157,6 @@ objects:
160157
export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
161158
# TODO: make openshift-tests auto-discover this from cluster config
162159
export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
163-
export KUBE_SSH_USER=core
164160
elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
165161
mkdir -p ~/.ssh
166162
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true

‎ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,8 @@ objects:
138138
done
139139
140140
# set up cloud-provider-specific env vars
141-
export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
142-
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
143141
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
144142
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
145-
export KUBE_SSH_USER=cloud-user
146143
mkdir -p ~/.ssh
147144
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
148145
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'
@@ -153,7 +150,6 @@ objects:
153150
export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
154151
# TODO: make openshift-tests auto-discover this from cluster config
155152
export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
156-
export KUBE_SSH_USER=core
157153
fi
158154
159155
mkdir -p /tmp/output

‎ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ objects:
145145
done
146146
147147
# set up cloud-provider-specific env vars
148-
export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
149-
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
150148
mkdir -p ~/.ssh
151149
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_metal_rsa || true
152150

‎ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ objects:
142142
sleep 10 & wait
143143
done
144144
145-
# set up env vars
146-
export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
147-
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
148145
mkdir -p ~/.ssh
149146
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true
150147

‎ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,8 @@ objects:
141141
done
142142
143143
# set up cloud-provider-specific env vars
144-
export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
145-
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
146144
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
147145
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
148-
export KUBE_SSH_USER=cloud-user
149146
mkdir -p ~/.ssh
150147
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
151148
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'
@@ -156,7 +153,6 @@ objects:
156153
export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
157154
# TODO: make openshift-tests auto-discover this from cluster config
158155
export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
159-
export KUBE_SSH_USER=core
160156
elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
161157
mkdir -p ~/.ssh
162158
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true

‎ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,8 @@ objects:
210210
done
211211
212212
# set up cloud-provider-specific env vars
213-
export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
214-
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
215213
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
216214
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
217-
export KUBE_SSH_USER=cloud-user
218215
mkdir -p ~/.ssh
219216
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
220217
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'
@@ -225,7 +222,6 @@ objects:
225222
export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
226223
# TODO: make openshift-tests auto-discover this from cluster config
227224
export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
228-
export KUBE_SSH_USER=core
229225
fi
230226
231227
mkdir -p /tmp/output

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,8 @@ objects:
126126
done
127127
128128
# set up cloud-provider-specific env vars
129-
export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
130-
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
131129
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
132130
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
133-
export KUBE_SSH_USER=cloud-user
134131
mkdir -p ~/.ssh
135132
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
136133
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-openshift-ansible.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ objects:
118118
# set up cloud-provider-specific env vars
119119
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
120120
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
121-
export KUBE_SSH_USER=cloud-user
122121
mkdir -p ~/.ssh
123122
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
124123
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-openshift-jenkins.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ objects:
122122
# set up cloud provider specific env vars
123123
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
124124
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
125-
export KUBE_SSH_USER=cloud-user
126125
mkdir -p ~/.ssh
127126
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
128127
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'
@@ -210,7 +209,6 @@ objects:
210209
# set up cloud-provider-specific env vars
211210
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
212211
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
213-
export KUBE_SSH_USER=cloud-user
214212
mkdir -p ~/.ssh
215213
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
216214
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-upgrade.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ objects:
122122
# set up cloud-provider-specific env vars
123123
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
124124
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
125-
export KUBE_SSH_USER=cloud-user
126125
mkdir -p ~/.ssh
127126
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
128127
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ objects:
120120
# set up cloud-provider-specific env vars
121121
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
122122
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
123-
export KUBE_SSH_USER=cloud-user
124123
mkdir -p ~/.ssh
125124
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
126125
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-src.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ objects:
132132
# set up cloud-provider-specific env vars
133133
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
134134
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
135-
export KUBE_SSH_USER=cloud-user
136135
mkdir -p ~/.ssh
137136
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
138137
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'

‎ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,9 @@ objects:
202202
# oh god the blood
203203
sleep 180
204204
205-
export KUBE_SSH_BASTION="$( oc get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
206-
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
207-
208205
# set up cloud-provider-specific env vars
209206
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
210207
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
211-
export KUBE_SSH_USER=cloud-user
212208
mkdir -p ~/.ssh
213209
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
214210
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'
@@ -219,7 +215,6 @@ objects:
219215
export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
220216
# TODO: make openshift-tests auto-discover this from cluster config
221217
export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
222-
export KUBE_SSH_USER=core
223218
elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
224219
mkdir -p ~/.ssh
225220
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true

0 commit comments

Comments
 (0)