apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-09-27 03:36:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: change default container image

Browse Source 
Signed-off-by: yuyicai <yuyicai@hotmail.com>
This commit is contained in:
yuyicai
2025-03-08 22:24:55 +08:00
parent 24b2195036
commit 2780f67dd6
11 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/coverage.yml vendored
View File

@@ -33,13 +33,12 @@ jobs:
- name: Install demo bookinfo - name: Install demo bookinfo
run: | run: |
minikube image load --remote istio/examples-bookinfo-details-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-details-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-ratings-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-ratings-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-reviews-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-reviews-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-productpage-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-productpage-v1:1.16.2
minikube image load --remote naison/authors:latest minikube image load --remote ghcr.io/kubenetworks/authors:latest
minikube image load --remote nginx:latest minikube image load --remote ghcr.io/kubenetworks/nginx:latest
minikube image load --remote naison/kubevpn:test
minikube image ls minikube image ls
eval $(minikube docker-env) eval $(minikube docker-env)
kubectl apply -f https://raw.githubusercontent.com/kubenetworks/kubevpn/master/samples/bookinfo.yaml kubectl apply -f https://raw.githubusercontent.com/kubenetworks/kubevpn/master/samples/bookinfo.yaml

26
.github/workflows/test.yml vendored
View File

@@ -51,13 +51,12 @@ jobs:
kubectl get pods -n kube-system -o wide kubectl get pods -n kube-system -o wide
- name: Install demo bookinfo - name: Install demo bookinfo
run: | run: |
minikube image load --remote istio/examples-bookinfo-details-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-details-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-ratings-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-ratings-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-reviews-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-reviews-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-productpage-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-productpage-v1:1.16.2
minikube image load --remote naison/authors:latest minikube image load --remote ghcr.io/kubenetworks/authors:latest
minikube image load --remote nginx:latest minikube image load --remote ghcr.io/kubenetworks/nginx:latest
minikube image load --remote naison/kubevpn:test
minikube image ls minikube image ls
eval $(minikube docker-env) eval $(minikube docker-env)
kubectl apply -f https://raw.githubusercontent.com/kubenetworks/kubevpn/master/samples/bookinfo.yaml kubectl apply -f https://raw.githubusercontent.com/kubenetworks/kubevpn/master/samples/bookinfo.yaml
@@ -124,13 +123,12 @@ jobs:
- name: Install demo bookinfo - name: Install demo bookinfo
run: | run: |
minikube image load --remote istio/examples-bookinfo-details-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-details-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-ratings-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-ratings-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-reviews-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-reviews-v1:1.16.2
minikube image load --remote istio/examples-bookinfo-productpage-v1:1.16.2 minikube image load --remote ghcr.io/kubenetworks/examples-bookinfo-productpage-v1:1.16.2
minikube image load --remote naison/authors:latest minikube image load --remote ghcr.io/kubenetworks/authors:latest
minikube image load --remote nginx:latest minikube image load --remote ghcr.io/kubenetworks/nginx:latest
minikube image load --remote naison/kubevpn:test
minikube image ls minikube image ls
eval $(minikube docker-env) eval $(minikube docker-env)
kubectl apply -f https://raw.githubusercontent.com/kubenetworks/kubevpn/master/samples/bookinfo.yaml kubectl apply -f https://raw.githubusercontent.com/kubenetworks/kubevpn/master/samples/bookinfo.yaml

2
Makefile
View File

@@ -23,7 +23,7 @@ IMAGE_GH_LATEST ?= ghcr.io/kubenetworks/kubevpn:latest
# Setup the -ldflags option for go build here, interpolate the variable values # Setup the -ldflags option for go build here, interpolate the variable values
# add '-tag noassets' for syncthing gui # add '-tag noassets' for syncthing gui
LDFLAGS=-tags noassets --ldflags "-s -w\ LDFLAGS=-tags noassets --ldflags "-s -w\
-X ${BASE}/pkg/config.Image=${IMAGE} \ -X ${BASE}/pkg/config.Image=${IMAGE_GH} \
-X ${BASE}/pkg/config.Version=${VERSION} \ -X ${BASE}/pkg/config.Version=${VERSION} \
-X ${BASE}/pkg/config.GitCommit=${GIT_COMMIT} \ -X ${BASE}/pkg/config.GitCommit=${GIT_COMMIT} \
-X ${BASE}/pkg/config.GitHubOAuthToken=${GitHubOAuthToken} \ -X ${BASE}/pkg/config.GitHubOAuthToken=${GitHubOAuthToken} \

