chore: prepare for v3 GA

Author: rawlingsj

.github/workflows/jenkins-x-release.yaml

@@ -87,7 +87,7 @@ jobs:
         tags: |
           ghcr.io/jenkins-x/terraform-operator-gcp:latest
           ghcr.io/jenkins-x/terraform-operator-gcp:${{ steps.prep.outputs.version }}
-    - name: Build and push jx-cli
+    - name: Build and push jx
       uses: docker/build-push-action@v2
       with:
         context: .
@@ -97,8 +97,8 @@ jobs:
         build-args: |
           VERSION=${{ steps.prep.outputs.version }}
         tags: |
-          ghcr.io/jenkins-x/jx-cli:latest
-          ghcr.io/jenkins-x/jx-cli:${{ steps.prep.outputs.version }}
+          ghcr.io/jenkins-x/jx:latest
+          ghcr.io/jenkins-x/jx:${{ steps.prep.outputs.version }}
   release2:
     runs-on: ubuntu-latest
     needs: release
@@ -112,7 +112,7 @@ jobs:
       name: getrelease
       uses: pozetroninc/github-action-get-latest-release@master
       with:
-        repository: jenkins-x/jx-cli
+        repository: jenkins-x/jx
     - id: prep
       name: prep
       env:

.goreleaser.yml

@@ -6,7 +6,7 @@ before:
     - go mod download
 
 builds:
-  - id: jx-cli
+  - id: jx
     # Path to main.go file or main package.
     # Default is `.`.
     main: ./cmd/main.go
@@ -38,15 +38,15 @@ builds:
       - arm64
 
 archives:
-  - name_template: "jx-cli-{{ .Os }}-{{ .Arch }}"
+  - name_template: "jx-{{ .Os }}-{{ .Arch }}"
     format_overrides:
       - goos: windows
         format: zip
 
 checksum:
   # You can change the name of the checksums file.
-  # Default is `jx-cli_{{ .Version }}_checksums.txt`.
-  name_template: "jx-cli-checksums.txt"
+  # Default is `jx_{{ .Version }}_checksums.txt`.
+  name_template: "jx-checksums.txt"
 
   # Algorithm to be used.
   # Accepted options are sha256, sha512, sha1, crc32, md5, sha224 and sha384.

.jx/updatebot.yaml

@@ -6,7 +6,7 @@ spec:
         - https://github.com/jenkins-x/jx3-pipeline-catalog
       changes:
         - regex:
-            pattern: "jenkins-x/jx-cli:(.*)"
+            pattern: "jenkins-x/jx:(.*)"
             files:
               - "**/*.yaml"
         - regex:
@@ -23,7 +23,7 @@ spec:
             files:
               - git/github.com/jenkins-x/jx3-pipeline-catalog.yml
         - regex:
-            pattern: "\\s+image: ghcr.io/jenkins-x/jx-cli:(.*)"
+            pattern: "\\s+image: ghcr.io/jenkins-x/jx:(.*)"
             files:
               - ".lighthouse/jenkins-x/release.yaml"
               - ".lighthouse/jenkins-x/pullrequest*.yaml"
@@ -39,14 +39,14 @@ spec:
         - regex:
             pattern: "version: (.*)"
             files:
-              - "docker/ghcr.io/jenkins-x/jx-cli.yml"
-              - "packages/jx-cli.yml"
+              - "docker/ghcr.io/jenkins-x/jx.yml"
+              - "packages/jx.yml"
         - regex:
             pattern: "terraformVersion: (.*)"
             files:
             - ".lighthouse/jenkins-x/bdd/*.yaml*"
         - regex:
-            pattern: "JX_DEFAULT_IMAGE: ghcr.io/jenkins-x/jx-cli:(.*)"
+            pattern: "JX_DEFAULT_IMAGE: ghcr.io/jenkins-x/jx:(.*)"
             files:
               - "apps/jenkins-x/lighthouse/values.yaml.gotmpl"
               - "charts/jenkins-x/lighthouse/values.yaml.gotmpl"

