Skip to content

update defaults of the k8s environment #104

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

Merged
tariq1890 merged 1 commit into from
Jul 9, 2024
Merged

update defaults of the k8s environment #104

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
3 changes: 2 additions & 1 deletion examples/v1alpha1_environment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ spec:
kubernetes:
install: true
installer: kubeadm
version: v1.28.5
version: v1.30.2
crictlVersion: v1.30.0
22 changes: 16 additions & 6 deletions pkg/provisioner/templates/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const KubeadmTemplate = `
: ${CALICO_VERSION:={{.CalicoVersion}}}
: ${CRICTL_VERSION:={{.CrictlVersion}}}
: ${ARCH:={{.Arch}}} # amd64, arm64, ppc64le, s390x
: ${KUBELET_RELEASE_VERSION:={{.KubeletReleaseVersion}}} # v0.16.2
: ${KUBELET_RELEASE_VERSION:={{.KubeletReleaseVersion}}} # v0.17.1

# Disable swap
# see https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#before-you-begin
Expand Down Expand Up @@ -166,6 +166,16 @@ echo "you can now access the cluster with:"
echo "ssh -i <your-private-key> ubuntu@${INSTANCE_ENDPOINT_HOST}"
`

// Default Versions
const (
defaultArch = "amd64"
defaultKubernetesVersion = "v1.30.2"
defaultKubeletReleaseVersion = "v0.17.1"
defaultCNIPluginsVersion = "v1.5.1"
defaultCRIVersion = "v1.30.0"
defaultCalicoVersion = "v3.27.4"
)

type Kubernetes struct {
Version string
Installer string
Expand All @@ -188,12 +198,12 @@ func NewKubernetes(env v1alpha1.Environment) (*Kubernetes, error) {
// if not, set the default version
if !strings.HasPrefix(env.Spec.Kubernetes.KubernetesVersion, "v") && env.Spec.Kubernetes.KubernetesInstaller != "microk8s" {
fmt.Printf("Kubernetes version %s is not in the format of vX.Y.Z, setting default version v1.27.9\n", env.Spec.Kubernetes.KubernetesVersion)
kubernetes.Version = "v1.27.9"
kubernetes.Version = defaultKubernetesVersion
}
if env.Spec.Kubernetes.KubeletReleaseVersion != "" {
kubernetes.KubeletReleaseVersion = env.Spec.Kubernetes.KubeletReleaseVersion
} else {
kubernetes.KubeletReleaseVersion = "v0.16.2"
kubernetes.KubeletReleaseVersion = defaultKubeletReleaseVersion
}
if env.Spec.Kubernetes.Arch != "" {
kubernetes.Arch = env.Spec.Kubernetes.Arch
Expand All @@ -203,17 +213,17 @@ func NewKubernetes(env v1alpha1.Environment) (*Kubernetes, error) {
if env.Spec.Kubernetes.CniPluginsVersion != "" {
kubernetes.CniPluginsVersion = env.Spec.Kubernetes.CniPluginsVersion
} else {
kubernetes.CniPluginsVersion = "v0.8.7"
kubernetes.CniPluginsVersion = defaultCNIPluginsVersion
}
if env.Spec.Kubernetes.CalicoVersion != "" {
kubernetes.CalicoVersion = env.Spec.Kubernetes.CalicoVersion
} else {
kubernetes.CalicoVersion = "v3.27.0"
kubernetes.CalicoVersion = defaultCalicoVersion
}
if env.Spec.Kubernetes.CrictlVersion != "" {
kubernetes.CrictlVersion = env.Spec.Kubernetes.CrictlVersion
} else {
kubernetes.CrictlVersion = "v1.22.0"
kubernetes.CrictlVersion = defaultCRIVersion
}
if env.Spec.Kubernetes.K8sEndpointHost != "" {
kubernetes.K8sEndpointHost = env.Spec.Kubernetes.K8sEndpointHost
Expand Down