20
README.md
View File

@@ -561,13 +561,13 @@ need to special parameter `--network` (inner docker) for sharing network and pid
Example: Example:
```shell ```shell
docker run -it --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v ~/.kube/config:/root/.kube/config --platform linux/amd64 naison/kubevpn:latest docker run -it --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v ~/.kube/config:/root/.kube/config --platform linux/amd64 ghcr.io/kubenetworks/kubevpn:latest
``` ```
```shell ```shell
➜ ~ docker run -it --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v ~/.kube/vke:/root/.kube/config --platform linux/amd64 naison/kubevpn:latest ➜ ~ docker run -it --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v ~/.kube/vke:/root/.kube/config --platform linux/amd64 ghcr.io/kubenetworks/kubevpn:latest
Unable to find image 'naison/kubevpn:latest' locally Unable to find image 'ghcr.io/kubenetworks/kubevpn:latest' locally
latest: Pulling from naison/kubevpn latest: Pulling from ghcr.io/kubenetworks/kubevpn
9c704ecd0c69: Already exists 9c704ecd0c69: Already exists
4987d0a976b5: Pull complete 4987d0a976b5: Pull complete
8aa94c4fc048: Pull complete 8aa94c4fc048: Pull complete
@@ -578,8 +578,8 @@ ca82aef6a9eb: Pull complete
1fd9534c7596: Pull complete 1fd9534c7596: Pull complete
588bd802eb9c: Pull complete 588bd802eb9c: Pull complete
Digest: sha256:368db2e0d98f6866dcefd60512960ce1310e85c24a398fea2a347905ced9507d Digest: sha256:368db2e0d98f6866dcefd60512960ce1310e85c24a398fea2a347905ced9507d
Status: Downloaded newer image for naison/kubevpn:latest Status: Downloaded newer image for ghcr.io/kubenetworks/kubevpn:latest
WARNING: image with reference naison/kubevpn was found but does not match the specified platform: wanted linux/amd64, actual: linux/arm64 WARNING: image with reference ghcr.io/kubenetworks/kubevpn was found but does not match the specified platform: wanted linux/amd64, actual: linux/arm64
root@5732124e6447:/app# kubevpn dev deployment/authors --headers user=naison --entrypoint sh root@5732124e6447:/app# kubevpn dev deployment/authors --headers user=naison --entrypoint sh
hostname is 5732124e6447 hostname is 5732124e6447
Starting connect Starting connect
@@ -677,10 +677,10 @@ during test, check what container is running
```text ```text
➜ ~ docker ps ➜ ~ docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
1cd576b51b66 naison/authors:latest "sh" 4 minutes ago Up 4 minutes authors_default_kubevpn_6df5f 1cd576b51b66 naison/authors:latest "sh" 4 minutes ago Up 4 minutes authors_default_kubevpn_6df5f
56a6793df82d nginx:latest "/docker-entrypoint.…" 4 minutes ago Up 4 minutes nginx_default_kubevpn_6df63 56a6793df82d nginx:latest "/docker-entrypoint.…" 4 minutes ago Up 4 minutes nginx_default_kubevpn_6df63
d0b3dab8912a naison/kubevpn:v2.0.0 "/bin/bash" 5 minutes ago Up 5 minutes upbeat_noyce d0b3dab8912a ghcr.io/kubenetworks/kubevpn:v2.0.0 "/bin/bash" 5 minutes ago Up 5 minutes upbeat_noyce
➜ ~ ➜ ~
``` ```

20
README_ZH.md
View File

