Bump steve and dashboard for Rancher v2.6.11

fix text incorrect

.drone.yml

@@ -0,0 +1,309 @@
+---
+kind: pipeline
+name: default-amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  pull: default
+  image: rancher/dapper:v0.5.8
+  commands:
+  - dapper ci
+  privileged: true
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+  when:
+    ref:
+      include:
+      - "refs/heads/main"
+      - "refs/heads/v*"
+    event:
+    - push
+    - pull_request
+
+- name: release
+  pull: default
+  image: rancher/dapper:v0.5.8
+  commands:
+  - dapper ci
+  privileged: true
+  environment:
+    CROSS: 1
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+  when:
+    event:
+    - tag
+
+- name: stage-binaries-head
+  image: rancher/dapper:v0.5.8
+  commands:
+  - "cp -r ./bin/kube-explorer ./package/"
+  when:
+    ref:
+      include:
+      - "refs/heads/main"
+      - "refs/heads/v*"
+    event:
+    - push
+
+- name: stage-binaries
+  image: rancher/dapper:v0.5.8
+  commands:
+  - "cp -r ./bin/kube-explorer-linux-amd64 ./package/kube-explorer"
+  when:
+    event:
+    - tag
+
+- name: github_binary_release
+  pull: default
+  image: plugins/github-release
+  settings:
+    api_key:
+      from_secret: github_token
+    checksum:
+    - sha256
+    files:
+    - "bin/*"
+    title: "${DRONE_TAG}"
+    overwrite: true
+  when:
+    event:
+    - tag
+
+- name: docker-publish-head
+  pull: default
+  image: plugins/docker
+  settings:
+    dockerfile: package/Dockerfile
+    context: package/
+    password:
+      from_secret: docker_password
+    repo: cnrancher/kube-explorer
+    tag: head-linux-amd64
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+      include:
+      - "refs/heads/main"
+      - "refs/heads/v*"
+    event:
+    - push
+
+- name: image-scan-head
+  image: aquasec/trivy
+  commands:
+  - trivy image --no-progress --ignore-unfixed --severity HIGH,CRITICAL --scanners vuln --exit-code 1 cnrancher/kube-explorer:head-linux-amd64
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+  when:
+    ref:
+      include:
+      - "refs/heads/main"
+      - "refs/heads/v*"
+    event:
+    - push
+
+- name: docker-publish
+  pull: default
+  image: plugins/docker
+  settings:
+    dockerfile: package/Dockerfile
+    context: package/
+    password:
+      from_secret: docker_password
+    repo: cnrancher/kube-explorer
+    tag: ${DRONE_TAG}-linux-amd64
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - tag
+
+volumes:
+- name: docker
+  host:
+    path: /var/run/docker.sock
+
+node:
+  instance: agent-amd64
+
+trigger:
+  ref:
+    include:
+    - "refs/heads/main"
+    - "refs/heads/v*"
+    - "refs/tags/*"
+  event:
+    exclude:
+    - promote
+
+---
+kind: pipeline
+name: default-arm64
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  pull: default
+  image: rancher/dapper:v0.5.8
+  commands:
+  - dapper ci
+  privileged: true
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
+  when:
+    ref:
+      include:
+      - "refs/heads/main"
+      - "refs/heads/v*"
+      - "refs/tags/*"
+    event:
+    - push
+    - tag
+
+- name: stage-binaries
+  image: rancher/dapper:v0.5.8
+  commands:
+  - "cp -r ./bin/* ./package/"
+  when:
+    ref:
+      include:
+      - "refs/heads/main"
+      - "refs/heads/v*"
+      - "refs/tags/*"
+    event:
+    - push
+    - tag
+
+- name: docker-publish-head
+  pull: default
+  image: plugins/docker
+  settings:
+    build_args:
+    - ARCH=arm64
+    dockerfile: package/Dockerfile
+    context: package/
+    password:
+      from_secret: docker_password
+    repo: cnrancher/kube-explorer
+    tag: head-linux-arm64
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+      include:
+      - "refs/heads/main"
+      - "refs/heads/v*"
+    event:
+    - push
+
+- name: docker-publish
+  pull: default
+  image: plugins/docker
+  settings:
+    build_args:
+    - ARCH=arm64
+    dockerfile: package/Dockerfile
+    context: package/
+    password:
+      from_secret: docker_password
+    repo: cnrancher/kube-explorer
+    tag: ${DRONE_TAG}-linux-arm64
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - tag
+
+volumes:
+- name: docker
+  host:
+    path: /var/run/docker.sock
+
+trigger:
+  ref:
+    include:
+    - "refs/heads/main"
+    - "refs/heads/v*"
+    - "refs/tags/*"
+  event:
+    exclude:
+    - promote
+
+node:
+  instance: agent-arm64
+
+---
+kind: pipeline
+name: manifest
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: push-manifest-head
+  image: plugins/manifest
+  settings:
+    ignore_missing: true
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    spec: manifest-head.tmpl
+  when:
+    ref:
+      include:
+      - "refs/heads/main"
+      - "refs/heads/v*"
+    event:
+    - push
+
+- name: push-manifest
+  image: plugins/manifest
+  settings:
+    ignore_missing: true
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    spec: manifest.tmpl
+  when:
+    event:
+    - tag
+
+volumes:
+- name: docker
+  host:
+    path: /var/run/docker.sock
+
+node:
+  instance: agent-amd64
+
+trigger:
+  ref:
+    include:
+    - "refs/heads/main"
+    - "refs/heads/v*"
+    - "refs/tags/*"
+  event:
+    exclude:
+    - promote
+
+depends_on:
+- default-amd64
+- default-arm64
+
+...

