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

fix: Add certs to argocli image. Fixes #2129 #2143

Merged
merged 1 commit into from
Feb 3, 2020
Merged

fix: Add certs to argocli image. Fixes #2129 #2143

merged 1 commit into from
Feb 3, 2020

Conversation

alexec
Copy link
Contributor

@alexec alexec commented Feb 3, 2020 •
edited
Loading

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
  • The title of the PR is (a) conventional, (b) states what changed, and (c) suffixes the related issues number. E.g. "fix(controller): Updates such and such. Fixes #1234".
  • I have written unit and/or e2e tests for my change. PRs without these are unlike to be merged.
  • Optional. I've added My organization is added to the README.
  • I've signed the CLA and required builds are green.

Fixes #2129

@alexec alexec added this to the v2.5 milestone Feb 3, 2020
alexec
alexec commented Feb 3, 2020
View reviewed changes
Dockerfile.dev
@@ -35,11 +35,14 @@ RUN wget https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-lin
FROM debian:9.6-slim as argoexec-base
# NOTE: keep the version synced with https://storage.googleapis.com/kubernetes-release/release/stable.txt
ENV KUBECTL_VERSION=1.15.1
ENV JQ_VERSION=1.6
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this was copied from ./Dockerfile - was missing

@codecov
Copy link

codecov bot commented Feb 3, 2020 •
edited
Loading

Codecov Report

Merging #2143 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2143   +/-   ##
=======================================
  Coverage   11.69%   11.69%           
=======================================
  Files          52       52           
  Lines       26353    26353           
=======================================
  Hits         3081     3081           
  Misses      22877    22877           
  Partials      395      395

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4cda9a0...b0f0f73. Read the comment docs.

@alexec alexec requested a review from jessesuen February 3, 2020 19:39
@alexec alexec marked this pull request as ready for review February 3, 2020 19:41
@alexec
Copy link
Contributor Author

alexec commented Feb 3, 2020

@sarabala1979 could you review for me please? Can be merged if you are happy with it.

jessesuen
jessesuen reviewed Feb 3, 2020
View reviewed changes
Copy link
Member

@jessesuen jessesuen left a comment

Choose a reason for hiding this comment

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

Have we confirmed that this fixes the actual underlying issue?

@alexec
Copy link
Contributor Author

alexec commented Feb 3, 2020 •
edited
Loading

Have we confirmed that this fixes the actual underlying issue?

It's been tested and confirm. See #2129 (comment) (note it reveals another issue).

@haghabozorgi haghabozorgi mentioned this pull request Feb 3, 2020
Closed
2 tasks
sarabala1979
sarabala1979 approved these changes Feb 3, 2020
View reviewed changes
Dockerfile
@@ -94,6 +94,7 @@ ENTRYPOINT [ "workflow-controller" ]
# argocli
####################################################################################################
FROM scratch as argocli
COPY --from=argoexec-base /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts
Copy link
Member

Choose a reason for hiding this comment

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

In v2.4, ssh file copied from the hack folder.
COPY hack/ssh_known_hosts /etc/ssh/ssh_known_hosts
can we use the same?

@sarabala1979 sarabala1979 merged commit 409a515 into argoproj:master Feb 3, 2020
@alexec alexec deleted the certs branch February 3, 2020 23:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jessesuen jessesuen jessesuen left review comments

@sarabala1979 sarabala1979 sarabala1979 approved these changes

Assignees

@sarabala1979 sarabala1979

Labels
None yet
Projects
None yet
Milestone
v2.5
Development

Successfully merging this pull request may close these issues.

downloading artifact from s3 in ui, timed out waiting for condition
3 participants
@alexec @jessesuen @sarabala1979