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

Bump odo version to 1.0.0-beta6 #2182

Merged
merged 1 commit into from
Sep 26, 2019
Merged

Bump odo version to 1.0.0-beta6 #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LABEL com.redhat.component=atomic-openshift-odo-cli-artifacts-container \
summary="This image contains the Linux, Mac and Windows version of odo"

# Change version as needed. Note no "-" is allowed
LABEL version=1.0.0beta5
LABEL version=1.0.0-beta6

COPY --from=builder /go/src/github.com/openshift/odo/dist/bin/darwin-amd64/odo /usr/share/openshift/odo/mac/odo
COPY --from=builder /go/src/github.com/openshift/odo/dist/bin/windows-amd64/odo.exe /usr/share/openshift/odo/windows/odo.exe
Expand Down
34 changes: 32 additions & 2 deletions docs/cli-reference.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ Syntax
| link:#create[create]
| Create a new component

| link:#debug[debug]
| Debug commands (port-forward)

| link:#delete[delete]
| Delete an existing component

Expand Down Expand Up @@ -106,7 +109,7 @@ CLI Structure

[source,sh]
----
odo --alsologtostderr --log_backtrace_at --log_dir --logtostderr --o --skip-connection-check --stderrthreshold --v --vmodule : odo (OpenShift Do) (app, catalog, component, config, create, delete, describe, link, list, log, login, logout, preference, project, push, service, storage, unlink, update, url, utils, version, watch)
odo --alsologtostderr --log_backtrace_at --log_dir --logtostderr --o --stderrthreshold --v --vmodule : odo (OpenShift Do) (app, catalog, component, config, create, debug, delete, describe, link, list, log, login, logout, preference, project, push, service, storage, unlink, update, url, utils, version, watch)
app : Perform application operations (delete, describe, list)
delete --force --project : Delete the given application
describe --project : Describe the given application
Expand All @@ -115,7 +118,7 @@ odo --alsologtostderr --log_backtrace_at --log_dir --logtostderr --o --skip-conn
describe : Describe catalog item (service)
service : Describe a service
list : List all available component & service types. (components, services)
components : List all components available.
components : List all components
services : Lists all available services
search : Search available component & service types. (component, service)
component : Search component type in catalog
Expand All @@ -137,6 +140,8 @@ odo --alsologtostderr --log_backtrace_at --log_dir --logtostderr --o --skip-conn
unset --context --env --force : Unset a value in odo config file
view --context : View current configuration values
create --app --binary --context --cpu --env --git --max-cpu --max-memory --memory --min-cpu --min-memory --now --port --project --ref : Create a new component
debug : Debug commands (port-forward)
port-forward --context --local-port : Forward one or more local ports to a pod
delete --all --app --context --force --project : Delete an existing component
describe --app --context --project : Describe the given component
link --app --component --context --port --project --wait --wait-for-target : Link component to a service or component
Expand Down Expand Up @@ -287,6 +292,7 @@ _________________
odo config set MinMemory 50M
odo config set MaxMemory 500M
odo config set Memory 250M
odo config set DebugPort 4040
odo config set Ignore false
odo config set MinCPU 0.5
odo config set MaxCPU 2
Expand All @@ -301,6 +307,7 @@ _________________
odo config unset MinMemory
odo config unset MaxMemory
odo config unset Memory
odo config unset DebugPort
odo config unset Ignore
odo config unset MinCPU
odo config unset MaxCPU
Expand All @@ -316,6 +323,7 @@ Modifies odo specific configuration settings within the config file.
Available Local Parameters:
Application - Application is the name of application the component needs to be part of
CPU - The minimum and maximum CPU a component can consume
DebugPort - The port on which the debugger will listen on the component
Ignore - Consider the .odoignore file for push and watch
MaxCPU - The maximum CPU a component can consume
MaxMemory - The maximum memory a component can consume
Expand Down Expand Up @@ -398,6 +406,28 @@ By default, builder images will be used from the current namespace. You can expl

A full list of component types that can be deployed is available using: 'odo catalog list'

[[debug]]
debug
Copy link
Member

Choose a reason for hiding this comment

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

Why is debug section empty?

Copy link
Member Author

Choose a reason for hiding this comment

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

TBH, I'm not sure if that's something I should have added or make generate-cli-reference should have.

Copy link
Member

Choose a reason for hiding this comment

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

OK, no examples in the command-line. It will have to be fixed there.

/lgtm

~~~~~

[source,sh]
----
debug
----

_________________
Example using debug
_________________

[source,sh]
----

----

Warning - Debug is currently in tech preview and hence is subject to change in future.

Debug allows you to remotely debug you application

[[delete]]
delete
~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion docs/development.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ To release a new version:

* Updates the version in the following files:

** link:/pkg/odo/cli/version/version.go[`cmd/version.go`]
** link:/pkg/odo/cli/version/version.go[`pkg/odo/cli/version/version.go`]
** link:/scripts/installer.sh[`scripts/installer.sh`]
** link:/Dockerfile.rhel[`Dockerfile.rhel`]
** link:/scripts/rpm-prepare.sh[`scripts/rpm-prepare.sh`]
Expand Down
2 changes: 1 addition & 1 deletion pkg/odo/cli/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

var (
// VERSION is version number that will be displayed when running ./odo version
VERSION = "v1.0.0-beta5"
VERSION = "v1.0.0-beta6"

// GITCOMMIT is hash of the commit that will be displayed when running ./odo version
// this will be overwritten when running build like this: go build -ldflags="-X github.com/openshift/odo/cmd.GITCOMMIT=$(GITCOMMIT)"
Expand Down
2 changes: 1 addition & 1 deletion scripts/installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
ODO_VERSION="latest"

# Latest released odo version
LATEST_VERSION="v1.0.0-beta5"
LATEST_VERSION="v1.0.0-beta6"

GITHUB_RELEASES_URL="https://github.com/openshift/odo/releases/download/${LATEST_VERSION}"
BINTRAY_URL="https://dl.bintray.com/odo/odo/latest"
Expand Down
2 changes: 1 addition & 1 deletion scripts/rpm-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set +ex
echo "Reading ODO_VERSION, ODO_RELEASE and GIT_COMMIT env, if they are set"
# Change version as needed. In most cases ODO_RELEASE would not be touched unless
# we want to do a re-lease of same version as we are not backporting
export ODO_VERSION=${ODO_VERSION:=1.0.0-beta5}
export ODO_VERSION=${ODO_VERSION:=1.0.0-beta6}
export ODO_RELEASE=${ODO_RELEASE:=1}

export GIT_COMMIT=${GIT_COMMIT:=`git rev-parse --short HEAD 2>/dev/null`}
Expand Down