Compare commits
22 Commits
main
...
Ubuntu2204
Author | SHA1 | Date | |
---|---|---|---|
5e4567b162 | |||
7febe35286 | |||
7f68acc95e | |||
ca01cc7d4c | |||
809574dcd2 | |||
64ed3cd449 | |||
bbaff25725 | |||
c70620e88c | |||
f25d15ed39 | |||
11ac815ac6 | |||
abc231fb22 | |||
5c1dcf95c8 | |||
7e6c1d6aa9 | |||
24aaf55e4b | |||
297fb39202 | |||
13b8e4c43d | |||
cc0f2bd683 | |||
619923b2d4 | |||
19628c3080 | |||
e6c366a5be | |||
12ae24f950 | |||
b94b7a2916 |
11
.drone.yml
11
.drone.yml
@ -6,9 +6,6 @@ volumes:
|
||||
- name: output
|
||||
claim:
|
||||
name: flexvolsmb-drone-output
|
||||
- name: scratch
|
||||
claim:
|
||||
name: flexvolsmb-drone-scratch
|
||||
|
||||
steps:
|
||||
- name: Debugging information
|
||||
@ -22,19 +19,13 @@ 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
|
||||
- |
|
||||
make deps-ova
|
||||
- |
|
||||
make build-node-ova-vsphere-ubuntu-2004
|
||||
make build-node-ova-vsphere-ubuntu-2204
|
||||
- |
|
||||
mv -fv ./output/**/*.ova /output
|
||||
environment:
|
||||
|
113
.gitea/workflows/actions.yaml
Normal file
113
.gitea/workflows/actions.yaml
Normal file
@ -0,0 +1,113 @@
|
||||
name: Container & Helm chart
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
# linting:
|
||||
# name: Linting
|
||||
# runs-on: dind-rootless
|
||||
# steps:
|
||||
# - name: Check out repository code
|
||||
# uses: actions/checkout@v4
|
||||
# - name: yamllint
|
||||
# uses: bewuethr/yamllint-action@v1
|
||||
# with:
|
||||
# config-file: .yamllint.yaml
|
||||
|
||||
semrel_dryrun:
|
||||
name: Semantic Release (Dry-run)
|
||||
runs-on: dind-rootless
|
||||
outputs:
|
||||
version: ${{ steps.sem_rel.outputs.version }}
|
||||
steps:
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v4
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 20
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
npm install \
|
||||
semantic-release \
|
||||
@semantic-release/commit-analyzer \
|
||||
@semantic-release/exec
|
||||
- name: Semantic Release (dry-run)
|
||||
id: sem_rel
|
||||
run: |
|
||||
npx semantic-release \
|
||||
--package @semantic-release/exec \
|
||||
--package semantic-release \
|
||||
--branches ${{ gitea.refname }} \
|
||||
--tag-format 'v${version}' \
|
||||
--dry-run \
|
||||
--plugins @semantic-release/commit-analyzer,@semantic-release/exec \
|
||||
--analyzeCommits @semantic-release/commit-analyzer \
|
||||
--verifyRelease @semantic-release/exec \
|
||||
--verifyReleaseCmd 'echo "version=${nextRelease.version}" >> $GITHUB_OUTPUT'
|
||||
env:
|
||||
GIT_CREDENTIALS: ${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_APIKEY }}
|
||||
- name: Assert semantic release output
|
||||
run: |
|
||||
[[ -z "${{ steps.sem_rel.outputs.version }}" ]] && {
|
||||
echo 'No release tag - exiting'; exit 1
|
||||
} || {
|
||||
echo 'Release tag set correctly: ${{ steps.sem_rel.outputs.version }}'; exit 0
|
||||
}
|
||||
|
||||
build_image:
|
||||
name: Cluster API node template
|
||||
# volumes:
|
||||
# - /data:/data
|
||||
# - /output:/output
|
||||
runs-on: dind
|
||||
# needs: [semrel_dryrun, linting]
|
||||
needs: semrel_dryrun
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Install dependencies
|
||||
uses: addnab/docker-run-action@v3
|
||||
with:
|
||||
image: registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.29
|
||||
# options: --user root
|
||||
options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} --rm
|
||||
run: |
|
||||
make deps-ova
|
||||
- name: Build node template
|
||||
uses: addnab/docker-run-action@v3
|
||||
with:
|
||||
image: registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.29
|
||||
# options: --user root
|
||||
options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} --rm
|
||||
run: |
|
||||
make build-node-ova-vsphere-ubuntu-2204
|
||||
# env:
|
||||
# PACKER_LOG: 1
|
||||
|
||||
# semrel:
|
||||
# name: Semantic Release
|
||||
# runs-on: dind-rootless
|
||||
# needs: [build_container, build_chart]
|
||||
# steps:
|
||||
# - name: Check out repository code
|
||||
# uses: actions/checkout@v3
|
||||
# - name: Setup Node
|
||||
# uses: actions/setup-node@v3
|
||||
# with:
|
||||
# node-version: 20
|
||||
# - name: Install dependencies
|
||||
# run: |
|
||||
# npm install \
|
||||
# semantic-release \
|
||||
# @semantic-release/changelog \
|
||||
# @semantic-release/commit-analyzer \
|
||||
# @semantic-release/git \
|
||||
# @semantic-release/release-notes-generator
|
||||
# - name: Semantic Release
|
||||
# run: |
|
||||
# npx semantic-release \
|
||||
# --branches ${{ gitea.refname }} \
|
||||
# --tag-format 'v${version}' \
|
||||
# --plugins @semantic-release/commit-analyzer,@semantic-release/release-notes-generator,@semantic-release/changelog,@semantic-release/git
|
||||
# env:
|
||||
# GIT_CREDENTIALS: ${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_APIKEY }}
|
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)
|
||||
|
@ -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
|
||||
imageRepository: {{ kubernetes_container_registry }}
|
||||
kubernetesVersion: {{ kubernetes_semver }}
|
||||
dns:
|
||||
imageRepository: {{ kubernetes_container_registry }}/coredns
|
||||
---
|
||||
apiVersion: kubeadm.k8s.io/v1beta2
|
||||
apiVersion: kubeadm.k8s.io/v1beta3
|
||||
kind: InitConfiguration
|
||||
nodeRegistration:
|
||||
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/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 }
|
||||
|
||||
- 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:
|
||||
state: absent
|
||||
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_destination_path": "",
|
||||
"additional_executables_list": "",
|
||||
"additional_registry_images": "false",
|
||||
"additional_registry_images_list": "",
|
||||
"additional_registry_images": "true",
|
||||
"additional_registry_images_list": "ghcr.io/kube-vip/kube-vip:v0.5.5",
|
||||
"additional_url_images": "false",
|
||||
"additional_url_images_list": "",
|
||||
"load_additional_components": "false"
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"build_target": "virt",
|
||||
"disable_public_repos": "false",
|
||||
"extra_debs": "open-iscsi",
|
||||
"extra_debs": "nfs-common open-iscsi",
|
||||
"extra_repos": "",
|
||||
"extra_rpms": "",
|
||||
"firstboot_custom_roles_post": "",
|
||||
@ -9,9 +9,9 @@
|
||||
"http_proxy": "",
|
||||
"https_proxy": "",
|
||||
"no_proxy": "",
|
||||
"node_custom_roles_post": "custom",
|
||||
"node_custom_roles_post": "",
|
||||
"node_custom_roles_pre": "",
|
||||
"pause_image": "registry.k8s.io/pause:3.6",
|
||||
"pause_image": "registry.k8s.io/pause:3.9",
|
||||
"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.23.15-00",
|
||||
"kubernetes_deb_version": "1.27.1-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.23.15-0",
|
||||
"kubernetes_semver": "v1.23.15",
|
||||
"kubernetes_series": "v1.23",
|
||||
"kubernetes_rpm_version": "1.27.1-0",
|
||||
"kubernetes_semver": "v1.27.1",
|
||||
"kubernetes_series": "v1.27",
|
||||
"kubernetes_source_type": "pkg",
|
||||
"systemd_prefix": "/usr/lib/systemd",
|
||||
"sysusr_prefix": "/usr",
|
||||
|
@ -221,7 +221,7 @@
|
||||
}
|
||||
],
|
||||
"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_timeout": "4h",
|
||||
"ssh_username": "{{user `ssh_username`}}",
|
||||
|
@ -8,9 +8,9 @@
|
||||
"distro_name": "ubuntu",
|
||||
"distro_version": "22.04",
|
||||
"guest_os_type": "ubuntu-64",
|
||||
"iso_checksum": "10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb",
|
||||
"iso_checksum": "a4acfda10b18da50e2ec50ccaf860d7f20b389df8765611142305c0e911d16fd",
|
||||
"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.3-live-server-amd64.iso",
|
||||
"os_display_name": "Ubuntu 22.04",
|
||||
"shutdown_command": "shutdown -P now",
|
||||
"vsphere_guest_os_type": "ubuntu64Guest"
|
||||
|
Loading…
Reference in New Issue
Block a user