@@ -485,13 +485,13 @@ Created main container: authors_default_kubevpn_ff34b
例如: 例如:
```shell ```shell
docker run -it --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v ~/.kube/config:/root/.kube/config --platform linux/amd64 naison/kubevpn:latest docker run -it --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v ~/.kube/config:/root/.kube/config --platform linux/amd64 ghcr.io/kubenetworks/kubevpn:latest
``` ```
```shell ```shell
➜ ~ docker run -it --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v ~/.kube/vke:/root/.kube/config --platform linux/amd64 naison/kubevpn:latest ➜ ~ docker run -it --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v ~/.kube/vke:/root/.kube/config --platform linux/amd64 ghcr.io/kubenetworks/kubevpn:latest
Unable to find image 'naison/kubevpn:latest' locally Unable to find image 'ghcr.io/kubenetworks/kubevpn:latest' locally
latest: Pulling from naison/kubevpn latest: Pulling from ghcr.io/kubenetworks/kubevpn
9c704ecd0c69: Already exists 9c704ecd0c69: Already exists
4987d0a976b5: Pull complete 4987d0a976b5: Pull complete
8aa94c4fc048: Pull complete 8aa94c4fc048: Pull complete
@@ -502,8 +502,8 @@ ca82aef6a9eb: Pull complete
1fd9534c7596: Pull complete 1fd9534c7596: Pull complete
588bd802eb9c: Pull complete 588bd802eb9c: Pull complete
Digest: sha256:368db2e0d98f6866dcefd60512960ce1310e85c24a398fea2a347905ced9507d Digest: sha256:368db2e0d98f6866dcefd60512960ce1310e85c24a398fea2a347905ced9507d
Status: Downloaded newer image for naison/kubevpn:latest Status: Downloaded newer image for ghcr.io/kubenetworks/kubevpn:latest
WARNING: image with reference naison/kubevpn was found but does not match the specified platform: wanted linux/amd64, actual: linux/arm64 WARNING: image with reference ghcr.io/kubenetworks/kubevpn was found but does not match the specified platform: wanted linux/amd64, actual: linux/arm64
root@5732124e6447:/app# kubevpn dev deployment/authors --headers user=naison --entrypoint sh root@5732124e6447:/app# kubevpn dev deployment/authors --headers user=naison --entrypoint sh
hostname is 5732124e6447 hostname is 5732124e6447
Starting connect Starting connect
@@ -601,10 +601,10 @@ exit
```text ```text
➜ ~ docker ps ➜ ~ docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
1cd576b51b66 naison/authors:latest "sh" 4 minutes ago Up 4 minutes authors_default_kubevpn_6df5f 1cd576b51b66 naison/authors:latest "sh" 4 minutes ago Up 4 minutes authors_default_kubevpn_6df5f
56a6793df82d nginx:latest "/docker-entrypoint.…" 4 minutes ago Up 4 minutes nginx_default_kubevpn_6df63 56a6793df82d nginx:latest "/docker-entrypoint.…" 4 minutes ago Up 4 minutes nginx_default_kubevpn_6df63
d0b3dab8912a naison/kubevpn:v2.0.0 "/bin/bash" 5 minutes ago Up 5 minutes upbeat_noyce d0b3dab8912a ghcr.io/kubenetworks/kubevpn:v2.0.0 "/bin/bash" 5 minutes ago Up 5 minutes upbeat_noyce
➜ ~ ➜ ~
``` ```

2
build/test.Dockerfile
View File

@@ -1,4 +1,4 @@
FROM naison/kubevpn:latest FROM ghcr.io/kubenetworks/kubevpn:latest
WORKDIR /app WORKDIR /app

2
charts/kubevpn/values.yaml
View File

@@ -5,7 +5,7 @@
replicaCount: 1 replicaCount: 1
image: image:
repository: naison/kubevpn repository: ghcr.io/kubenetworks/kubevpn
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "" tag: ""

4
pkg/config/config.go
View File

