diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index 49dbcc63..2028768d 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -16,10 +16,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.0 +version: 0.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.19.0" +appVersion: "1.19.4" diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index 31382c74..19aebd00 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -74,6 +74,21 @@ metadata: spec: template: spec: + diskSetup: + filesystems: + - device: /dev/vdb + filesystem: xfs + label: containerd + partition: "none" + - device: /dev/vdc + filesystem: xfs + label: kubelet + partition: "none" + mounts: + - ["LABEL=containerd", "/var/lib/containerd"] + - ["LABEL=kubelet", "/var/lib/kubelet"] + preKubeadmCommands: + - sed -i 's|root:x:|root::|' /etc/passwd joinConfiguration: nodeRegistration: kubeletExtraArgs: {} @@ -108,17 +123,32 @@ spec: sockets: 1 devices: disks: - - disk: + - name: system + disk: bus: virtio - name: containervolume + pciAddress: 0000:07:00.0 + - name: containerd + disk: + bus: virtio + pciAddress: 0000:08:00.0 + - name: kubelet + disk: + bus: virtio + pciAddress: 0000:09:00.0 networkInterfaceMultiqueue: true memory: guest: {{ $group.resources.memory }} evictionStrategy: External volumes: - - containerDisk: + - name: system + containerDisk: image: "{{ $.Files.Get "images/ubuntu-container-disk.tag" | trim }}@{{ index ($.Files.Get "images/ubuntu-container-disk.json" | fromJson) "containerimage.digest" }}" - name: containervolume + - name: containerd + emptyDisk: + capacity: 20Gi + - name: kubelet + emptyDisk: + capacity: 20Gi --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineDeployment diff --git a/packages/apps/versions_map b/packages/apps/versions_map index c7288590..e0b4f8b4 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -5,7 +5,8 @@ http-cache 0.2.0 HEAD kafka 0.1.0 760f86d2 kafka 0.2.0 HEAD kubernetes 0.1.0 f642698 -kubernetes 0.2.0 HEAD +kubernetes 0.2.0 7cd7de73 +kubernetes 0.3.0 HEAD mysql 0.1.0 f642698 mysql 0.2.0 8b975ff0 mysql 0.3.0 HEAD