Skip to content

Commit a829fe3

Browse files
authored
Update deps and restore k3d tests (GoogleContainerTools#6280)
1 parent cecf09d commit a829fe3

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

.travis.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -114,30 +114,30 @@ jobs:
114114
<<: *registry_mirror
115115
script:
116116
- env IT_PARTITION=3 make integration-in-kind
117-
# - name: "k3d integration partition 0"
118-
# <<: *integration_test
119-
# <<: *upgrade_docker
120-
# <<: *registry_mirror
121-
# script:
122-
# - env IT_PARTITION=0 make integration-in-k3d
123-
# - name: "k3d integration partition 1"
124-
# <<: *integration_test
125-
# <<: *upgrade_docker
126-
# <<: *registry_mirror
127-
# script:
128-
# - env IT_PARTITION=1 make integration-in-k3d
129-
# - name: "k3d integration partition 2"
130-
# <<: *integration_test
131-
# <<: *upgrade_docker
132-
# <<: *registry_mirror
133-
# script:
134-
# - env IT_PARTITION=2 make integration-in-k3d
135-
# - name: "k3d integration partition 3"
136-
# <<: *integration_test
137-
# <<: *upgrade_docker
138-
# <<: *registry_mirror
139-
# script:
140-
# - env IT_PARTITION=3 make integration-in-k3d
117+
- name: "k3d integration partition 0"
118+
<<: *integration_test
119+
<<: *upgrade_docker
120+
<<: *registry_mirror
121+
script:
122+
- env IT_PARTITION=0 make integration-in-k3d
123+
- name: "k3d integration partition 1"
124+
<<: *integration_test
125+
<<: *upgrade_docker
126+
<<: *registry_mirror
127+
script:
128+
- env IT_PARTITION=1 make integration-in-k3d
129+
- name: "k3d integration partition 2"
130+
<<: *integration_test
131+
<<: *upgrade_docker
132+
<<: *registry_mirror
133+
script:
134+
- env IT_PARTITION=2 make integration-in-k3d
135+
- name: "k3d integration partition 3"
136+
<<: *integration_test
137+
<<: *upgrade_docker
138+
<<: *registry_mirror
139+
script:
140+
- env IT_PARTITION=3 make integration-in-k3d
141141
- os: linux
142142
name: "diag/Linux unit"
143143
<<: *registry_mirror

deploy/skaffold/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# This base image has to be updated manually after running `make build_deps`
16-
FROM gcr.io/k8s-skaffold/build_deps:6477c2b624b633dee1d4c66bdd02821d25ce3f86 as build
16+
FROM gcr.io/k8s-skaffold/build_deps:e34c0c143e9fe6c39a4f119547289d7142afcb0d as build
1717
WORKDIR /skaffold
1818

1919
FROM build as builder

deploy/skaffold/Dockerfile.deps

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN chmod +x kubectl
2323

2424
# Download helm (see https://github.com/helm/helm/releases/latest)
2525
FROM alpine:3.10 as download-helm
26-
ENV HELM_VERSION v3.6.2
26+
ENV HELM_VERSION v3.6.3
2727
ENV HELM_URL https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz
2828
RUN wget -O helm.tar.gz "${HELM_URL}"
2929
RUN tar -xvf helm.tar.gz --strip-components 1
@@ -37,14 +37,14 @@ RUN tar -xvf kustomize.tar.gz
3737

3838
# Download kpt
3939
FROM alpine:3.10 as download-kpt
40-
ENV KPT_VERSION 1.0.0-beta.1
40+
ENV KPT_VERSION 1.0.0-beta.2
4141
ENV KPT_URL https://github.com/GoogleContainerTools/kpt/releases/download/v${KPT_VERSION}/kpt_linux_amd64
4242
RUN wget -O kpt "${KPT_URL}"
4343
RUN chmod +x kpt
4444

4545
# Download kompose
4646
FROM alpine:3.10 as download-kompose
47-
ENV KOMPOSE_VERSION v1.22.0
47+
ENV KOMPOSE_VERSION v1.23.0
4848
ENV KOMPOSE_URL https://github.com/kubernetes/kompose/releases/download/${KOMPOSE_VERSION}/kompose-linux-amd64
4949
RUN wget -O kompose "${KOMPOSE_URL}"
5050
RUN chmod +x kompose
@@ -65,14 +65,14 @@ RUN chmod +x kind
6565

6666
# Download k3d
6767
FROM alpine:3.10 as download-k3d
68-
ENV K3D_VERSION v4.4.6
68+
ENV K3D_VERSION v4.4.7
6969
ENV K3D_URL https://github.com/rancher/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64
7070
RUN wget -O k3d "${K3D_URL}"
7171
RUN chmod +x k3d
7272

7373
# Download gcloud
7474
FROM alpine:3.10 as download-gcloud
75-
ENV GCLOUD_VERSION 347.0.0
75+
ENV GCLOUD_VERSION 349.0.0
7676
ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-x86_64.tar.gz
7777
RUN wget -O gcloud.tar.gz "${GCLOUD_URL}"
7878
RUN tar -zxf gcloud.tar.gz

0 commit comments

Comments
 (0)