Skip to content

Commit 9b5b48b

Browse files
committed
Enable all the e2e in Windows, retry for SSH
1 parent 1dd02ed commit 9b5b48b

File tree

12 files changed

+111
-406
lines changed

12 files changed

+111
-406
lines changed

hack/e2e.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ if [ "$PROVIDER" == "gce" -o "$PROVIDER" == "gke" ]; then
209209
kubetest_args+=(
210210
--gcp-zone "$GCP_ZONE"
211211
)
212+
# also set the default zone for the gcloud sdk
213+
export CLOUDSDK_COMPUTE_ZONE="$GCP_ZONE"
212214
fi
213215

214216
if [ -n "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
@@ -322,10 +324,18 @@ if [ "$PROVIDER" == "gke" ]; then
322324
exit
323325
fi
324326

327+
# TODO(mauriciopoppe): debugging the ssh error
328+
# Warning: Permanently added 'compute.739508614693748120' (ECDSA) to the list of known hosts.\r\[email protected]: Permission denied (publickey,keyboard-interactive).\r\nERROR: (gcloud.compute.ssh) [/usr/bin/ssh] exited with return code [255].\n
329+
cat $GOOGLE_APPLICATION_CREDENTIALS
330+
cat ~/.ssh/google_compute_engine
331+
cat ~/.ssh/google_compute_engine.pub
332+
gcloud compute project-info describe --flatten commonInstanceMetadata.items.ssh-keys
333+
exit 1
334+
325335
# legacy path
326-
# --up
327-
# --down
328336
go run $ROOT/hack/e2e.go -- "${kubetest_args[@]}" \
329337
--deployment="$DEPLOYMENT" \
338+
--up \
339+
--down \
330340
--test-cmd="$ROOT/hack/run-e2e.sh" \
331341
"${@:-}"

hack/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ ALLOW_OVERRIDE=${ALLOW_OVERRIDE:-}
9191
SKIP_BUILD=${SKIP_BUILD:-}
9292
SKIP_PUSH_LATEST=${SKIP_PUSH_LATEST:-}
9393
LINUX_ARCH=${LINUX_ARCH:-amd64 arm arm64 ppc64le s390x}
94-
WINDOWS_DISTROS=${WINDOWS_DISTROS:-ltsc2019 1909 2004 20H2}
94+
WINDOWS_DISTROS=${WINDOWS_DISTROS:-ltsc2019 1909 2004 20H2 ltsc2022}
9595

9696
echo "REGISTRY: $REGISTRY"
9797
echo "VERSION: $VERSION"

hack/run-e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fi
8484
if [ -z "$PROVISIONER_E2E_IMAGE" ]; then
8585
# build and push ${version}_linux_amd64 and ${version}_windows_ltsc2019
8686
VERSION=${VERSION:-$(git describe --tags --abbrev=8 --always)}
87-
REGISTRY=${REGISTRY:-k8s.gcr.io/sig-storage}
87+
REGISTRY=${REGISTRY:-gcr.io/${PROJECT}}
8888
IMAGE=local-volume-provisioner
8989

9090
REGISTRY=${REGISTRY} \

helm/generated_examples/development-gce.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,6 @@ spec:
197197
containers:
198198
- name: provisioner
199199
image: gcr.io/mauriciopoppe-gke-dev/local-volume-provisioner:canary
200-
# TODO(mauriciopoppe): remove this log level
201-
args:
202-
- --v=8
203200
imagePullPolicy: Always
204201
env:
205202
- name: MY_NODE_NAME
@@ -226,45 +223,21 @@ spec:
226223
mountPropagation: HostToContainer
227224
- name: csi-proxy-volume-v1
228225
mountPath: \\.\pipe\csi-proxy-volume-v1
229-
- name: csi-proxy-filesystem-v1
230-
mountPath: \\.\pipe\csi-proxy-filesystem-v1
231-
- name: csi-proxy-disk-v1
232-
mountPath: \\.\pipe\csi-proxy-disk-v1
233226
# these paths are still included for compatibility, they're used
234227
# only if the node has still the beta version of the CSI proxy
235228
- name: csi-proxy-volume-v1beta2
236229
mountPath: \\.\pipe\csi-proxy-volume-v1beta2
237-
- name: csi-proxy-filesystem-v1beta1
238-
mountPath: \\.\pipe\csi-proxy-filesystem-v1beta1
239-
- name: csi-proxy-disk-v1beta2
240-
mountPath: \\.\pipe\csi-proxy-disk-v1beta2
241230
volumes:
242-
- name: csi-proxy-disk-v1
243-
hostPath:
244-
path: \\.\pipe\csi-proxy-disk-v1
245-
type: ""
246231
- name: csi-proxy-volume-v1
247232
hostPath:
248233
path: \\.\pipe\csi-proxy-volume-v1
249234
type: ""
250-
- name: csi-proxy-filesystem-v1
251-
hostPath:
252-
path: \\.\pipe\csi-proxy-filesystem-v1
253-
type: ""
254235
# these paths are still included for compatibility, they're used
255236
# only if the node has still the beta version of the CSI proxy
256-
- name: csi-proxy-disk-v1beta2
257-
hostPath:
258-
path: \\.\pipe\csi-proxy-disk-v1beta2
259-
type: ""
260237
- name: csi-proxy-volume-v1beta2
261238
hostPath:
262239
path: \\.\pipe\csi-proxy-volume-v1beta2
263240
type: ""
264-
- name: csi-proxy-filesystem-v1beta1
265-
hostPath:
266-
path: \\.\pipe\csi-proxy-filesystem-v1beta1
267-
type: ""
268241
- name: provisioner-config
269242
configMap:
270243
name: local-static-provisioner-config

helm/generated_examples/helm2/development-gce.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,6 @@ spec:
206206
containers:
207207
- name: provisioner
208208
image: gcr.io/mauriciopoppe-gke-dev/local-volume-provisioner:canary
209-
# TODO(mauriciopoppe): remove this log level
210-
args:
211-
- --v=8
212209
imagePullPolicy: Always
213210
env:
214211
- name: MY_NODE_NAME
@@ -235,45 +232,21 @@ spec:
235232
mountPropagation: HostToContainer
236233
- name: csi-proxy-volume-v1
237234
mountPath: \\.\pipe\csi-proxy-volume-v1
238-
- name: csi-proxy-filesystem-v1
239-
mountPath: \\.\pipe\csi-proxy-filesystem-v1
240-
- name: csi-proxy-disk-v1
241-
mountPath: \\.\pipe\csi-proxy-disk-v1
242235
# these paths are still included for compatibility, they're used
243236
# only if the node has still the beta version of the CSI proxy
244237
- name: csi-proxy-volume-v1beta2
245238
mountPath: \\.\pipe\csi-proxy-volume-v1beta2
246-
- name: csi-proxy-filesystem-v1beta1
247-
mountPath: \\.\pipe\csi-proxy-filesystem-v1beta1
248-
- name: csi-proxy-disk-v1beta2
249-
mountPath: \\.\pipe\csi-proxy-disk-v1beta2
250239
volumes:
251-
- name: csi-proxy-disk-v1
252-
hostPath:
253-
path: \\.\pipe\csi-proxy-disk-v1
254-
type: ""
255240
- name: csi-proxy-volume-v1
256241
hostPath:
257242
path: \\.\pipe\csi-proxy-volume-v1
258243
type: ""
259-
- name: csi-proxy-filesystem-v1
260-
hostPath:
261-
path: \\.\pipe\csi-proxy-filesystem-v1
262-
type: ""
263244
# these paths are still included for compatibility, they're used
264245
# only if the node has still the beta version of the CSI proxy
265-
- name: csi-proxy-disk-v1beta2
266-
hostPath:
267-
path: \\.\pipe\csi-proxy-disk-v1beta2
268-
type: ""
269246
- name: csi-proxy-volume-v1beta2
270247
hostPath:
271248
path: \\.\pipe\csi-proxy-volume-v1beta2
272249
type: ""
273-
- name: csi-proxy-filesystem-v1beta1
274-
hostPath:
275-
path: \\.\pipe\csi-proxy-filesystem-v1beta1
276-
type: ""
277250
- name: provisioner-config
278251
configMap:
279252
name: local-static-provisioner-config

0 commit comments

Comments
 (0)