CONTRIBUTING.MD

@@ -41,38 +41,38 @@ $ GOOS=linux GOARCH=amd64 ./make.bash --no-clean
 
 ## Fork the Repository
 
-Begin at GitHub by forking jx-cli, then clone your fork locally. Since jx-cli is a Go package, it
-should be located at `$GOPATH/src/github.com/jenkins-x/jx-cli`.
+Begin at GitHub by forking jx, then clone your fork locally. Since jx is a Go package, it
+should be located at `$GOPATH/src/github.com/jenkins-x/jx`.
 
 ```shell
 $ mkdir -p $GOPATH/src/github.com/jenkins-x
 $ cd $GOPATH/src/github.com/jenkins-x
-$ git clone [email protected]:<username>/jx-cli.git
-$ cd jx-cli
+$ git clone [email protected]:<username>/jx.git
+$ cd jx
 ```
 
-Add the conventional [upstream][] `git` remote in order to fetch changes from jx-cli's main master
+Add the conventional [upstream][] `git` remote in order to fetch changes from jx's main master
 branch and to create pull requests:
 
 ```shell
-$ git remote add upstream https://github.com/jenkins-x/jx-cli.git
+$ git remote add upstream https://github.com/jenkins-x/jx.git
 ```
 
 ## Build Your Changes
 
-With the prerequisites installed and your fork of jx-cli cloned, you can make changes to local jx-cli
+With the prerequisites installed and your fork of jx cloned, you can make changes to local jx
 source code.
 
-Run `make` to build the `jx-cli`  binaries:
+Run `make` to build the `jx`  binaries:
 
 ```shell
 
-$ make build      # runs dep and builds `jx-cli`  inside the build/
+$ make build      # runs dep and builds `jx`  inside the build/
 ```
 
 ## Testing
 
-The jx-cli test suite is divided into three sections:
+The jx test suite is divided into three sections:
  - The standard unit test suite
  - Slow unit tests
  - Integration tests

Dockerfile

@@ -9,7 +9,7 @@ ENV JX3_HOME /home/.jx3
 
 RUN echo using jx version ${VERSION} and OS ${TARGETOS} arch ${TARGETARCH} && \
   mkdir -p /home/.jx3 && \
-  curl -L https://github.com/jenkins-x/jx-cli/releases/download/v${VERSION}/jx-cli-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
+  curl -L https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
   mv jx /usr/bin
 
 RUN jx upgrade plugins --mandatory

Dockerfile-boot

@@ -27,7 +27,7 @@ RUN echo using yq version ${YQ_VERSION} and OS ${TARGETOS} arch ${TARGETARCH} &&
 
 RUN echo using jx version ${VERSION} and OS ${TARGETOS} arch ${TARGETARCH} && \
   mkdir -p /home/.jx3 && \
-  curl -L https://github.com/jenkins-x/jx-cli/releases/download/v${VERSION}/jx-cli-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
+  curl -L https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
   mv jx /usr/bin
 
 RUN jx upgrade plugins --boot --path /usr/bin

Dockerfile-go

@@ -9,7 +9,7 @@ ENV JX3_HOME /home/.jx3
 
 RUN echo using jx version ${VERSION} and OS ${TARGETOS} arch ${TARGETARCH} && \
   mkdir -p /home/.jx3 && \
-  curl -L https://github.com/jenkins-x/jx-cli/releases/download/v${VERSION}/jx-cli-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
+  curl -L https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
   mv jx /usr/bin
 
 RUN jx upgrade plugins --mandatory

Dockerfile-go-maven

@@ -9,7 +9,7 @@ ENV JX3_HOME /home/.jx3
 
 RUN echo using jx version ${VERSION} and OS ${TARGETOS} arch ${TARGETARCH} && \
   mkdir -p /home/.jx3 && \
