Skip to content
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

Jump to bottom

test images: Fixes echoserver image for Windows #98189

Merged
merged 1 commit into from Jan 21, 2021
Merged

test images: Fixes echoserver image for Windows #98189

merged 1 commit into from Jan 21, 2021

Conversation

claudiubelu
Copy link
Contributor

What type of PR is this?

/kind bug

/sig windows
/sig testing
/priority important-soon

What this PR does / why we need it:

The Windows echoserver image no longer relies on a helper image.

This addresses the current echoserver image builder postsubmit job which is currently failing [1].

[1] https://testgrid.k8s.io/sig-testing-images#post-kubernetes-push-e2e-echoserver-test-images

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. sig/windows Categorizes an issue or PR as relevant to SIG Windows. sig/testing Categorizes an issue or PR as relevant to SIG Testing. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 19, 2021
@claudiubelu
Copy link
Contributor Author

/assign @dims

dims
dims reviewed Jan 19, 2021
View reviewed changes
test/images/echoserver/Dockerfile_windows
@@ -19,21 +19,24 @@ ARG REGISTRY
FROM --platform=linux/amd64 alpine:3.6 as prep

ADD https://openresty.org/download/openresty-1.13.6.2-win64.zip /openresty-win64.zip
ADD http://wiki.overbyte.eu/arch/openssl-1.1.1i-win64.zip /openssl.zip
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks looks soooo shady!! :(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got this URL from here: https://wiki.openssl.org/index.php/Binaries

So, it should be fine, IMO.

dims
dims reviewed Jan 19, 2021
View reviewed changes
test/images/echoserver/Dockerfile_windows Outdated

ENV PATH="C:\openresty\;C:\bin\;C:\curl\;C:\Windows\system32;C:\Windows;C:\Program Files\PowerShell;"
ADD ["https://raw.githubusercontent.com/openssl/openssl/OpenSSL_1_1_1-stable/apps/openssl.cnf", "/Program Files/Common Files/SSL/openssl.cnf"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this available off of a tag? (is this likely to change in master?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's taken from the https://github.com/openssl/openssl/tree/OpenSSL_1_1_1-stable branch, but we can probably use the https://github.com/openssl/openssl/tree/OpenSSL_1_1_1i tag instead.

@claudiubelu
test images: Fixes echoserver image for Windows
483ed6a 
The Windows echoserver image no longer relies on a helper image.
@claudiubelu
Copy link
Contributor Author

/retest

@dims
Copy link
Member

dims commented Jan 21, 2021

/triage accepted
/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 21, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: claudiubelu, dims

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2021
@k8s-ci-robot k8s-ci-robot merged commit 6a161bf into kubernetes:master Jan 21, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jan 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dims dims dims left review comments

@justaugustus justaugustus Awaiting requested review from justaugustus

@mkumatag mkumatag Awaiting requested review from mkumatag

Assignees

@dims dims

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/testing Categorizes an issue or PR as relevant to SIG Testing. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@claudiubelu @dims @k8s-ci-robot