@@ -94,14 +94,14 @@ const (
var ( var (
// Image inject --ldflags -X // Image inject --ldflags -X
Image = "docker.io/naison/kubevpn:latest" Image = "ghcr.io/kubenetworks/kubevpn:latest"
Version = "latest" Version = "latest"
GitCommit = "" GitCommit = ""
// GitHubOAuthToken --ldflags -X // GitHubOAuthToken --ldflags -X
GitHubOAuthToken = "" GitHubOAuthToken = ""
OriginImage = "docker.io/naison/kubevpn:" + Version OriginImage = "ghcr.io/kubenetworks/kubevpn:" + Version
DaemonPath string DaemonPath string
HomePath string HomePath string

4
pkg/daemon/handler/ssh_test.go
View File

@@ -11,7 +11,7 @@ func TestGetVersionFromOutput(t *testing.T) {
output: `KubeVPN: CLI output: `KubeVPN: CLI
Version: v2.2.3 Version: v2.2.3
Daemon: v2.2.3 Daemon: v2.2.3
Image: docker.io/naison/kubevpn:v2.2.3 Image: ghcr.io/kubenetworks/kubevpn:v2.2.3
Branch: feat/ssh-heartbeat Branch: feat/ssh-heartbeat
Git commit: 1272e86a337d3075427ee3a1c3681d378558d133 Git commit: 1272e86a337d3075427ee3a1c3681d378558d133
Built time: 2024-03-08 17:14:49 Built time: 2024-03-08 17:14:49
@@ -23,7 +23,7 @@ func TestGetVersionFromOutput(t *testing.T) {
output: `KubeVPN: CLI output: `KubeVPN: CLI
Version: v2.2.3 Version: v2.2.3
Daemon: unknown Daemon: unknown
Image: docker.io/naison/kubevpn:v2.2.3 Image: ghcr.io/kubenetworks/kubevpn:v2.2.3
Branch: feat/ssh-heartbeat Branch: feat/ssh-heartbeat
Git commit: 1272e86a337d3075427ee3a1c3681d378558d133 Git commit: 1272e86a337d3075427ee3a1c3681d378558d133
Built time: 2024-03-08 17:14:49 Built time: 2024-03-08 17:14:49

2
pkg/test/pod.yaml
View File

@@ -8,7 +8,7 @@ spec:
terminationGracePeriodSeconds: 0 terminationGracePeriodSeconds: 0
containers: containers:
- name: traffic-test - name: traffic-test
image: naison/kubevpn:v1.1.28 image: ghcr.io/kubenetworks/kubevpn:v1.1.28
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- /bin/sh - /bin/sh

12
samples/bookinfo.yaml
View File

@@ -39,7 +39,7 @@ spec:
serviceAccountName: bookinfo-details serviceAccountName: bookinfo-details
containers: containers:
- name: details - name: details
image: docker.io/istio/examples-bookinfo-details-v1:1.16.2 image: ghcr.io/kubenetworks/examples-bookinfo-details-v1:1.16.2
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9080 - containerPort: 9080
@@ -95,7 +95,7 @@ spec:
serviceAccountName: bookinfo-ratings serviceAccountName: bookinfo-ratings
containers: containers:
- name: ratings - name: ratings
image: docker.io/istio/examples-bookinfo-ratings-v1:1.16.2 image: ghcr.io/kubenetworks/examples-bookinfo-ratings-v1:1.16.2
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9080 - containerPort: 9080
@@ -150,7 +150,7 @@ spec:
serviceAccountName: bookinfo-reviews serviceAccountName: bookinfo-reviews
containers: containers:
- name: reviews - name: reviews
image: docker.io/istio/examples-bookinfo-reviews-v1:1.16.2 image: ghcr.io/kubenetworks/examples-bookinfo-reviews-v1:1.16.2
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: LOG_DIR - name: LOG_DIR
@@ -218,7 +218,7 @@ spec:
serviceAccountName: bookinfo-productpage serviceAccountName: bookinfo-productpage
containers: containers:
- name: productpage - name: productpage
image: docker.io/istio/examples-bookinfo-productpage-v1:1.16.2 image: ghcr.io/kubenetworks/examples-bookinfo-productpage-v1:1.16.2
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9080 - containerPort: 9080
@@ -271,7 +271,7 @@ spec:
spec: spec:
containers: containers:
- name: authors - name: authors
image: docker.io/naison/authors:latest image: ghcr.io/kubenetworks/authors:latest
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 9080 - containerPort: 9080
@@ -288,7 +288,7 @@ spec:
cpu: 10m cpu: 10m
memory: 32Mi memory: 32Mi
- name: nginx - name: nginx
image: docker.io/library/nginx:latest image: ghcr.io/kubenetworks/nginx:latest
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 80 - containerPort: 80