-  curl -L https://github.com/jenkins-x/jx-cli/releases/download/v${VERSION}/jx-cli-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
+  curl -L https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
   mv jx /usr/bin
 
 RUN jx upgrade plugins --mandatory

Dockerfile-tfo-aws

@@ -29,7 +29,7 @@ RUN echo using yq version ${YQ_VERSION} and OS ${TARGETOS} arch ${TARGETARCH} &&
 # jx
 RUN echo using jx version ${VERSION} and OS ${TARGETOS} arch ${TARGETARCH} && \
   mkdir -p /home/.jx3 && \
-  curl -L https://github.com/jenkins-x/jx-cli/releases/download/v${VERSION}/jx-cli-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
+  curl -L https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
   mv jx /usr/bin
 
 # lets install the boot plugins
@@ -42,4 +42,4 @@ COPY run.sh /run.sh
 ENTRYPOINT ["/bin/bash"]
 CMD ["/run.sh"]
 
-LABEL org.opencontainers.image.source https://github.com/jenkins-x/jx-cli
+LABEL org.opencontainers.image.source https://github.com/jenkins-x/jx

Dockerfile-tfo-gcp

@@ -25,7 +25,7 @@ RUN echo using yq version ${YQ_VERSION} and OS ${TARGETOS} arch ${TARGETARCH} &&
 # jx
 RUN echo using jx version ${VERSION} and OS ${TARGETOS} arch ${TARGETARCH} && \
   mkdir -p /home/.jx3 && \
-  curl -L https://github.com/jenkins-x/jx-cli/releases/download/v${VERSION}/jx-cli-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
+  curl -L https://github.com/jenkins-x/jx/releases/download/v${VERSION}/jx-${TARGETOS}-${TARGETARCH}.tar.gz | tar xzv && \
   mv jx /usr/bin
 
 # lets install the boot plugins
@@ -39,4 +39,4 @@ ENTRYPOINT ["/bin/bash"]
 CMD ["run.sh"]
 
 
-LABEL org.opencontainers.image.source https://github.com/jenkins-x/jx-cli
+LABEL org.opencontainers.image.source https://github.com/jenkins-x/jx

Makefile

@@ -2,7 +2,7 @@
 rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
 
 SHELL := /bin/bash
-NAME := jx-cli
+NAME := jx
 BINARY_NAME := jx
 BUILD_TARGET = build
 MAIN_SRC_FILE=cmd/main.go
@@ -80,7 +80,7 @@ get-test-deps: ## Install test dependencies
 print-version: ## Print version
 	@echo $(VERSION)
 
-build: $(GO_DEPENDENCIES) clean ## Build jx-cli binary for current OS
+build: $(GO_DEPENDENCIES) clean ## Build jx binary for current OS
 	go mod download
 	CGO_ENABLED=$(CGO_ENABLED) $(GO) $(BUILD_TARGET) $(BUILDFLAGS) -o build/$(BINARY_NAME) $(MAIN_SRC_FILE)
 

README.md

@@ -1,24 +1,24 @@
 # Jenkins X CLI for Version 3.x
 
