Add doc to generate custom kubernetes omi

outscale · Jan 2, 2024 · b1ec87c · b1ec87c
1 parent 7006260
commit b1ec87c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
@@ -12,4 +12,5 @@
     - [How to tilt](./developers/tilt-setup.md)
     - [How to release](./developers/releases.md)
     - [How to release new kubernetes omi](./developers/kubernetes-omi-generation.md)
+    - [How to release a custom kubernetes omi](./developers/release-custom-image.md)
     - [How to migrate with new providerid](./developers/change-providerid.md) 
diff --git a/docs/src/developers/release-custom-image.md b/docs/src/developers/release-custom-image.md
@@ -35,13 +35,37 @@ Replace in Makefile (**$HOME/image-builder/images/capi/Makefile**) osc-ubuntu-20
 
 ## Select the version
 
-Please set the version you want (Replace 1.22.1 with the version you want in kubernetes) in **$HOME/image-builder/images/capi/overwrite-k8s.json**
+The kubernetes packages [repository][repository] change.
+
+You can also override other values from [kubernetes.json][kubernetes.json].
+
+### Before k8s 1.26 
+
+Please set the version you want (Replace 1.22.1 with the kubernetes version you want) in **$HOME/image-builder/images/capi/overwrite-k8s.json**
+
+```json
+{
+  "build_timestamp": "nightly",
+  "kubernetes_deb_gpg_key": "https://packages.cloud.google.com/apt/doc/apt-key.gpg",
+  "kubernetes_deb_repo": "\"https://apt.kubernetes.io/ kubernetes-xenial\"",
+  "kubernetes_deb_version": "1.22.1-00",
+  "kubernetes_rpm_gpg_key": "https://pkgs.k8s.io/core:/stable:/{{ user `kubernetes_series` }}/rpm/repodata/repomd.xml.key",
+  "kubernetes_rpm_repo": "https://pkgs.k8s.io/core:/stable:/{{ user `kubernetes_series` }}/rpm/",
+  "kubernetes_rpm_version": "1.22.1",
+  "kubernetes_semver": "v1.22.1-0",
+  "kubernetes_series": "v1.22"
+}
+```
+
+### After k8s 1.26
+
+Please set the version you want (Replace 1.22.1 with the kubernetes version you want) in **$HOME/image-builder/images/capi/overwrite-k8s.json**
 
 ```json
 {
   "build_timestamp": "nightly",
   "kubernetes_deb_version": "1.22.1-1.1",
-  "kubernetes_rpm_version": "1.22.1,
+  "kubernetes_rpm_version": "1.22.1",
   "kubernetes_semver": "v1.22.1",
   "kubernetes_series": "v1.22"
 }
@@ -61,13 +85,13 @@ First install packer
 And then:
 
 ```bash
-        export PATH=$HOME/.local/bin:$HOME/image-builder/images/capi/.local/bin:$PATH
         sudo groupadd -r packer && sudo useradd -m -s /bin/bash -r -g packer packer
         cp -rf $HOME/image-builder/images/capi /tmp
         sudo chown -R packer:packer /tmp/capi
         sudo chmod -R 777 /tmp/capi
-        sudo runuser -l packer -c "export LANG=C.UTF-8; export LC_ALL=C.UTF-8; export PACKER_LOG=1; export PATH=~packer/.local/bin/:/tmp/capi/.local/bin:$PATH; export OSC_ACCESS_KEY=${OSC_ACCESS_KEY}; export OSC_SECRET_KEY=${OSC_SECRET_KEY}; export OSC_REGION=${OSC_REGION}; export OSC_ACCOUNT_ID=${OSC_ACCOUNT_ID}; cd /tmp/capi; PACKER_VAR_FILES=overwrite-k8s.json make build-osc-all
+        sudo runuser -l packer -c "export LANG=C.UTF-8; export LC_ALL=C.UTF-8; export PACKER_LOG=1; export PATH=$HOME/.local/bin/:/tmp/capi/.local/bin:$PATH; export OSC_ACCESS_KEY=${OSC_ACCESS_KEY}; export OSC_SECRET_KEY=${OSC_SECRET_KEY}; export OSC_REGION=${OSC_REGION}; export OSC_ACCOUNT_ID=${OSC_ACCOUNT_ID}; cd /tmp/capi; PACKER_VAR_FILES=overwrite-k8s.json make build-osc-all
 ```
 
-
-
+<!-- References -->
+[repository]: https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/change-package-repository/
+[kubernetes.json]: https://github.com/kubernetes-sigs/image-builder/blob/main/images/capi/packer/config/kubernetes.json
diff --git a/docs/src/topics/omi.md b/docs/src/topics/omi.md
@@ -22,6 +22,8 @@ ubuntu:
 - ubuntu-2004-2004-kubernetes-v1.28.3-2023-10-18
 
 ## Supported Image on CloudGov:
+- ubuntu-2204-2004-kubernetes-v1.23.8-2024-01-02
+- ubuntu-2004-2004-kubernetes-v1.24.2-2024-01-02
 - ubuntu-2004-2004-kubernetes-v1.25.15-2023-10-18
 - ubuntu-2004-2004-kubernetes-v1.26.10-2023-10-18
 - ubuntu-2004-2004-kubernetes-v1.27.7-2023-10-18