Compare commits
No commits in common. "Redhat8-K8s1.25x-CAPV1.6.0" and "main" have entirely different histories.
Redhat8-K8
...
main
23
.drone.yml
23
.drone.yml
@ -22,31 +22,26 @@ steps:
|
||||
image: bv11-cr01.bessems.eu/library/packer-extended
|
||||
pull: always
|
||||
commands:
|
||||
- |
|
||||
apt-get update
|
||||
- |
|
||||
apt-get install -y \
|
||||
curl \
|
||||
make
|
||||
- |
|
||||
jq '.password="'"$VSPHERE_PASSWORD"'"' ./packer/ova/vsphere.json > /tmp/vsphere.json && \
|
||||
mv /tmp/vsphere.json ./packer/ova/vsphere.json
|
||||
jq '.repo_username="'"$REPO_USERNAME"'" | .repo_password="'"$REPO_PASSWORD"'"' --null-input > /tmp/extra_vars.json
|
||||
- |
|
||||
make deps-ova
|
||||
- |
|
||||
make build-node-ova-vsphere-rhel-8
|
||||
make build-node-ova-vsphere-ubuntu-2004
|
||||
- |
|
||||
mv -fv ./output/**/*.ova /output
|
||||
environment:
|
||||
IB_OVFTOOL: true
|
||||
IB_OVFTOOL_ARGS: --allowExtraConfig
|
||||
PACKER_FLAGS: -on-error=ask
|
||||
PACKER_VAR_FILES: /tmp/extra_vars.json
|
||||
REPO_USERNAME:
|
||||
from_secret: repo_username
|
||||
REPO_PASSWORD:
|
||||
from_secret: repo_password
|
||||
RHSM_USER:
|
||||
from_secret: rhsm_username
|
||||
RHSM_PASS:
|
||||
from_secret: rhsm_password
|
||||
VSPHERE_PASSWORD:
|
||||
from_secret: vsphere_password
|
||||
IB_OVFTOOL: true
|
||||
IB_OVFTOOL_ARGS: --allowExtraConfig
|
||||
volumes:
|
||||
- name: output
|
||||
path: /output
|
||||
|
||||
6
Makefile
6
Makefile
@ -81,7 +81,7 @@ deps-osc:
|
||||
hack/ensure-packer.sh
|
||||
hack/ensure-goss.sh
|
||||
packer plugins install github.com/outscale/outscale
|
||||
|
||||
|
||||
.PHONY: deps-gce
|
||||
deps-gce: ## Installs/checks dependencies for GCE builds
|
||||
deps-gce:
|
||||
@ -93,7 +93,7 @@ deps-gce:
|
||||
deps-ova: ## Installs/checks dependencies for OVA builds
|
||||
deps-ova:
|
||||
hack/ensure-ansible.sh
|
||||
: hack/ensure-ansible-windows.sh
|
||||
hack/ensure-ansible-windows.sh
|
||||
hack/ensure-packer.sh
|
||||
hack/ensure-goss.sh
|
||||
hack/ensure-ovftool.sh
|
||||
@ -494,7 +494,7 @@ $(OCI_VALIDATE_TARGETS): deps-oci
|
||||
packer validate $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/oci/$(subst validate-oci-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/oci/packer.json
|
||||
|
||||
.PHONY: $(OSC_BUILD_TARGETS)
|
||||
$(OSC_BUILD_TARGETS): deps-osc
|
||||
$(OSC_BUILD_TARGETS): deps-osc
|
||||
packer build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/outscale/$(subst build-osc-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/outscale/packer.json
|
||||
|
||||
.PHONY: $(OSC_VALIDATE_TARGETS)
|
||||
|
||||
6
ansible/roles/custom/tasks/main.yml
Normal file
6
ansible/roles/custom/tasks/main.yml
Normal file
@ -0,0 +1,6 @@
|
||||
- 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 ]
|
||||
@ -2,9 +2,9 @@
|
||||
"additional_executables": "false",
|
||||
"additional_executables_destination_path": "",
|
||||
"additional_executables_list": "",
|
||||
"additional_registry_images": "true",
|
||||
"additional_registry_images_list": "ghcr.io/kube-vip/kube-vip:v0.5.5",
|
||||
"additional_registry_images": "false",
|
||||
"additional_registry_images_list": "",
|
||||
"additional_url_images": "false",
|
||||
"additional_url_images_list": "",
|
||||
"load_additional_components": "true"
|
||||
"load_additional_components": "false"
|
||||
}
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{
|
||||
"build_target": "virt",
|
||||
"disable_public_repos": "false",
|
||||
"extra_debs": "",
|
||||
"extra_debs": "open-iscsi",
|
||||
"extra_repos": "",
|
||||
"extra_rpms": "iscsi-initiator-utils ca-certificates",
|
||||
"extra_rpms": "",
|
||||
"firstboot_custom_roles_post": "",
|
||||
"firstboot_custom_roles_pre": "",
|
||||
"http_proxy": "",
|
||||
"https_proxy": "",
|
||||
"no_proxy": "",
|
||||
"node_custom_roles_post": "",
|
||||
"node_custom_roles_post": "custom",
|
||||
"node_custom_roles_pre": "",
|
||||
"pause_image": "registry.k8s.io/pause:3.8",
|
||||
"pause_image": "registry.k8s.io/pause:3.6",
|
||||
"pip_conf_file": "",
|
||||
"redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm",
|
||||
"reenable_public_repos": "true",
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
"kubernetes_container_registry": "registry.k8s.io",
|
||||
"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.25.10-00",
|
||||
"kubernetes_deb_version": "1.23.15-00",
|
||||
"kubernetes_http_source": "https://dl.k8s.io/release",
|
||||
"kubernetes_load_additional_imgs": "false",
|
||||
"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_repo": "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{user `kubernetes_rpm_repo_arch`}}",
|
||||
"kubernetes_rpm_repo_arch": "x86_64",
|
||||
"kubernetes_rpm_version": "1.25.10-0",
|
||||
"kubernetes_semver": "v1.25.10",
|
||||
"kubernetes_series": "v1.25",
|
||||
"kubernetes_rpm_version": "1.23.15-0",
|
||||
"kubernetes_semver": "v1.23.15",
|
||||
"kubernetes_series": "v1.23",
|
||||
"kubernetes_source_type": "pkg",
|
||||
"systemd_prefix": "/usr/lib/systemd",
|
||||
"sysusr_prefix": "/usr",
|
||||
|
||||
@ -188,8 +188,8 @@
|
||||
],
|
||||
"boot_wait": "{{user `boot_wait`}}",
|
||||
"cluster": "{{user `cluster`}}",
|
||||
"cd_files": ["{{user `http_directory`}}"],
|
||||
"cd_label": "OEMDRV",
|
||||
"cd_files": ["{{user `cd_file_path`}}/meta-data", "{{user `cd_file_path`}}/user-data"],
|
||||
"cd_label": "cidata",
|
||||
"communicator": "ssh",
|
||||
"convert_to_template": "{{user `convert_to_template`}}",
|
||||
"cpu_cores": "{{user `cpu_cores`}}",
|
||||
@ -359,8 +359,7 @@
|
||||
"--extra-vars",
|
||||
"{{user `ansible_user_vars`}}",
|
||||
"--scp-extra-args",
|
||||
"{{user `ansible_scp_extra_args`}}",
|
||||
"-vvvvv"
|
||||
"{{user `ansible_scp_extra_args`}}"
|
||||
],
|
||||
"playbook_file": "./ansible/firstboot.yml",
|
||||
"type": "ansible",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"boot_command_prefix": "<up><tab> text inst.ks=",
|
||||
"boot_command_suffix": "packer/ova/linux/{{user `distro_name`}}/http/8/ks.cfg<enter><wait>",
|
||||
"boot_media_path": "cdrom:",
|
||||
"boot_command_suffix": "/8/ks.cfg<enter><wait>",
|
||||
"boot_media_path": "http://{{ .HTTPIP }}:{{ .HTTPPort }}",
|
||||
"build_name": "rhel-8",
|
||||
"distro_arch": "amd64",
|
||||
"distro_name": "rhel",
|
||||
@ -9,9 +9,9 @@
|
||||
"epel_rpm_gpg_key": "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8",
|
||||
"guest_os_type": "rhel8-64",
|
||||
"http_directory": "./packer/ova/linux/{{user `distro_name`}}/http/",
|
||||
"iso_checksum": "517ABCC67EE3B7212F57E180F5D30BE3E8269E7A99E127A3399B7935C7E00A09",
|
||||
"iso_checksum": "48f955712454c32718dcde858dea5aca574376a1d7a4b0ed6908ac0b85597811",
|
||||
"iso_checksum_type": "sha256",
|
||||
"iso_url": "https://{{ user `repo_username` }}:{{ user `repo_password` }}@sn.itch.fyi/Repository/iso/Redhat/rhel-8.8-x86_64-dvd.iso",
|
||||
"iso_url": "file:///rhel-8.4-x86_64-dvd.iso",
|
||||
"os_display_name": "RHEL 8",
|
||||
"redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm",
|
||||
"shutdown_command": "shutdown -P now",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user