Skip to content

Fix the way we write configure-kube-proxy.sh #481

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
gabriel-samfira wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix the way we write configure-kube-proxy.sh #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f18d8c
Fix the way we write configure-kube-proxy.sh
gabriel-samfira Jan 16, 2025
cdb8163
Disable deep image inspection
gabriel-samfira Feb 11, 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
2 changes: 1 addition & 1 deletion hack/run-integration-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ IMAGE_NAME="${IMAGE_OS}-kube-${KUBE_TAG}"
# If `BUILD_NEW_IMAGE` is true, then we use the provided artifact, otherwise
# we download the latest promoted image.
if [[ "${BUILD_NEW_IMAGE,,}" != "true" ]]; then
curl -LO https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/${IMAGE_NAME}.qcow2
curl --fail -LO https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/${IMAGE_NAME}.qcow2
else
test -f ${IMAGE_NAME}.qcow2 || exit 1
fi
Expand Down
6 changes: 6 additions & 0 deletions hack/stack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ kubernetes_allowed_network_drivers = calico,cilium
kubernetes_default_network_driver = calico
[nova_client]
api_version = 2.15

# See bug: https://bugs.launchpad.net/nova/+bug/2091114
# Needs discussion with Flatcar team.
[[post-config|/etc/nova/nova-cpu.conf]]
[workarounds]
disable_deep_image_inspection = true
EOF

# Start DevStack deployment
Expand Down
68 changes: 51 additions & 17 deletions magnum_cluster_api/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,15 @@ def get_object(self) -> objects.ClusterClass:
},
},
},
{
"name": "configureKubeProxy",
"required": True,
"schema": {
"openAPIV3Schema": {
"type": "string",
},
},
},
{
"name": "fixedSubnetId",
"required": True,
Expand Down Expand Up @@ -1645,27 +1654,41 @@ def get_object(self) -> objects.ClusterClass:
{
"op": "add",
"path": "/spec/template/spec/kubeadmConfigSpec/ignition",
"value": {
"containerLinuxConfig": {
"additionalConfig": textwrap.dedent(
"""\
"valueFrom": {
"template": textwrap.dedent(
"""\
containerLinuxConfig:
additionalConfig: |
systemd:
units:
- name: [email protected]
enabled: true
- name: kubeadm.service
enabled: true
dropins:
- name: 10-flatcar.conf
units:
- name: write-configure-kube-proxy.service
enabled: true
contents: |
[Unit]
Requires=containerd.service coreos-metadata.service
After=containerd.service coreos-metadata.service
Description=Write configure-kube-proxy.sh
Requires=coreos-metadata.service
After=coreos-metadata.service
[Service]
EnvironmentFile=/run/metadata/flatcar
""" # noqa: E501
),
},
Type=oneshot
ExecStart=/usr/bin/mkdir -p /run/kubeadm
ExecStart=/bin/bash -c 'echo {{ .configureKubeProxy }} | /usr/bin/base64 -d > /run/kubeadm/configure-kube-proxy.sh'
ExecStart=/bin/chmod +x /run/kubeadm/configure-kube-proxy.sh
[Install]
WantedBy=multi-user.target
- name: [email protected]
enabled: true
- name: kubeadm.service
enabled: true
dropins:
- name: 10-flatcar.conf
contents: |
[Unit]
Requires=containerd.service coreos-metadata.service write-configure-kube-proxy.service
After=containerd.service coreos-metadata.service write-configure-kube-proxy.service
[Service]
EnvironmentFile=/run/metadata/flatcar
""" # noqa: E501
),
},
},
{
Expand Down Expand Up @@ -2801,6 +2824,17 @@ def get_object(self) -> objects.Cluster:
)
or "",
},
{
"name": "configureKubeProxy",
"value": base64.encode_as_text(
importlib.resources.files(
"magnum_cluster_api.files.run.kubeadm"
)
.joinpath("configure-kube-proxy.sh")
.read_text()
)
or "",
},
{
"name": "fixedSubnetId",
"value": neutron.get_fixed_subnet_id(
Expand Down