Deploy Command for OCP #3478

EnriqueL8 · 2020-07-02T16:24:50Z

What type of PR is this?
/kind feature

Documentation changes: Please include [skip ci] in your commit message as well
/kind documentation
[skip ci]

What does does this PR do / why we need it:
This PR implements odo deploy and odo deploy delete see proposal #3368.

Which issue(s) this PR fixes:
Implements #3300

How to test changes / Special notes to the reviewer:

Login to an OCP cluster
odo create - I would recommend choosing a stack that exposes a server associated with it or create a sample nodejs express server in your project. So that you container doesn't crash with CrashLoopBackOff and you can access a running app with the url.
add to the devfile 2.0.0 two fields in the metadata: alpha.build-dockerfile and alpha.deployment-manifest (See proposal). Use this as manifest.
odo url create
run odo deploy --tag image-registry.openshift-image-registry.svc:5000/<namespace>/<image-name>:<tag>
access URL

…o parse_dockerfile

…he projects source

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

- Downloads Dockerfile into memory rather than onto the hosts machine - Validates if a Dockerfile is present in the project source, if one isn't specified by the devfile - Validates the contents of the Dockerfile (that there is a FROM on the first non-comment/non-whitespace line) - Validates the tag passed as an arg conforms to the correct character-set - Copies all project source files into the container rather than new/updated - Additional Testing - More appropriate error/warning messages

Co-authored-by: Cameron McWilliam <cam.mcwilliam@me.com>

* Add test List URL function Signed-off-by: Steven Groeger <groeges@uk.ibm.com> * Update logging within maifest deploy Signed-off-by: Steven Groeger <groeges@uk.ibm.com> * Add preliminary support for multiple manifest in single yaml Signed-off-by: Steven Groeger <groeges@uk.ibm.com> * Update service manifest with ClusterIP value before update. Signed-off-by: Steven Groeger <groeges@uk.ibm.com> * Merge deployDelete code and update to support multiple doc in yaml Signed-off-by: Steven Groeger <groeges@uk.ibm.com> * Fix source formatting Signed-off-by: Steven Groeger <groeges@uk.ibm.com> * Add some extra checks on waitManifestDeployComplete function Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

alpha.deployment-manifest Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

* Remove CommonPushOptions and do some clean up * Move validation, add better user experience, remove devfile.yaml flag

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

girishramnani · 2020-08-20T06:50:51Z

quick question how is this PR different from #3751?

jaideepr97 · 2020-08-20T09:04:14Z

quick question how is this PR different from #3751?

@girishramnani this PR came first and it introduces all the code for the odo deploy command from scratch, and performs an openshift specific build as the default strategy (using buildconfig)

#3751 is built on top of this PR and just extends the odo deploy function to also perform unprivileged builds on kubernetes clusters (using kaniko)

EnriqueL8 · 2020-08-24T10:16:38Z

@EnriqueL8
There is some dns resolution issue. Can we try image-registry.openshift-image-registry.svc.cluster.local?

Will try, thanks!

EnriqueL8 · 2020-08-25T10:12:06Z

/retest

EnriqueL8 · 2020-08-27T10:44:40Z

/retest

pkg/devfile/adapters/common/types.go

pkg/occlient/occlient.go

openshift-ci-robot · 2020-09-11T13:15:51Z

@EnriqueL8: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/v4.3-integration-e2e	`9d9cb93`	link	`/test v4.3-integration-e2e`
ci/prow/v4.4-integration-e2e	`9d9cb93`	link	`/test v4.4-integration-e2e`
ci/prow/v4.2-integration-e2e	`9d9cb93`	link	`/test v4.2-integration-e2e`
ci/prow/unit	`51a5d36`	link	`/test unit`
ci/prow/v4.5-integration-e2e	`51a5d36`	link	`/test v4.5-integration-e2e`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

scottkurz · 2020-09-14T01:06:19Z

@EnriqueL8, I built your branch from 51a5d36 on Win10.

One thing that surprised me is that the keys change after doing the odo url create --port 9080 I needed in order to run deploy.

Odo changed my devfile keys from:

 alpha.build-dockerfile:  https://raw.githubusercontent.com/... =>  dockerfile: https://.....
 alpha.deployment-manifest =>  manifest

Is this expected?

I noticed too that when I did odo url create with the same the 2.0.0-beta-1 these two lines were completely deleted during odo url create.