Dockerfile.dapper

@@ -1,4 +1,4 @@
-FROM golang:1.16
+FROM golang:1.19
 
 ARG DAPPER_HOST_ARCH
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
@@ -6,11 +6,11 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
 RUN apt-get update && \
     apt-get install -y ca-certificates git wget curl xz-utils && \
     rm -f /bin/sh && ln -s /bin/bash /bin/sh && \
-    curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-${ARCH}_linux.tar.xz | tar xvJf - --strip-components=1 -C /tmp && \
+    curl -sL https://github.com/upx/upx/releases/download/v4.0.2/upx-4.0.2-${ARCH}_linux.tar.xz | tar xvJf - --strip-components=1 -C /tmp && \
     mv /tmp/upx /usr/bin/
 
 RUN if [ "${ARCH}" == "amd64" ]; then \
-    curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.27.0; \
+    curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0; \
     fi
 
 ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
@@ -19,10 +19,10 @@ ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
     DOCKER_URL=DOCKER_URL_${ARCH}
 RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker
 
-ENV GIT_COMMIT="327be56d3a6a2b85cf4751148f6834402e8211d5" \
-    GIT_BRANCH="kube-explorer" \
-    GIT_SOURCE="/go/src/github.com/rancher/steve" \
-    CATTLE_DASHBOARD_UI_VERSION=v2.5.8-cn
+ENV GIT_COMMIT="3eb3cd09ee51c80f56f3f4fc8674d985b6e2f4e0" \
+    GIT_BRANCH="ke/v0.2" \
+    GIT_SOURCE=${GOPATH}/src/github.com/rancher/steve \
+    CATTLE_DASHBOARD_UI_VERSION="v2.6.11-kube-explorer-ui-rc1"
 
 ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS
 ENV DAPPER_SOURCE /opt/kube-explorer

README.md

@@ -1,12 +1,12 @@
 # kube-explorer
 
-kube-explorer is portable explorer for Kubernetes, without any dependency.
+kube-explorer is a portable explorer for Kubernetes without any dependency.
 
 It integrates the Rancher steve framework and its dashboard, and is recompiled, packaged, compressed, and provides an almost completely stateless Kubernetes resource manager.
 
 ## Usage ✅
 
