Skip to content

Commit

Permalink
Update Kubernetes v1.30.0 [sync git]
Browse files Browse the repository at this point in the history
Signed-off-by: Kang Huaishuai <[email protected]>
  • Loading branch information
khs1994 committed Jul 16, 2024
1 parent 7108334 commit 51d9fc3
Show file tree
Hide file tree
Showing 24 changed files with 41 additions and 34 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ LNMP_LIBRARY_NS=library
# LNMP_LIBRARY_NS=library-mirror
# LNMP_LIBRARY_NS=ccr.ccs.tencentyun.com/library-mirror
# LNMP_LIBRARY_NS=pcit-docker.pkg.coding.net/khs1994-docker/library
# LNMP_LIBRARY_NS=hub.atomgit.com

## [PHP 项目文件路径(容器内路径)(绝对路径)]

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

### Changes:

* Switch **PHP** to `8.3.0`
* Kuberentes `v1.30.0`

### Updates:

* [PHP `8.3.0` `8.2.13` `8.1.26`](https://www.php.net/ChangeLog-8.php#8.1.26)
1 change: 0 additions & 1 deletion dockerfile/php/nightly/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ ENV PHPIZE_DEPS \
file \
g++ \
gcc \
libc-dev \
make \
pkgconf \
re2c
Expand Down
1 change: 0 additions & 1 deletion dockerfile/php/nightly/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ ENV PHPIZE_DEPS \
file \
g++ \
gcc \
libc-dev \
make \
pkgconf \
re2c
Expand Down
5 changes: 5 additions & 0 deletions docs/windows/ssh.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
```

## 离线安装

* https://learn.microsoft.com/zh-cn/windows-server/administration/openssh/openssh_server_configuration
* https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH

## 启动

```powershell
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/.env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KUBERNETES_VERSION=1.29.0
KUBERNETES_VERSION=1.30.0

# KUBERNETES_VERSION=

Expand Down
22 changes: 11 additions & 11 deletions kubernetes/.github/workflows/setup-k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ jobs:
# next version
- os: ubuntu
dist: 20.04
CI_KUBERNETES_VERSION: 1.30.0-alpha.2
CI_KUBERNETES_VERSION: 1.31.0-alpha.3
LNMP_K8S_GET: --url
GENERATE_CLI_HELP: "true"

# current stable version
- os: ubuntu
dist: 20.04
CI_KUBERNETES_VERSION: 1.29.0
CI_KUBERNETES_VERSION: 1.30.0
LNMP_K8S_LOCAL_INSTALL_OPTIONS: --crio
K8S_IMAGE_NS: khs1994
K8S_IMAGE_REGISTRY: useccr.ccs.tencentyun.com
UPLOAD_TO_CODING: "true"
- os: ubuntu
dist: 20.04
CI_KUBERNETES_VERSION: 1.29.0
CI_KUBERNETES_VERSION: 1.30.0
LNMP_K8S_GET: --url

GENERATE_CLI_HELP: "true"
Expand All @@ -69,12 +69,12 @@ jobs:
# ipv6
# - os: ubuntu
# dist: 20.04
# CI_KUBERNETES_VERSION: 1.29.0
# CI_KUBERNETES_VERSION: 1.30.0
# LNMP_K8S_GET: --url
# IPV6: "true"
- os: ubuntu
dist: 20.04
CI_KUBERNETES_VERSION: 1.29.0
CI_KUBERNETES_VERSION: 1.30.0
LNMP_K8S_GET: --url
CNI_CALICO_EBPF: 'true'
# v1.24.0+ not support docker
Expand All @@ -84,21 +84,21 @@ jobs:
# LNMP_K8S_LOCAL_INSTALL_OPTIONS: --docker
- os: ubuntu
dist: 20.04
CI_KUBERNETES_VERSION: 1.29.0
CI_KUBERNETES_VERSION: 1.30.0
LNMP_K8S_GET: --url
K8S_ROOT: /opt/k8s-custom
# old version
- os: ubuntu
dist: 20.04
CI_KUBERNETES_VERSION: 1.28.6
CI_KUBERNETES_VERSION: 1.29.6
LNMP_K8S_GET: --url
- os: ubuntu
dist: 20.04
CI_KUBERNETES_VERSION: 1.27.10
CI_KUBERNETES_VERSION: 1.28.11
LNMP_K8S_GET: --url
- os: ubuntu
dist: 20.04
CI_KUBERNETES_VERSION: 1.26.13
CI_KUBERNETES_VERSION: 1.27.15
LNMP_K8S_GET: --url
fail-fast: false
steps:
Expand Down Expand Up @@ -516,7 +516,7 @@ jobs:
export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH
BASE_BRANCH=master
# BASE_BRANCH=v1.25.0-config
if ! [ $CI_KUBERNETES_VERSION = '1.29.0' -a "$GENERATE_CLI_HELP" = "true" ];then
if ! [ $CI_KUBERNETES_VERSION = '1.30.0' -a "$GENERATE_CLI_HELP" = "true" ];then
exit 0
fi

Expand Down Expand Up @@ -545,7 +545,7 @@ jobs:
BASE_BRANCH=v1.29.0-alpha.1-config
BASE_BRANCH=master
# BASE_BRANCH=v1.28.0-config
if [ $CI_KUBERNETES_VERSION != '1.30.0-alpha.2' ];then
if [ $CI_KUBERNETES_VERSION != '1.31.0-alpha.3' ];then
exit 0
fi

Expand Down
4 changes: 2 additions & 2 deletions kubernetes/bin/lwpm.ps1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$env:LWPM_DOCKER_REGISTRY="mirror.ccs.tencentyun.com"

./lnmp/windows/lnmp-windows-pm.ps1 add `
kubernetes-node@1.29.0 `
kubernetes-node@1.30.0 `
--all-platform

$env:LWPM_DOCKER_REGISTRY=$env:LWPM_DOCKER_REGISTRY_MIRROR

./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.29.0
./lnmp/windows/lnmp-windows-pm.ps1 push kubernetes-node@1.30.0
2 changes: 1 addition & 1 deletion kubernetes/cfssl/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM --platform=${TARGETPLATFORM} alpine:edge as tool

ENV KUBECTL_VERSION=v1.29.0
ENV KUBECTL_VERSION=v1.30.0

ARG TARGETARCH

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/docker-compose.bump.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
k8s_apiserver:
image: registry.k8s.io/kube-apiserver:v1.29.0
image: registry.k8s.io/kube-apiserver:v1.30.0

etcd:
image: quay.io/coreos/etcd:v3.5.8
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/kubernetes-release/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.16

ENV KUBERNETES_VERSION=v1.29.0
ENV KUBERNETES_VERSION=v1.30.0

# ENV KUBERNETES_VERSION=

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/kubernetes-release/Dockerfile.buildx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

FROM alpine

ARG KUBERNETES_VERSION=v1.29.0
ARG KUBERNETES_VERSION=v1.30.0

# ARG KUBERNETES_VERSION=

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/kubernetes-release/release/stable.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.29.0
v1.30.0
2 changes: 1 addition & 1 deletion kubernetes/rpi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $ foreach($item in $items){scp ./wsl2/certs/$item [email protected]:/home/pi/ln

$ $items="kube-proxy","kubelet","kubectl","kubeadm","mounter"

$ foreach($item in $items){scp ./kubernetes-release/release/v1.29.0-linux-arm64/kubernetes/server/bin/$item [email protected]:/home/pi/}
$ foreach($item in $items){scp ./kubernetes-release/release/v1.30.0-linux-arm64/kubernetes/server/bin/$item [email protected]:/home/pi/}
```

## 登录到树莓派
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/wsl2/00-README.NODE.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ $ ./wsl2/bin/kube-check

$ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION"
$ $env:K8S_ROOT="/wsl/wsl-k8s-data/k8s"
# 请将 1.29.0 替换为实际的 k8s 版本号
$ $env:KUBERNETES_VERSION='1.29.0'
# 请将 1.30.0 替换为实际的 k8s 版本号
$ $env:KUBERNETES_VERSION='1.30.0'

$ wsl -d wsl-k8s -- sh -xc 'mkdir -p ${K8S_ROOT:?err}/bin'
$ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/{kube-proxy,kubectl,kubelet,kubeadm,mounter} ${K8S_ROOT:?err}/bin'
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/wsl2/00-README.SERVER.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ $ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.yaml
$ wsl -d wsl-k8s -- sh -xc 'cp ${K8S_ROOT:?err}/etc/kubernetes/pki/*.kubeconfig ${K8S_ROOT:?err}/etc/kubernetes'
$ $env:WSLENV="K8S_ROOT/u:KUBERNETES_VERSION"
# 请将 1.29.0 替换为实际的 k8s 版本号
$ $env:KUBERNETES_VERSION='1.29.0'
# 请将 1.30.0 替换为实际的 k8s 版本号
$ $env:KUBERNETES_VERSION='1.30.0'
$ wsl -d wsl-k8s -- bash -xc 'cp -a kubernetes-release/release/v${KUBERNETES_VERSION}-linux-amd64/kubernetes/server/bin/kube-{apiserver,controller-manager,scheduler} ${K8S_ROOT:?err}/bin'
```
Expand Down
2 changes: 1 addition & 1 deletion windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
},
"url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz",
"url-mirror": "https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz",
"version": "1.29.0"
"version": "1.30.0"
}
2 changes: 1 addition & 1 deletion windows/lnmp-windows-pm-repo/k8s/crictl/lwpm.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: crictl
version: 1.29.0
version: 1.30.0
url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz"
url-mirror: https://${env:GITHUB_MIRROR}/kubernetes-sigs/cri-tools/releases/download/v${VERSION}/crictl-v${VERSION}-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz
command: crictl
Expand Down
2 changes: 1 addition & 1 deletion windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
"dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-client-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n",
"install": "curl -L `\n https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/windows/amd64/kubectl.exe `\n -o C:/bin/kubectl.exe\n"
},
"version": "1.29.0"
"version": "1.30.0"
}
2 changes: 1 addition & 1 deletion windows/lnmp-windows-pm-repo/k8s/kubectl/lwpm.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: kubectl
version: 1.29.0
version: 1.30.0
# url: "https://mirror.azure.cn/kubernetes/kubectl/v${VERSION}/bin/linux/amd64/kubectl"
# url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-client-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz"
scripts:
Expand Down
2 changes: 1 addition & 1 deletion windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n"
},
"url": "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz",
"version": "1.29.0"
"version": "1.30.0"
}
2 changes: 1 addition & 1 deletion windows/lnmp-windows-pm-repo/k8s/kubernetes-node/lwpm.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: kubernetes-node
version: 1.29.0
version: 1.30.0
url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-node-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz"
scripts:
platform-reqs: if($IsMacOS){echo $False}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
"dist": "_mkdir $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}\n\ncurl -L `\n $url `\n -o $env:LWPM_PKG_ROOT/dist/${env:lwpm_os}-${env:lwpm_architecture}/$filename\n"
},
"url": "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz",
"version": "1.29.0"
"version": "1.30.0"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: kubernetes-server
version: 1.29.0
version: 1.30.0
url: "https://storage.googleapis.com/kubernetes-release/release/v${VERSION}/kubernetes-server-${env:lwpm_os}-${env:lwpm_architecture}.tar.gz"
scripts:
platform-reqs: if(!$IsLinux){echo $False}
Expand Down

0 comments on commit 51d9fc3

Please sign in to comment.