EnriqueL8 · 2020-09-14T16:44:52Z

@EnriqueL8, I built your branch from 51a5d36 on Win10.

One thing that surprised me is that the keys change after doing the odo url create --port 9080 I needed in order to run deploy.

Odo changed my devfile keys from:
 alpha.build-dockerfile:  https://raw.githubusercontent.com/... =>  dockerfile: https://.....
 alpha.deployment-manifest =>  manifest
Is this expected?

I noticed too that when I did odo url create with the same the 2.0.0-beta-1 these two lines were completely deleted during odo url create.

This shouldn't be the case - will investigate further

scottkurz · 2020-09-16T13:51:40Z

Opened #3968 to address the loss of the unrecognized properties on rewrite.. and maybe this PR was planning on dealing with this sepearately, and making them "recognized" within the parser's odo-internal representation of the schema.

scottkurz · 2020-09-16T13:55:10Z

Just to clarify, this doesn't attempt to implement the build args described here: devfile/api#51 (comment) correct?

components:
  - id: build-node-app      
    dockerfile:
        id: mycompany/my-node-stack-dockerfile/v2.2.2
        args: []

scottkurz · 2020-09-16T18:42:41Z

pkg/odo/cli/component/deploy.go

+	// if it does, then check we have an port setup in env.yaml
+	do.DeploymentPort = 0
+	if bytes.Contains(manifestBytes, []byte("{{.PORT}}")) {
+		deploymentPort, err := do.EnvSpecificInfo.GetPortByURLKind(envinfo.ROUTE)


I think this maybe should be revisited. We'd like to enable the use case where, on OCP, you can push without doing odo url create , which means there will only be a devfile entry, but no env.yaml entry for the Url.

scottkurz · 2020-09-18T01:05:22Z

Another thought.. (and maybe some of this should be moved to follow-up issue(s)).. it seems by default the tag is based on the current project / NS, not the one embedded in the project env.yaml (whereas with a push the pod is created in the env.yaml NS).

prietyc123 · 2020-11-11T08:51:28Z

.travis.yml

@@ -142,6 +142,19 @@ jobs:
        # - travis_wait make test-cmd-docker-devfile-url-pushtarget
        # These tests need cluster login as they will be interacting with a Kube environment
        - odo login -u developer
+        - travis_wait make test-cmd-devfile-catalog


AFAIK we are already running the whole devfile target under https://github.com/openshift/odo/blob/master/Makefile#L374-L377, its just duplicating the jobs.

openshift-merge-robot · 2020-11-30T09:08:42Z

@EnriqueL8: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/v4.6-integration-e2e	`51a5d36`	link	`/test v4.6-integration-e2e`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-ci · 2021-03-01T12:03:19Z

@EnriqueL8: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/unit	`51a5d36`	link	`/test unit`
ci/prow/v4.6-integration-e2e	`51a5d36`	link	`/test v4.6-integration-e2e`
ci/prow/v4.7-e2e-4x-psi	`51a5d36`	link	`/test v4.7-e2e-4x-psi`
ci/prow/v4.7-integration-e2e	`51a5d36`	link	`/test v4.7-integration-e2e`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

girishramnani · 2021-03-09T09:03:55Z

thank you for this PR but it seems to have diverged, we can come back to this feature once we are ready, hence closing

EnriqueL8 and others added 30 commits June 4, 2020 14:39

WIP: Add simple poc build command

90191a4

POC Build

efab329

WIP: Add syncfiles poc for build

ddf14ab

Add ServiceAccount env

037012d

Clean up code

78f28ae

Add defer for delete

ea4a573

First pass downloading Dockerfile specified in devfile

11dec2b

Merge branch 'deploy_command' of https://github.com/EnriqueL8/odo int…

2bc2e4c

…o parse_dockerfile

Fix compilation issue

630ae4a

Moved Dockerfile download to .odo to avoid overwriting users one in t…

4102af3

…he projects source

Merge branch 'deploy_command' into parse_dockerfile

630b9dd

Updates for initial deploy steps

a81f13f

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

Tidy up following PR comments

603b722

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

Incorporate changes to determine manifest from devfile.yaml

8733e06

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

Updates for initial deploy steps

500000b

Fixing seg fault and defer error

0041f07

Add delete deploy (#7)

12658f2

Co-authored-by: Cameron McWilliam <cam.mcwilliam@me.com>

Build config (#8)

1e2c221

updated manifest file and added tests (#10)

1d1423b

Resolve PR comments and change to use alpha.build-dockerfile and (#11)

32beaf9

alpha.deployment-manifest Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

Add some tests for manifest deploy part of odo deploy command (#13)

fe7dbaa

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

Remove --deployOnly option (#14)

4f53442

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

General clean up (#12)

1008511

* Remove CommonPushOptions and do some clean up * Move validation, add better user experience, remove devfile.yaml flag

Merge remote-tracking branch 'origin/master' into deploy_command

9d82133

Fix issues in merge conflict

3cc73db

Fix tests following restructure of command messages (#16)

8291abb

Signed-off-by: Steven Groeger <groeges@uk.ibm.com>

Fix issues in merge conflict

431717c

Fix dockerfile test

6790683

Trying svc.cluster.local as registry url

164e921

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. Required by Prow. label Aug 24, 2020

This was referenced Aug 25, 2020

Add support to perform build in "odo deploy" using S2I strategy #3832

Closed

Support non dockerfile build for "odo deploy" #3846

Closed

Dynamically get registry URL

db0f4c9

Merge remote-tracking branch 'origin/master' into deploy_command

9c30cbc

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. Required by Prow. label Aug 27, 2020

prietyc123 suggested changes Sep 6, 2020

View reviewed changes

pkg/devfile/adapters/common/types.go Outdated Show resolved Hide resolved

pkg/occlient/occlient.go Show resolved Hide resolved

scottkurz mentioned this pull request Sep 9, 2020

odo push with alternate --run-command should push complete file set upon new pod creation #3918

Closed

EnriqueL8 added 3 commits September 11, 2020 11:48

Fix DeployParameters Comment

bfbb7dd

Merge remote-tracking branch 'origin/master' into deploy_command

ca0dd6c

Fix linting errors

51a5d36

awisniew90 mentioned this pull request Sep 11, 2020

Outer loop support files OpenLiberty/devfile-stack#38

Merged

scottkurz reviewed Sep 16, 2020

View reviewed changes

prietyc123 suggested changes Nov 11, 2020

View reviewed changes

girishramnani closed this Mar 9, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Deploy Command for OCP #3478

Deploy Command for OCP #3478

EnriqueL8 commented Jul 2, 2020 •

edited

Loading

girishramnani commented Aug 20, 2020

jaideepr97 commented Aug 20, 2020 •

edited

Loading

EnriqueL8 commented Aug 24, 2020

EnriqueL8 commented Aug 25, 2020

EnriqueL8 commented Aug 27, 2020

openshift-ci-robot commented Sep 11, 2020

scottkurz commented Sep 14, 2020

EnriqueL8 commented Sep 14, 2020

scottkurz commented Sep 16, 2020

scottkurz commented Sep 16, 2020

scottkurz Sep 16, 2020

scottkurz commented Sep 18, 2020

prietyc123 Nov 11, 2020

openshift-merge-robot commented Nov 30, 2020

openshift-ci bot commented Mar 1, 2021

girishramnani commented Mar 9, 2021

Deploy Command for OCP #3478

Deploy Command for OCP #3478

Conversation

EnriqueL8 commented Jul 2, 2020 • edited Loading

girishramnani commented Aug 20, 2020

jaideepr97 commented Aug 20, 2020 • edited Loading

EnriqueL8 commented Aug 24, 2020

EnriqueL8 commented Aug 25, 2020

EnriqueL8 commented Aug 27, 2020

openshift-ci-robot commented Sep 11, 2020

scottkurz commented Sep 14, 2020

EnriqueL8 commented Sep 14, 2020

scottkurz commented Sep 16, 2020

scottkurz commented Sep 16, 2020

scottkurz Sep 16, 2020

Choose a reason for hiding this comment

scottkurz commented Sep 18, 2020

prietyc123 Nov 11, 2020

Choose a reason for hiding this comment

openshift-merge-robot commented Nov 30, 2020

openshift-ci bot commented Mar 1, 2021

girishramnani commented Mar 9, 2021

EnriqueL8 commented Jul 2, 2020 •

edited

Loading

jaideepr97 commented Aug 20, 2020 •

edited

Loading