-Please download the binary from the [release page](https://github.com/niusmallnan/kube-explorer/releases).
+Please download the binary from the [release page](https://github.com/cnrancher/kube-explorer/releases).
 
 To run an HTTP only server:
 
@@ -15,3 +15,27 @@ To run an HTTP only server:
 ```
 
 Then, open the browser to visit http://x.x.x.x:9898 .
+
+![](docs/assets/kube-explorer-record.gif)
+
+## Build ✅
+
+To debug on an AMD64 Linux host:
+
+```
+make dev
+
+# $basedir=/opt/ui/dist/
+# prepare the file trees like this
+# $basedir/dashboard/
+# $basedir/index.html
+
+# good to go!
+./kube-explorer --debug  --ui-path /opt/ui/dist/ --http-listen-port=9898 --https-listen-port=0
+```
+
+To build all cross-platform binaries:
+
+```
+CROSS=1 make
+```

deploy/kubectl/deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       serviceAccountName: kube-explorer
       containers:
-      - image: niusmallnan/kube-explorer
+      - image: cnrancher/kube-explorer
         imagePullPolicy: IfNotPresent
         name: kube-explorer
         ports:

deploy/kubectl/nginx-auth/README.md

@@ -1,4 +1,4 @@
-## Traefik Auth
+## Ingress-Nginx Basic Auth
 
 This can be used in the cluster which uses the nginx-ingress.
 

manifest-head.tmpl

@@ -0,0 +1,12 @@
+image: cnrancher/kube-explorer:latest
+manifests:
+  -
+    image: cnrancher/kube-explorer:head-linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: cnrancher/kube-explorer:head-linux-arm64
+    platform:
+      architecture: arm64
+      os: linux

manifest.tmpl

@@ -0,0 +1,12 @@
+image: cnrancher/kube-explorer:{{build.tag}}
+manifests:
+  -
+    image: cnrancher/kube-explorer:{{build.tag}}-linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: cnrancher/kube-explorer:{{build.tag}}-linux-arm64
+    platform:
+      architecture: arm64
+      os: linux

package/Dockerfile

@@ -1,6 +1,4 @@
-FROM alpine:3.13
+FROM registry.suse.com/bci/bci-minimal:15.4
 
 COPY kube-explorer entrypoint.sh /usr/bin/
-# Hack to make golang do files,dns search order
-ENV LOCALDOMAIN=""
 ENTRYPOINT ["entrypoint.sh"]

scripts/build

@@ -4,8 +4,7 @@ set -e
 source $(dirname $0)/version
 
 OS_ARCH_ARG_LINUX="amd64 arm arm64"
-OS_ARCH_ARG_WINDOWS="amd64"
-OS_ARCH_ARG_DARWIN="amd64"
+OS_ARCH_ARG_DARWIN="amd64 arm64"
 
 LD_INJECT_VALUES="-X github.com/rancher/steve/pkg/version.Version=$VERSION
                   -X github.com/rancher/steve/pkg/version.GitCommit=$COMMIT"
@@ -24,15 +23,6 @@ if [ -n "$CROSS" ]; then
                 -o ${OUTPUT_BIN}
     done
 
-    for ARCH in ${OS_ARCH_ARG_WINDOWS}; do
-        OUTPUT_BIN="bin/kube-explorer-windows-$ARCH.exe"
-        echo "Building binary for windows/$ARCH..."
-        GOARCH=$ARCH GOOS=windows CGO_ENABLED=0 go build -tags embed \
-                -ldflags \
-                "$LD_INJECT_VALUES $LINKFLAGS" \
-                -o ${OUTPUT_BIN}
-    done
-
     for ARCH in ${OS_ARCH_ARG_DARWIN}; do
         OUTPUT_BIN="bin/kube-explorer-darwin-$ARCH"
         echo "Building binary for darwin/$ARCH..."
@@ -50,7 +40,15 @@ else
 fi
 
 for f in $(ls ./bin/); do
-    upx -o $DAPPER_SOURCE/bin/$f bin/$f
+    if [[ $f != *darwin-arm64 ]]; then
+        upx -o $DAPPER_SOURCE/bin/$f bin/$f || true
+    fi
+    if [ -f $DAPPER_SOURCE/bin/$f ]; then
+        echo "UPX done!"
+    else
+        echo "Copy origin file as UPX failed!!!"
+        cp bin/$f $DAPPER_SOURCE/bin/$f
+    fi
 done
 
 popd

scripts/download

@@ -10,7 +10,7 @@ git reset --hard ${GIT_COMMIT}
 
 mkdir -p pkg/ui/ui/dashboard
 cd pkg/ui/ui/dashboard
-curl -sL https://rancher-dashboard-ui.s3.ap-southeast-2.amazonaws.com/release-2.5/${CATTLE_DASHBOARD_UI_VERSION}.tar.gz | tar xvzf - --strip-components=2
+curl -sL https://pandaria-dashboard-ui.s3.ap-southeast-2.amazonaws.com/release-2.6-cn/kube-explorer-ui/${CATTLE_DASHBOARD_UI_VERSION}.tar.gz | tar xvzf - --strip-components=2
 cp index.html ../index.html
 
 popd

scripts/package

@@ -13,6 +13,6 @@ else
     cp bin/kube-explorer package/
 fi
 cd package
-docker build -f Dockerfile -t niusmallnan/kube-explorer:$VERSION .
+docker build -f Dockerfile -t cnrancher/kube-explorer:$VERSION .
 
 popd