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

PE-5890: nodeadm support #332

Merged
merged 6 commits into from
Jan 14, 2025
Merged

PE-5890: nodeadm support #332

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f0fbf3c
feat: nodeadm install both credential providers
TylerGillson Jan 10, 2025
60becf2
chore: Merge branch 'main' into PE-5890
TylerGillson Jan 13, 2025
7603613
fix: nodeadm workarounds
TylerGillson Jan 13, 2025
35a8b9d
chore: remove amd64 nodeadm check
TylerGillson Jan 13, 2025
f56138b
chore: clarify snap install failure & aliasing
TylerGillson Jan 13, 2025
c98017b
fix: remove extra END
TylerGillson Jan 13, 2025
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
22 changes: 20 additions & 2 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG LUET_PROJECT=luet-repo

# Spectro Cloud and Kairos tags.
ARG PE_VERSION=v4.5.11
ARG SPECTRO_LUET_VERSION=v1.3.17-alpha6
ARG SPECTRO_LUET_VERSION=v1.3.17-alpha7
ARG KAIROS_VERSION=v3.1.3
ARG K3S_FLAVOR_TAG=k3s1
ARG RKE2_FLAVOR_TAG=rke2r1
Expand All @@ -31,7 +31,7 @@ ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
ARG K3S_PROVIDER_VERSION=v4.5.1
ARG KUBEADM_PROVIDER_VERSION=v4.5.4-alpha4
ARG RKE2_PROVIDER_VERSION=v4.5.1
ARG NODEADM_PROVIDER_VERSION=v4.5.0
ARG NODEADM_PROVIDER_VERSION=v4.5.1

# Variables used in the builds. Update for ADVANCED use cases only. Modify in .arg file or via CLI arguments.
ARG OS_DISTRIBUTION
Expand Down Expand Up @@ -261,7 +261,9 @@ install-k8s:
IF [ "$K8S_DISTRIBUTION" = "kubeadm-fips" ]
RUN luet install -y container-runtime/containerd-fips --system-target /output
END

RUN luet install -y k8s/$K8S_DISTRIBUTION@$BASE_K8S_VERSION --system-target /output && luet cleanup

RUN rm -rf /output/var/cache/*
SAVE ARTIFACT /output/*

Expand Down Expand Up @@ -529,6 +531,22 @@ provider-image:
RUN touch /etc/machine-id \
&& chmod 444 /etc/machine-id

IF [ "$OS_DISTRIBUTION" = "ubuntu" ] && [ "$K8S_DISTRIBUTION" = "nodeadm" ]
RUN apt-get update -y && apt-get install -y gnupg && \
/opt/nodeadmutil/bin/nodeadm install -p iam-ra $K8S_VERSION --skip validate && \
/opt/nodeadmutil/bin/nodeadm install -p ssm $K8S_VERSION --skip validate && \
# ssm-setup-cli fails to install amazon-ssm-agent via snap after downloading the package
# due to PID 1 not being systemd, so we do it manually
find /opt/ssm -type f -name "amazon-ssm-agent.deb" -exec sudo dpkg -i {} \; && \
apt-get remove gnupg -y && apt autoremove -y && \
# nodeadm installs these bins under /usr/local/bin, which gets wiped during kairos upgrade,
# so we install to /usr/bin and provider-nodeadm symlinks to /usr/local/bin
mv /usr/local/bin/aws-iam-authenticator /usr/bin && \
mv /usr/local/bin/aws_signing_helper /usr/bin && \
# nodeadm is hardcoded to check for snap.amazon-ssm-agent.amazon-ssm-agent.service, so we alias it
cp /lib/systemd/system/amazon-ssm-agent.service /etc/systemd/system/snap.amazon-ssm-agent.amazon-ssm-agent.service
END

IF $TWO_NODE
# Install postgresql 16
IF [ "$OS_DISTRIBUTION" = "ubuntu" ] && [ "$ARCH" = "amd64" ]
Expand Down