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

use full apt package name for kubernetes #113

Merged
merged 1 commit into from
Apr 24, 2024
Merged

use full apt package name for kubernetes #113

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
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ masterCount: 3
serverComponents:
kubernetes:
# customize kubertenes version
version: 1.25.14
version: 1.25.14-1.1
docker:
# customize apt package version for docker install
# apt-cache madison docker-ce
Expand Down Expand Up @@ -105,7 +105,7 @@ ipRange: "10.0.0.0/16"
masterCount: 3
serverComponents:
kubernetes:
version: 1.25.14
version: 1.25.14-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down Expand Up @@ -139,7 +139,7 @@ ipRange: "10.0.0.0/16"
masterCount: 3
serverComponents:
kubernetes:
version: 1.26.9
version: 1.26.9-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand All @@ -154,7 +154,7 @@ ipRange: "10.0.0.0/16"
masterCount: 3
serverComponents:
kubernetes:
version: 1.27.6
version: 1.27.6-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand All @@ -169,7 +169,7 @@ ipRange: "10.0.0.0/16"
masterCount: 3
serverComponents:
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand All @@ -189,7 +189,7 @@ masterServers:
servertype: cpx21
serverComponents:
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand All @@ -210,7 +210,7 @@ serverComponents:
ubuntu:
architecture: arm
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ serverComponents:
username: hcloud-user
architecture: x86
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/v1.25.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ipRange: "10.0.0.0/16"
masterCount: 3
serverComponents:
kubernetes:
version: 1.25.14
version: 1.25.14-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/v1.26.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ipRange: "10.0.0.0/16"
masterCount: 3
serverComponents:
kubernetes:
version: 1.26.9
version: 1.26.9-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/v1.27.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ipRange: "10.0.0.0/16"
masterCount: 3
serverComponents:
kubernetes:
version: 1.27.6
version: 1.27.6-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/v1.28-amd64-eu-central-fsn1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ipRange: "10.0.0.0/16"
masterCount: 3
serverComponents:
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/v1.28-amd64-ubuntu-22.04.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ serverComponents:
ubuntu:
version: ubuntu-22.04
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/v1.28-amd64-us-east-ash.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ masterServers:
servertype: cpx21
serverComponents:
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/v1.28-arm64-ubuntu-22.04.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ serverComponents:
version: ubuntu-22.04
architecture: arm
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion e2e/configs/v1.28-arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ serverComponents:
ubuntu:
architecture: arm
kubernetes:
version: 1.28.2
version: 1.28.2-1.1
docker:
version: 5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)
containerd:
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func defaultConfig() Type {
Architecture: hcloud.ArchitectureX86, // x86 or arm
},
Kubernetes: serverComponentKubernetes{
Version: "1.28.2",
Version: "1.28.2-1.1",
},
Docker: serverComponentDocker{
Version: "5:24.0.6-1~ubuntu.$(lsb_release -rs)~$(lsb_release -cs)",
Expand Down
2 changes: 1 addition & 1 deletion scripts/common-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ EOF
sysctl -p

apt-mark unhold kubelet kubeadm kubectl
apt-get install -y kubelet=${KUBERNETES_VERSION}-1.1 kubeadm=${KUBERNETES_VERSION}-1.1 kubectl=${KUBERNETES_VERSION}-1.1
apt-get install -y kubelet=${KUBERNETES_VERSION} kubeadm=${KUBERNETES_VERSION} kubectl=${KUBERNETES_VERSION}
apt-mark hold kubelet kubeadm kubectl

# stop all services
Expand Down
Loading