-[![Documentation](https://godoc.org/github.com/jenkins-x/jx-cli?status.svg)](https://pkg.go.dev/mod/github.com/jenkins-x/jx-cli)
-[![Go Report Card](https://goreportcard.com/badge/github.com/jenkins-x/jx-cli)](https://goreportcard.com/report/github.com/jenkins-x/jx-cli)
-[![Releases](https://img.shields.io/github/release-pre/jenkins-x/jx-cli.svg)](https://github.com/jenkins-x/jx-cli/releases)
-[![LICENSE](https://img.shields.io/github/license/jenkins-x/jx-cli.svg)](https://github.com/jenkins-x/jx-cli/blob/master/LICENSE)
+[![Documentation](https://godoc.org/github.com/jenkins-x/jx?status.svg)](https://pkg.go.dev/mod/github.com/jenkins-x/jx)
+[![Go Report Card](https://goreportcard.com/badge/github.com/jenkins-x/jx)](https://goreportcard.com/report/github.com/jenkins-x/jx)
+[![Releases](https://img.shields.io/github/release-pre/jenkins-x/jx.svg)](https://github.com/jenkins-x/jx/releases)
+[![LICENSE](https://img.shields.io/github/license/jenkins-x/jx.svg)](https://github.com/jenkins-x/jx/blob/master/LICENSE)
 [![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://slack.k8s.io/)
 
-`jx-cli` is the modular command line CLI for [Jenkins X 3.x](https://jenkins-x.io/v3/about/)
+`jx` is the modular command line CLI for [Jenkins X 3.x](https://jenkins-x.io/v3/about/)
 
 
 ## Commands
 
-See the [jx command reference](https://github.com/jenkins-x/jx-cli/blob/master/docs/cmd/jx.md)
+See the [jx command reference](https://github.com/jenkins-x/jx/blob/master/docs/cmd/jx.md)
 
 ## Issues
 
-To track [issues in this repository](https://github.com/jenkins-x/jx-cli/issues) and all the related [Plugins](#plugins) use this link:
+To track [issues in this repository](https://github.com/jenkins-x/jx/issues) and all the related [Plugins](#plugins) use this link:
 
-* [view open issues in jx-cli and its plugins](https://github.com/issues?q=is%3Aopen+is%3Aissue+repo%3Ajenkins-x%2Fjx-cli+repo%3Ajenkins-x%2Fjx-admin+repo%3Ajenkins-x%2Fjx-application+repo%3Ajenkins-x%2Fjx-apps+repo%3Ajenkins-x%2Fjx-helpers+repo%3Ajenkins-x%2Fjx-git-operator+repo%3Ajenkins-x%2Fjx-gitops+repo%3Ajenkins-x%2Fjx-pipeline+repo%3Ajenkins-x%2Fjx-project+repo%3Ajenkins-x%2Fjx-promote+repo%3Ajenkins-x%2Fjx-secret+repo%3Ajenkins-x%2Fjx-verify+repo%3Ajenkins-x%2F%2Fjx-secret+repo%3Ajenkins-x%2Foctant-jx+)
-* [view open pull requests in jx-cli and its plugins](https://github.com/pulls?q=is%3Aopen+is%3Apr+-label%3Adependencies+repo%3Ajenkins-x%2Fjx-cli+repo%3Ajenkins-x%2Fjx-admin+repo%3Ajenkins-x%2Fjx-application+repo%3Ajenkins-x%2Fjx-apps+repo%3Ajenkins-x%2Fjx-helpers+repo%3Ajenkins-x%2Fjx-git-operator+repo%3Ajenkins-x%2Fjx-gitops+repo%3Ajenkins-x%2Fjx-pipeline+repo%3Ajenkins-x%2Fjx-project+repo%3Ajenkins-x%2Fjx-promote+repo%3Ajenkins-x%2Fjx-secret+repo%3Ajenkins-x%2Fjx-verify+repo%3Ajenkins-x%2F%2Fjx-secret+repo%3Ajenkins-x%2Foctant-jx+)
+* [view open issues in jx and its plugins](https://github.com/issues?q=is%3Aopen+is%3Aissue+repo%3Ajenkins-x%2Fjx+repo%3Ajenkins-x%2Fjx-admin+repo%3Ajenkins-x%2Fjx-application+repo%3Ajenkins-x%2Fjx-apps+repo%3Ajenkins-x%2Fjx-helpers+repo%3Ajenkins-x%2Fjx-git-operator+repo%3Ajenkins-x%2Fjx-gitops+repo%3Ajenkins-x%2Fjx-pipeline+repo%3Ajenkins-x%2Fjx-project+repo%3Ajenkins-x%2Fjx-promote+repo%3Ajenkins-x%2Fjx-secret+repo%3Ajenkins-x%2Fjx-verify+repo%3Ajenkins-x%2F%2Fjx-secret+repo%3Ajenkins-x%2Foctant-jx+)
+* [view open pull requests in jx and its plugins](https://github.com/pulls?q=is%3Aopen+is%3Apr+-label%3Adependencies+repo%3Ajenkins-x%2Fjx+repo%3Ajenkins-x%2Fjx-admin+repo%3Ajenkins-x%2Fjx-application+repo%3Ajenkins-x%2Fjx-apps+repo%3Ajenkins-x%2Fjx-helpers+repo%3Ajenkins-x%2Fjx-git-operator+repo%3Ajenkins-x%2Fjx-gitops+repo%3Ajenkins-x%2Fjx-pipeline+repo%3Ajenkins-x%2Fjx-project+repo%3Ajenkins-x%2Fjx-promote+repo%3Ajenkins-x%2Fjx-secret+repo%3Ajenkins-x%2Fjx-verify+repo%3Ajenkins-x%2F%2Fjx-secret+repo%3Ajenkins-x%2Foctant-jx+)
 * [view open pull requests in jenkins-x-plugins](https://github.com/pulls?q=is%3Aopen+is%3Apr++archived%3Afalse+user%3Ajenkins-x-plugins+)
 
 ## Plugins

charts/jx-cli/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: jx-cli
+name: jx
 description: Jenkins X next gen cloud CI / CD platform for Kubernetes
 home: https://jenkins-x.io/
 version: 0.0.1

charts/jx-cli/Makefile

@@ -1,5 +1,5 @@
 CHART_REPO := gs://jenkinsxio/charts
-NAME := jx-cli
+NAME := jx
 
 build: clean
 	rm -rf Chart.lock

charts/jx-cli/values.yaml

@@ -1,5 +1,5 @@
 image:
-  repository: gcr.io/jenkinsxio/jx-cli
+  repository: gcr.io/jenkinsxio/jx
   tag: 3.0.354
   pullPolicy: IfNotPresent
 

cmd/app/main-win.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"syscall"
 
-	"github.com/jenkins-x/jx-cli/pkg/cmd"
+	"github.com/jenkins-x/jx/pkg/cmd"
 )
 
 // Run runs the command, if args are not nil they will be set on the command

cmd/app/main.go

@@ -3,7 +3,7 @@
 package app
 
 import (
-	"github.com/jenkins-x/jx-cli/pkg/cmd"
+	"github.com/jenkins-x/jx/pkg/cmd"
 )
 
 // Run runs the command, if args are not nil they will be set on the command

cmd/docs/main.go

@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/jenkins-x/jx-cli/pkg/cmd"
+	"github.com/jenkins-x/jx/pkg/cmd"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/jenkins-x/jx-cli/cmd/app"
+	"github.com/jenkins-x/jx/cmd/app"
 )
 
 // Entrypoint for the command

dependency-matrix/matrix.md

@@ -13,7 +13,7 @@ Dependency | Sources | Version | Mismatched versions
 [jenkins-x/jx-preview](https://github.com/jenkins-x/jx-preview.git) |  | [0.0.128](https://github.com/jenkins-x/jx-preview/releases/tag/v0.0.128) | 
 [jenkins-x/jx-test](https://github.com/jenkins-x/jx-test.git) |  | [0.0.25](https://github.com/jenkins-x/jx-test/releases/tag/v0.0.25) | 
 [jenkins-x/jxl-base-image](https://github.com/jenkins-x/jxl-base-image) |  | [0.0.61]() | 
-[jenkins-x/jx-cli-base-image](https://github.com/jenkins-x/jx-cli-base-image.git) |  | [0.0.43]() | 
+[jenkins-x/jx-base-image](https://github.com/jenkins-x/jx-base-image.git) |  | [0.0.43]() | 
 [jenkins-x/jx-jenkins](https://github.com/jenkins-x/jx-jenkins.git) |  | [0.0.29](https://github.com/jenkins-x/jx-jenkins/releases/tag/v0.0.29) | 
 [jenkins-x-plugins/jx-scm](https://github.com/jenkins-x-plugins/jx-scm) |  | [0.0.2](https://github.com/jenkins-x-plugins/jx-scm/releases/tag/v0.0.2) | 
 [jenkins-x-plugins/jx-health](https://github.com/jenkins-x-plugins/jx-health.git) |  | [0.0.66](https://github.com/jenkins-x-plugins/jx-health/releases/tag/v0.0.66) | 

dependency-matrix/matrix.yaml

@@ -67,8 +67,8 @@ dependencies:
   versionURL: ""
 - host: github.com
   owner: jenkins-x
-  repo: jx-cli-base-image
-  url: https://github.com/jenkins-x/jx-cli-base-image.git
+  repo: jx-base-image
+  url: https://github.com/jenkins-x/jx-base-image.git
   version: 0.0.43
   versionURL: ""
 - host: github.com

go.mod

@@ -1,4 +1,4 @@
-module github.com/jenkins-x/jx-cli
+module github.com/jenkins-x/jx
 
 require (
 	github.com/blang/semver v3.5.1+incompatible

hack/changelog-header.md

@@ -1,14 +1,14 @@
 ### Linux
 
 ```shell
-curl -L https://github.com/jenkins-x/jx-cli/releases/download/v{{.Version}}/jx-cli-linux-amd64.tar.gz | tar xzv 
+curl -L https://github.com/jenkins-x/jx/releases/download/v{{.Version}}/jx-linux-amd64.tar.gz | tar xzv 
 sudo mv jx /usr/local/bin
 ```
 
 ### macOS
 
 ```shell
-curl -L  https://github.com/jenkins-x/jx-cli/releases/download/v{{.Version}}/jx-cli-darwin-amd64.tar.gz | tar xzv
+curl -L  https://github.com/jenkins-x/jx/releases/download/v{{.Version}}/jx-darwin-amd64.tar.gz | tar xzv
 sudo mv jx /usr/local/bin
 ```
 

hack/upload_plugin.sh

@@ -9,7 +9,7 @@ echo "apiVersion: jenkins.io/v1
 kind: Plugin
 metadata:
   labels:
-    jenkins.io/pluginCommand: jx-cli
+    jenkins.io/pluginCommand: jx
   name: remote
 spec:
   description: CloudBees plugin for remote environments
@@ -26,7 +26,7 @@ ls -al *.gz
 echo "uploading the plugin distro to github"
 github-release upload \
     --user jenkins-x \
-    --repo jx-cli \
+    --repo jx \
     --tag v${VERSION} \
     --name "plugin.gz" \
     --file plugin.gz

pkg/cmd/root.go

@@ -13,12 +13,12 @@ import (
 
 	v1 "github.com/jenkins-x/jx-api/v4/pkg/apis/jenkins.io/v1"
 	"github.com/jenkins-x/jx-api/v4/pkg/client/clientset/versioned"
-	"github.com/jenkins-x/jx-cli/pkg/cmd/dashboard"
-	"github.com/jenkins-x/jx-cli/pkg/cmd/namespace"
-	"github.com/jenkins-x/jx-cli/pkg/cmd/ui"
-	"github.com/jenkins-x/jx-cli/pkg/cmd/upgrade"
-	"github.com/jenkins-x/jx-cli/pkg/cmd/version"
-	"github.com/jenkins-x/jx-cli/pkg/plugins"
+	"github.com/jenkins-x/jx/pkg/cmd/dashboard"
+	"github.com/jenkins-x/jx/pkg/cmd/namespace"
+	"github.com/jenkins-x/jx/pkg/cmd/ui"
+	"github.com/jenkins-x/jx/pkg/cmd/upgrade"
+	"github.com/jenkins-x/jx/pkg/cmd/version"
+	"github.com/jenkins-x/jx/pkg/plugins"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/cobras"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/cobras/helper"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/cobras/templates"