-
Notifications
You must be signed in to change notification settings - Fork 261
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1776 from tormath1/tormath1/sysext
✨ Add `flatcar-sysext` template to use regular Flatcar images
- Loading branch information
Showing
10 changed files
with
553 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patches: | ||
| - path: patch-flatcar.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackCluster | ||
| metadata: | ||
| name: ${CLUSTER_NAME} | ||
| spec: | ||
| apiServerLoadBalancer: | ||
| $patch: delete | ||
| --- | ||
| apiVersion: controlplane.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmControlPlane | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| spec: | ||
| replicas: ${CONTROL_PLANE_MACHINE_COUNT} | ||
| kubeadmConfigSpec: | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| name: $${COREOS_OPENSTACK_HOSTNAME} | ||
| kubeletExtraArgs: | ||
| provider-id: null | ||
| initConfiguration: | ||
| nodeRegistration: | ||
| name: $${COREOS_OPENSTACK_HOSTNAME} | ||
| kubeletExtraArgs: | ||
| # Fixme(lentzi90): This is here just to override the value set in the default | ||
| # kustomization. It will be replaced with a value that works for flatcar in | ||
| # https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564 | ||
| provider-id: null | ||
| format: ignition | ||
| ignition: | ||
| containerLinuxConfig: | ||
| additionalConfig: | | ||
| storage: | ||
| links: | ||
| - path: /etc/extensions/kubernetes.raw | ||
| hard: false | ||
| target: /opt/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw | ||
| files: | ||
| - path: /etc/sysupdate.kubernetes.d/kubernetes-${KUBERNETES_VERSION%.*}.conf | ||
| mode: 0644 | ||
| contents: | ||
| remote: | ||
| url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION%.*}.conf | ||
| - path: /etc/sysupdate.d/noop.conf | ||
| mode: 0644 | ||
| contents: | ||
| remote: | ||
| url: https://github.com/flatcar/sysext-bakery/releases/download/latest/noop.conf | ||
| - path: /opt/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw | ||
| contents: | ||
| remote: | ||
| url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION}-x86-64.raw | ||
| systemd: | ||
| units: | ||
| - name: systemd-sysupdate.service | ||
| dropins: | ||
| - name: kubernetes.conf | ||
| contents: | | ||
| [Service] | ||
| ExecStartPre=/usr/bin/sh -c "readlink --canonicalize /etc/extensions/kubernetes.raw > /tmp/kubernetes" | ||
| ExecStartPre=/usr/lib/systemd/systemd-sysupdate -C kubernetes update | ||
| ExecStartPost=/usr/bin/sh -c "readlink --canonicalize /etc/extensions/kubernetes.raw > /tmp/kubernetes-new" | ||
| ExecStartPost=/usr/bin/sh -c "if ! cmp --silent /tmp/kubernetes /tmp/kubernetes-new; then touch /run/reboot-required; fi" | ||
| - name: update-engine.service | ||
| # Set this to 'false' if you want to enable Flatcar auto-update | ||
| mask: ${FLATCAR_DISABLE_AUTO_UPDATE:=true} | ||
| - name: locksmithd.service | ||
| # NOTE: To coordinate the node reboot in this context, we recommend to use Kured. | ||
| mask: true | ||
| - name: systemd-sysupdate.timer | ||
| # Set this to 'true' if you want to enable the Kubernetes auto-update. | ||
| # NOTE: Only patches version will be pulled. | ||
| enabled: false | ||
| - name: [email protected] | ||
| enabled: true | ||
| - name: kubeadm.service | ||
| enabled: true | ||
| dropins: | ||
| - name: 10-flatcar.conf | ||
| contents: | | ||
| [Unit] | ||
| Requires=containerd.service coreos-metadata.service | ||
| After=containerd.service coreos-metadata.service | ||
| [Service] | ||
| EnvironmentFile=/run/metadata/flatcar | ||
| preKubeadmCommands: | ||
| - export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*} | ||
| - envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp | ||
| - mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml | ||
| --- | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmConfigTemplate | ||
| metadata: | ||
| name: ${CLUSTER_NAME}-md-0 | ||
| spec: | ||
| template: | ||
| spec: | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| name: $${COREOS_OPENSTACK_HOSTNAME} | ||
| kubeletExtraArgs: | ||
| # Fixme(lentzi90): This is here just to override the value set in the default | ||
| # kustomization. It will be replaced with a value that works for flatcar in | ||
| # https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564 | ||
| provider-id: null | ||
| preKubeadmCommands: | ||
| - export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*} | ||
| - envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp | ||
| - mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml | ||
| format: ignition | ||
| ignition: | ||
| containerLinuxConfig: | ||
| additionalConfig: | | ||
| storage: | ||
| links: | ||
| - path: /etc/extensions/kubernetes.raw | ||
| hard: false | ||
| target: /opt/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw | ||
| files: | ||
| - path: /etc/sysupdate.kubernetes.d/kubernetes-${KUBERNETES_VERSION%.*}.conf | ||
| mode: 0644 | ||
| contents: | ||
| remote: | ||
| url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION%.*}.conf | ||
| - path: /etc/sysupdate.d/noop.conf | ||
| mode: 0644 | ||
| contents: | ||
| remote: | ||
| url: https://github.com/flatcar/sysext-bakery/releases/download/latest/noop.conf | ||
| - path: /opt/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw | ||
| contents: | ||
| remote: | ||
| url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION}-x86-64.raw | ||
| systemd: | ||
| units: | ||
| - name: systemd-sysupdate.service | ||
| dropins: | ||
| - name: kubernetes.conf | ||
| contents: | | ||
| [Service] | ||
| ExecStartPre=/usr/bin/sh -c "readlink --canonicalize /etc/extensions/kubernetes.raw > /tmp/kubernetes" | ||
| ExecStartPre=/usr/lib/systemd/systemd-sysupdate -C kubernetes update | ||
| ExecStartPost=/usr/bin/sh -c "readlink --canonicalize /etc/extensions/kubernetes.raw > /tmp/kubernetes-new" | ||
| ExecStartPost=/usr/bin/sh -c "if ! cmp --silent /tmp/kubernetes /tmp/kubernetes-new; then touch /run/reboot-required; fi" | ||
| - name: update-engine.service | ||
| # Set this to 'false' if you want to enable Flatcar auto-update | ||
| mask: ${FLATCAR_DISABLE_AUTO_UPDATE:=true} | ||
| - name: locksmithd.service | ||
| # NOTE: To coordinate the node reboot in this context, we recommend to use Kured. | ||
| mask: true | ||
| - name: systemd-sysupdate.timer | ||
| # Set this to 'true' if you want to enable the Kubernetes auto-update. | ||
| # NOTE: Only patches version will be pulled. | ||
| enabled: false | ||
| - name: [email protected] | ||
| enabled: true | ||
| - name: kubeadm.service | ||
| enabled: true | ||
| dropins: | ||
| - name: 10-flatcar.conf | ||
| contents: | | ||
| [Unit] | ||
| Requires=containerd.service coreos-metadata.service | ||
| After=containerd.service coreos-metadata.service | ||
| [Service] | ||
| EnvironmentFile=/run/metadata/flatcar | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackMachineTemplate | ||
| metadata: | ||
| name: ${CLUSTER_NAME}-md-0 | ||
| spec: | ||
| template: | ||
| spec: | ||
| image: ${FLATCAR_IMAGE_NAME} | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 | ||
| kind: OpenStackMachineTemplate | ||
| metadata: | ||
| name: ${CLUSTER_NAME}-control-plane | ||
| spec: | ||
| template: | ||
| spec: | ||
| image: ${FLATCAR_IMAGE_NAME} |
Oops, something went wrong.