Skip to content

Error on unknown hostname #551

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

Open
frelon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Error on unknown hostname #551

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
43 changes: 43 additions & 0 deletions internal/config/kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,26 @@ var _ = Describe("Kubernetes", func() {
Expect(confScript).ToNot(BeEmpty())
})

It("Defaults to a server node for a single-node cluster with no declared nodes", func() {
conf := kubernetes.Kubernetes{}

confScript, err := writeK8sConfigDeployScript(
fs,
output,
conf,
"/opt/k8s/install",
"/opt/k8s/install/install.sh",
)
Expect(err).NotTo(HaveOccurred())

b, err := fs.ReadFile(filepath.Join(output.OverlaysDir(), confScript))
Expect(err).NotTo(HaveOccurred())
Expect(string(b)).To(ContainSubstring(`NODETYPE="server"`))
Expect(string(b)).To(ContainSubstring(`CONFIGFILE="/var/lib/elemental/kubernetes/${NODETYPE}.yaml"`))
Expect(string(b)).ToNot(ContainSubstring("does not match any declared node"))
Expect(string(b)).ToNot(ContainSubstring("init.yaml"))
})

It("Uses server config for a single explicitly configured server node", func() {
conf := kubernetes.Kubernetes{
Nodes: kubernetes.Nodes{
Expand Down Expand Up @@ -390,6 +410,29 @@ var _ = Describe("Kubernetes", func() {
Expect(string(b)).To(ContainSubstring("CONFIGFILE=/var/lib/elemental/kubernetes/init.yaml"))
})

It("Aborts when the hostname matches no declared node", func() {
conf := kubernetes.Kubernetes{
Nodes: kubernetes.Nodes{
{Hostname: "server01", Type: kubernetes.NodeTypeServer},
},
}

confScript, err := writeK8sConfigDeployScript(
fs,
output,
conf,
"/opt/k8s/install",
"/opt/k8s/install/install.sh",
)
Expect(err).NotTo(HaveOccurred())

b, err := fs.ReadFile(filepath.Join(output.OverlaysDir(), confScript))
Expect(err).NotTo(HaveOccurred())
Expect(string(b)).To(ContainSubstring(`if [[ ! -v "hosts[${HOSTNAME}]" ]]; then`))
Expect(string(b)).To(ContainSubstring("does not match any declared node"))
Expect(string(b)).ToNot(ContainSubstring(":-server"))
})

It("Succeeds to configure RKE2 with additional resources and auth", func() {
additionalManifests := make(map[string][]byte)
additionalManifests["example-auth-priority.yaml"] = []byte("apiVersion: v1\nkind: Secret\nmetadata:\n namespace: kube-system\n name: example-auth\ntype: kubernetes.io/dockerconfigjson\ndata:\n .dockerconfigjson: eyJhdXRocyI6eyJleGFtcGxlLmlvIjp7InVzZXJuYW1lIjoiZXhhbXBsZS11c2VyIiwicGFzc3dvcmQiOiJleGFtcGxlLXBhc3MiLCJhdXRoIjoiWlhoaGJYQnNaUzExYzJWeU9tVjRZVzF3YkdVdGNHRnpjdz09In19fQ==\n")
Expand Down
11 changes: 10 additions & 1 deletion internal/config/templates/k8s_conf_deploy.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@ HOSTNAME=$(</etc/hostname)
[[ -z "${HOSTNAME}" ]] \
&& HOSTNAME=$(</proc/sys/kernel/hostname)

NODETYPE="${hosts[${HOSTNAME}]:-server}"
{{- if .Nodes }}
if [[ ! -v "hosts[${HOSTNAME}]" ]]; then
echo "Error: hostname '${HOSTNAME}' does not match any declared node" >&2
exit 1
fi

NODETYPE="${hosts[${HOSTNAME}]}"
{{- else }}
NODETYPE="server"
{{- end }}
CONFIGFILE="{{ .KubernetesDir }}/${NODETYPE}.yaml"
REGFILE="{{ .KubernetesDir }}/registries.yaml"

Expand Down