Compare commits
10 Commits
main
...
tst-findin
Author | SHA1 | Date | |
---|---|---|---|
88f1ef5a87 | |||
24aaf55e4b | |||
297fb39202 | |||
13b8e4c43d | |||
cc0f2bd683 | |||
619923b2d4 | |||
19628c3080 | |||
e6c366a5be | |||
12ae24f950 | |||
b94b7a2916 |
11
.drone.yml
11
.drone.yml
@ -6,9 +6,6 @@ volumes:
|
|||||||
- name: output
|
- name: output
|
||||||
claim:
|
claim:
|
||||||
name: flexvolsmb-drone-output
|
name: flexvolsmb-drone-output
|
||||||
- name: scratch
|
|
||||||
claim:
|
|
||||||
name: flexvolsmb-drone-scratch
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Debugging information
|
- name: Debugging information
|
||||||
@ -22,19 +19,13 @@ steps:
|
|||||||
image: bv11-cr01.bessems.eu/library/packer-extended
|
image: bv11-cr01.bessems.eu/library/packer-extended
|
||||||
pull: always
|
pull: always
|
||||||
commands:
|
commands:
|
||||||
- |
|
|
||||||
apt-get update
|
|
||||||
- |
|
|
||||||
apt-get install -y \
|
|
||||||
curl \
|
|
||||||
make
|
|
||||||
- |
|
- |
|
||||||
jq '.password="'"$VSPHERE_PASSWORD"'"' ./packer/ova/vsphere.json > /tmp/vsphere.json && \
|
jq '.password="'"$VSPHERE_PASSWORD"'"' ./packer/ova/vsphere.json > /tmp/vsphere.json && \
|
||||||
mv /tmp/vsphere.json ./packer/ova/vsphere.json
|
mv /tmp/vsphere.json ./packer/ova/vsphere.json
|
||||||
- |
|
- |
|
||||||
make deps-ova
|
make deps-ova
|
||||||
- |
|
- |
|
||||||
make build-node-ova-vsphere-ubuntu-2004
|
make build-node-ova-vsphere-ubuntu-2204
|
||||||
- |
|
- |
|
||||||
mv -fv ./output/**/*.ova /output
|
mv -fv ./output/**/*.ova /output
|
||||||
environment:
|
environment:
|
||||||
|
2
Makefile
2
Makefile
@ -93,7 +93,7 @@ deps-gce:
|
|||||||
deps-ova: ## Installs/checks dependencies for OVA builds
|
deps-ova: ## Installs/checks dependencies for OVA builds
|
||||||
deps-ova:
|
deps-ova:
|
||||||
hack/ensure-ansible.sh
|
hack/ensure-ansible.sh
|
||||||
hack/ensure-ansible-windows.sh
|
: hack/ensure-ansible-windows.sh
|
||||||
hack/ensure-packer.sh
|
hack/ensure-packer.sh
|
||||||
hack/ensure-goss.sh
|
hack/ensure-goss.sh
|
||||||
hack/ensure-ovftool.sh
|
hack/ensure-ovftool.sh
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
- name: Override cloud-init datasource list
|
|
||||||
ansible.builtin.copy:
|
|
||||||
dest: /etc/cloud/cloud.cfg.d/90_dpkg.cfg
|
|
||||||
content: |
|
|
||||||
# To update this file, run dpkg-reconfigure cloud-init
|
|
||||||
datasource_list: [ VMware, None ]
|
|
@ -1,11 +1,11 @@
|
|||||||
apiVersion: kubeadm.k8s.io/v1beta2
|
apiVersion: kubeadm.k8s.io/v1beta3
|
||||||
kind: ClusterConfiguration
|
kind: ClusterConfiguration
|
||||||
imageRepository: {{ kubernetes_container_registry }}
|
imageRepository: {{ kubernetes_container_registry }}
|
||||||
kubernetesVersion: {{ kubernetes_semver }}
|
kubernetesVersion: {{ kubernetes_semver }}
|
||||||
dns:
|
dns:
|
||||||
imageRepository: {{ kubernetes_container_registry }}/coredns
|
imageRepository: {{ kubernetes_container_registry }}/coredns
|
||||||
---
|
---
|
||||||
apiVersion: kubeadm.k8s.io/v1beta2
|
apiVersion: kubeadm.k8s.io/v1beta3
|
||||||
kind: InitConfiguration
|
kind: InitConfiguration
|
||||||
nodeRegistration:
|
nodeRegistration:
|
||||||
criSocket: {{ containerd_cri_socket }}
|
criSocket: {{ containerd_cri_socket }}
|
||||||
|
@ -43,3 +43,11 @@
|
|||||||
- { src: files/etc/networkd-dispatcher/routable.d/20-chrony.j2, dest: /etc/networkd-dispatcher/routable.d/20-chrony }
|
- { src: files/etc/networkd-dispatcher/routable.d/20-chrony.j2, dest: /etc/networkd-dispatcher/routable.d/20-chrony }
|
||||||
- { src: files/etc/networkd-dispatcher/off.d/20-chrony.j2, dest: /etc/networkd-dispatcher/off.d/20-chrony }
|
- { src: files/etc/networkd-dispatcher/off.d/20-chrony.j2, dest: /etc/networkd-dispatcher/off.d/20-chrony }
|
||||||
- { src: files/etc/networkd-dispatcher/no-carrier.d/20-chrony.j2, dest: /etc/networkd-dispatcher/no-carrier.d/20-chrony }
|
- { src: files/etc/networkd-dispatcher/no-carrier.d/20-chrony.j2, dest: /etc/networkd-dispatcher/no-carrier.d/20-chrony }
|
||||||
|
|
||||||
|
- name: Create cloud-init datasource config file
|
||||||
|
copy:
|
||||||
|
dest: /etc/cloud/ds-identify.cfg
|
||||||
|
force: true
|
||||||
|
content: |
|
||||||
|
datasource: VMware
|
||||||
|
when: ansible_distribution_version is version('22.04', '>=')
|
||||||
|
@ -93,3 +93,15 @@
|
|||||||
file:
|
file:
|
||||||
state: absent
|
state: absent
|
||||||
path: /etc/udev/rules.d/70-persistent-net.rules
|
path: /etc/udev/rules.d/70-persistent-net.rules
|
||||||
|
|
||||||
|
- name: Remove subiquity disable cloud-init networking config
|
||||||
|
file:
|
||||||
|
path: /etc/cloud/cloud.cfg.d/subiquity-disable-cloudinit-networking.cfg
|
||||||
|
state: absent
|
||||||
|
when: ansible_distribution_version is version('22.04', '>=')
|
||||||
|
|
||||||
|
- name: Remove 99-installer.cfg which sets the cloud-init datasource to None
|
||||||
|
file:
|
||||||
|
path: /etc/cloud/cloud.cfg.d/99-installer.cfg
|
||||||
|
state: absent
|
||||||
|
when: ansible_distribution_version is version('22.04', '>=')
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
"additional_executables": "false",
|
"additional_executables": "false",
|
||||||
"additional_executables_destination_path": "",
|
"additional_executables_destination_path": "",
|
||||||
"additional_executables_list": "",
|
"additional_executables_list": "",
|
||||||
"additional_registry_images": "false",
|
"additional_registry_images": "true",
|
||||||
"additional_registry_images_list": "",
|
"additional_registry_images_list": "ghcr.io/kube-vip/kube-vip:v0.5.5",
|
||||||
"additional_url_images": "false",
|
"additional_url_images": "false",
|
||||||
"additional_url_images_list": "",
|
"additional_url_images_list": "",
|
||||||
"load_additional_components": "false"
|
"load_additional_components": "false"
|
||||||
|
@ -9,9 +9,9 @@
|
|||||||
"http_proxy": "",
|
"http_proxy": "",
|
||||||
"https_proxy": "",
|
"https_proxy": "",
|
||||||
"no_proxy": "",
|
"no_proxy": "",
|
||||||
"node_custom_roles_post": "custom",
|
"node_custom_roles_post": "",
|
||||||
"node_custom_roles_pre": "",
|
"node_custom_roles_pre": "",
|
||||||
"pause_image": "registry.k8s.io/pause:3.6",
|
"pause_image": "registry.k8s.io/pause:3.9",
|
||||||
"pip_conf_file": "",
|
"pip_conf_file": "",
|
||||||
"redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm",
|
"redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm",
|
||||||
"reenable_public_repos": "true",
|
"reenable_public_repos": "true",
|
||||||
|
@ -8,16 +8,16 @@
|
|||||||
"kubernetes_container_registry": "registry.k8s.io",
|
"kubernetes_container_registry": "registry.k8s.io",
|
||||||
"kubernetes_deb_gpg_key": "https://packages.cloud.google.com/apt/doc/apt-key.gpg",
|
"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_repo": "\"https://apt.kubernetes.io/ kubernetes-xenial\"",
|
||||||
"kubernetes_deb_version": "1.23.15-00",
|
"kubernetes_deb_version": "1.27.1-00",
|
||||||
"kubernetes_http_source": "https://dl.k8s.io/release",
|
"kubernetes_http_source": "https://dl.k8s.io/release",
|
||||||
"kubernetes_load_additional_imgs": "false",
|
"kubernetes_load_additional_imgs": "false",
|
||||||
"kubernetes_rpm_gpg_check": "True",
|
"kubernetes_rpm_gpg_check": "True",
|
||||||
"kubernetes_rpm_gpg_key": "\"https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\"",
|
"kubernetes_rpm_gpg_key": "\"https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\"",
|
||||||
"kubernetes_rpm_repo": "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{user `kubernetes_rpm_repo_arch`}}",
|
"kubernetes_rpm_repo": "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{user `kubernetes_rpm_repo_arch`}}",
|
||||||
"kubernetes_rpm_repo_arch": "x86_64",
|
"kubernetes_rpm_repo_arch": "x86_64",
|
||||||
"kubernetes_rpm_version": "1.23.15-0",
|
"kubernetes_rpm_version": "1.27.1-0",
|
||||||
"kubernetes_semver": "v1.23.15",
|
"kubernetes_semver": "v1.27.1",
|
||||||
"kubernetes_series": "v1.23",
|
"kubernetes_series": "v1.27",
|
||||||
"kubernetes_source_type": "pkg",
|
"kubernetes_source_type": "pkg",
|
||||||
"systemd_prefix": "/usr/lib/systemd",
|
"systemd_prefix": "/usr/lib/systemd",
|
||||||
"sysusr_prefix": "/usr",
|
"sysusr_prefix": "/usr",
|
||||||
|
@ -221,7 +221,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"password": "{{user `password`}}",
|
"password": "{{user `password`}}",
|
||||||
"shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c '{{user `shutdown_command`}}'",
|
"shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'usermod -L {{user `ssh_username`}} && {{user `shutdown_command`}}'",
|
||||||
"ssh_password": "{{user `ssh_password`}}",
|
"ssh_password": "{{user `ssh_password`}}",
|
||||||
"ssh_timeout": "4h",
|
"ssh_timeout": "4h",
|
||||||
"ssh_username": "{{user `ssh_username`}}",
|
"ssh_username": "{{user `ssh_username`}}",
|
||||||
|
@ -8,9 +8,9 @@
|
|||||||
"distro_name": "ubuntu",
|
"distro_name": "ubuntu",
|
||||||
"distro_version": "22.04",
|
"distro_version": "22.04",
|
||||||
"guest_os_type": "ubuntu-64",
|
"guest_os_type": "ubuntu-64",
|
||||||
"iso_checksum": "10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb",
|
"iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931",
|
||||||
"iso_checksum_type": "sha256",
|
"iso_checksum_type": "sha256",
|
||||||
"iso_url": "https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso",
|
"iso_url": "https://releases.ubuntu.com/jammy/ubuntu-22.04.2-live-server-amd64.iso",
|
||||||
"os_display_name": "Ubuntu 22.04",
|
"os_display_name": "Ubuntu 22.04",
|
||||||
"shutdown_command": "shutdown -P now",
|
"shutdown_command": "shutdown -P now",
|
||||||
"vsphere_guest_os_type": "ubuntu64Guest"
|
"vsphere_guest_os_type": "ubuntu64Guest"
|
||||||
|
Loading…
Reference in New Issue
Block a user