Skip to content

Cherry-pick commits needed from che-machine-exec #26

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
Closed
wants to merge 37 commits into from
Closed

Cherry-pick commits needed from che-machine-exec #26

wants to merge 37 commits into from

Conversation

JPinkney
Copy link
Contributor

@JPinkney JPinkney commented Jul 22, 2021 •
edited
Loading

What does this PR do?

This PR cherry-picks all the relevant commits I could find from upstream che-machine-exec into main.

  1. Adapt Che Machine Exec to devworkspace workspace engine eclipse-che/che-machine-exec#130
  2. removing env.Name check to adapt to che sidecar env var removal eclipse-che/che-machine-exec#142
  3. Adapt to DWO change where new label is devworkspace_id eclipse-che/che-machine-exec#138
  4. Fix issue where /exec/init calls put kubeconfig in first container eclipse-che/che-machine-exec#129

Currently trying Web Terminal 1.3 leads to a crash loop backoff with unable to get current workspace id. Configure custom pod selector or che workspace id without these changes

What issues does this PR fix or reference?

Is it tested? How?

Release Configuration Management and others added 30 commits June 11, 2020 00:18
New branch setup
33bbe8d
@sleshchenko
Initial commit
fe1651f
@sleshchenko
Use Eclipse Public License - v 2.0
899800a
@sleshchenko
Sync with upstream https://github.com/eclipse/che-machine-exec @ f95b…
8aafd38 
…892 (7.15.0)

Ignore:
- .github
- README.md
@sleshchenko
Add Dockerfile for brew build
f372574
@sleshchenko
Add containers.yaml to set x86_64 platform and enable multistage builds
f91117d
@sleshchenko
Fix component name in Dockerfile
6fb3c5e
@sleshchenko
Sync with upstream https://github.com/eclipse/che-machine-exec @ 2264256
1130cad 
 (7.17.0)

Ignore:
- .github
- README.md
@sleshchenko
Update Dockerfile after syncing with upstream
7fccc08
@JPinkney
Sync downstream with upstream branch (#3)
c5ce8c0 
* Fix devworkspace api group to fix idling

Signed-off-by: Josh Pinkney <[email protected]>

* Move from 1.0 version format to 1.0.0

Signed-off-by: Josh Pinkney <[email protected]>

* Add in go modules for automatic security validation

Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Add initial version of Jenkinsfile source sync (#4)
7b8e7b1 
* Add initial version of Jenkinsfile source sync

Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Reference v1.0.x for downloading bootstrap-sync script (#6)
d13d940 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Update Dockerfile to 1.1.0 (#8)
82c4e0a 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Parameterize downstream and upstream branches (#7)
48f9d41 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Change the version to use X.Y format (#12)
62a0718 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Fix audits in web-terminal-exec (#13)
0ccaaaf 
Signed-off-by: Josh Pinkney <[email protected]>
(cherry picked from commit 66b64be296efbec51558aa07d5b11c023af8c0a3)
@JPinkney
Update versions to 1.2 (#14)
1fc30bb 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Add stopped-by annotation (#117)
06ffaca 
Signed-off-by: Josh Pinkney <[email protected]>
(cherry picked from commit ccc183e)
@JPinkney
Fix all vulnerabilities
5864016 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Merge pull request #16 from redhat-developer/web-terminal-exec-update
097cd5b 
Add stopped-by annotation and fix vulnerabilities
@JPinkney
Remove dockerfile from root so that we can use CPaaS templating
c9c836e 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Only use RHEL dockerfile
1c46253 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Merge pull request #18 from redhat-developer/dockerfile-templating
24e02f1 
Remove dockerfile from root so that we can use CPaaS templating
@JPinkney
Update web-terminal-exec version to 1.3
6121c6e 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Merge pull request #19 from redhat-developer/web-terminal-1.3
64c4fe6 
Update web-terminal-exec version to 1.3
@JPinkney
Add github action for creating next dockerimage
495f502 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Merge pull request #21 from redhat-developer/next-dockerimage
5372e0a 
Add github action for creating next dockerimage
@JPinkney
Change the base image so that you aren't required to login to registr…
970abb0 
…y.redhat.io

Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Tweak the next release github action to login securely
457d32a 
Signed-off-by: Josh Pinkney <[email protected]>
@JPinkney
Merge pull request #22 from redhat-developer/release-fix
0e976d9 
Change dockerfile base image and login to quay securely
amisevsk added 3 commits July 22, 2021 10:49
@amisevsk @JPinkney
Fix issue where /exec/init calls put kubeconfig in first container
e5430a4 
When /exec/init is called (e.g. in the web terminal operator), it
resolves the first container that supports a shell, but does not use
this container for injecting kubeconfig. When no container name is
provided, the kubeconfig is injected into the first container, which
causes kubeconfig injection to fail when the first container in the pod
does not support a shell.

Signed-off-by: Angel Misevski <[email protected]>
@amisevsk @JPinkney
Rework CreateKubeConfig to avoid filtering containers twice
758663e 
Signed-off-by: Angel Misevski <[email protected]>
@amisevsk @JPinkney
Make ResolvedExec inline ContainerInfo to avoid duplicating information
ab7e8ec 
Signed-off-by: Angel Misevski <[email protected]>
@JPinkney JPinkney closed this Jul 22, 2021
@JPinkney JPinkney requested a review from l0rd as a code owner July 22, 2021 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amisevsk amisevsk Awaiting requested review from amisevsk

@sleshchenko sleshchenko Awaiting requested review from sleshchenko

@l0rd l0rd Awaiting requested review from l0rd

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JPinkney @sleshchenko @tinakurian @amisevsk