From a9df0cff751fb079d931a066c94bf542d2e0769a Mon Sep 17 00:00:00 2001 From: BG Date: Wed, 23 Sep 2026 13:41:45 +0200 Subject: [PATCH 1/2] Add support for stackit cpi --- ci/pipeline.yml | 45 +++++++++++++++++++++++++++++++++++++ stackit/cpi.yml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 stackit/cpi.yml diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 9defee75..ed94998b 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -56,6 +56,7 @@ groups: - update-virtualbox-cpi-release - update-openstack-cpi-release - update-warden-cpi-release + - update-stackit-cpi - name: bump-stemcells-noble jobs: - update-aws-noble-stemcell @@ -65,6 +66,7 @@ groups: - update-gcp-noble-stemcell - update-openstack-noble-stemcell - update-openstack-raw-noble-stemcell + - update-stackit-noble-stemcell - update-vcloud-noble-stemcell - update-virtualbox-noble-stemcell - update-vsphere-noble-stemcell @@ -440,6 +442,24 @@ jobs: CPI_OPS_FILE: warden/cpi.yml - <<: *commit-when-new-asset +- name: update-stackit-cpi + plan: + - in_parallel: + - get: bosh-deployment + params: + clean_tags: true + - get: stackit-cpi-release + trigger: true + - task: update-release + file: bosh-deployment/ci/tasks/update-cpi.yml + input_mapping: + cpi: stackit-cpi-release + params: + CPI_OPS_FILE: stackit/cpi.yml + CPI_NAME: bosh-stackit-cpi + GITHUB_RELEASE: true + - <<: *commit-when-new-asset + - name: update-docker-cpi-release plan: - in_parallel: @@ -1007,6 +1027,23 @@ jobs: STEMCELL_NAME: openstack-ubuntu-noble-stemcell-raw - <<: *commit-when-new-asset +- name: update-stackit-noble-stemcell + plan: + - in_parallel: + - get: bosh-deployment + params: + clean_tags: true + - get: openstack-ubuntu-noble-stemcell + trigger: true + - task: update-stemcell + file: bosh-deployment/ci/tasks/update-stemcell.yml + input_mapping: + stemcell: openstack-ubuntu-noble-stemcell + params: + CPI_OPS_FILE: stackit/cpi.yml + STEMCELL_NAME: openstack-ubuntu-noble-stemcell + - <<: *commit-when-new-asset + - name: update-vcloud-noble-stemcell old_name: update-vcloud-stemcell plan: @@ -1754,6 +1791,14 @@ resources: source: repository: cloudfoundry/bosh-openstack-cpi-release +- name: stackit-cpi-release + type: github-release + source: + access_token: ((github_public_repo_token)) + owner: stackitcloud + repository: bosh-stackit-cpi-release + tag_filter: "v(.*)" + - name: os-conf-release type: bosh-io-release source: diff --git a/stackit/cpi.yml b/stackit/cpi.yml new file mode 100644 index 00000000..6fc306b5 --- /dev/null +++ b/stackit/cpi.yml @@ -0,0 +1,59 @@ +- name: cpi + path: /releases/- + type: replace + value: + name: bosh-stackit-cpi + sha1: bc73949e3e34478c155d130d8568f2ba6d7cd883 + url: https://github.com/stackitcloud/bosh-stackit-cpi-release/releases/download/v0.1.30/bosh-stackit-cpi-release-0.1.30.tgz + version: 0.1.30 +- name: stemcell + path: /resource_pools/name=vms/stemcell? + type: replace + value: + sha1: 2109697759f220cf161243a5489a9144bd54935b + url: https://storage.googleapis.com/bosh-core-stemcells/1.585/bosh-stemcell-1.585-openstack-kvm-ubuntu-noble.tgz +- path: /resource_pools/name=vms/cloud_properties? + type: replace + value: + availability_zone: ((az)) + instance_type: g2i.2 + root_disk: + size: 50 +- path: /networks/name=default/subnets/0/cloud_properties? + type: replace + value: + net_id: ((net_id)) + security_groups: ((default_security_groups)) +- path: /instance_groups/name=bosh/jobs/- + type: replace + value: + name: stackit_cpi + release: bosh-stackit-cpi +- path: /instance_groups/name=bosh/properties/director/cpi_job? + type: replace + value: stackit_cpi +- path: /cloud_provider/template? + type: replace + value: + name: stackit_cpi + release: bosh-stackit-cpi +- path: /instance_groups/name=bosh/properties/stackit? + type: replace + value: + project_id: ((stackit_project_id)) + service_account_json: ((stackit_service_account_json)) + region: ((region)) + default_security_groups: ((default_security_groups)) + default_ssh_key_name: ((default_key_name)) + human_readable_vm_names: true + auto_fix_name_and_labels: true +- path: /cloud_provider/properties/stackit? + type: replace + value: + project_id: ((stackit_project_id)) + service_account_json: ((stackit_service_account_json)) + region: ((region)) + default_security_groups: ((default_security_groups)) + default_ssh_key_name: ((default_key_name)) + human_readable_vm_names: true + auto_fix_name_and_labels: true From 50bc73ef1399bc7465db945df86344bf0ccf614b Mon Sep 17 00:00:00 2001 From: BG Date: Fri, 25 Sep 2026 08:14:58 +0200 Subject: [PATCH 2/2] Add possibility to use resolute or jammy for stackitcpi --- ci/pipeline.yml | 36 ++++++++++++++++++++++++++++++++++++ stackit/use-jammy.yml | 6 ++++++ stackit/use-resolute.yml | 6 ++++++ 3 files changed, 48 insertions(+) create mode 100644 stackit/use-jammy.yml create mode 100644 stackit/use-resolute.yml diff --git a/ci/pipeline.yml b/ci/pipeline.yml index ed94998b..8dab87e9 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -80,6 +80,7 @@ groups: - update-gcp-jammy-stemcell - update-openstack-jammy-stemcell - update-openstack-raw-jammy-stemcell + - update-stackit-jammy-stemcell - update-vcloud-jammy-stemcell - update-virtualbox-jammy-stemcell - update-vsphere-jammy-stemcell @@ -93,6 +94,7 @@ groups: - update-gcp-resolute-stemcell - update-openstack-resolute-stemcell - update-openstack-raw-resolute-stemcell + - update-stackit-resolute-stemcell - update-vcloud-resolute-stemcell - update-virtualbox-resolute-stemcell - update-vsphere-resolute-stemcell @@ -1235,6 +1237,23 @@ jobs: STEMCELL_NAME: openstack-ubuntu-jammy-stemcell-raw - <<: *commit-when-new-asset +- name: update-stackit-jammy-stemcell + plan: + - in_parallel: + - get: bosh-deployment + params: + clean_tags: true + - get: openstack-ubuntu-jammy-stemcell + trigger: true + - task: update-stemcell + file: bosh-deployment/ci/tasks/update-stemcell.yml + input_mapping: + stemcell: openstack-ubuntu-jammy-stemcell + params: + CPI_OPS_FILE: stackit/use-jammy.yml + STEMCELL_NAME: openstack-ubuntu-jammy-stemcell + - <<: *commit-when-new-asset + - name: update-vcloud-jammy-stemcell plan: - in_parallel: @@ -1422,6 +1441,23 @@ jobs: STEMCELL_NAME: openstack-ubuntu-resolute-stemcell-raw - <<: *commit-when-new-asset +- name: update-stackit-resolute-stemcell + plan: + - in_parallel: + - get: bosh-deployment + params: + clean_tags: true + - get: openstack-ubuntu-resolute-stemcell + trigger: true + - task: update-stemcell + file: bosh-deployment/ci/tasks/update-stemcell.yml + input_mapping: + stemcell: openstack-ubuntu-resolute-stemcell + params: + CPI_OPS_FILE: openstack/use-resolute-raw.yml + STEMCELL_NAME: openstack-ubuntu-resolute-stemcell-raw + - <<: *commit-when-new-asset + - name: update-vcloud-resolute-stemcell plan: - in_parallel: diff --git a/stackit/use-jammy.yml b/stackit/use-jammy.yml new file mode 100644 index 00000000..ac2876fd --- /dev/null +++ b/stackit/use-jammy.yml @@ -0,0 +1,6 @@ +- name: stemcell + path: /resource_pools/name=vms/stemcell? + type: replace + value: + sha1: a927d1de2983f0fdd71e10eb2c6f2a82ddd5dfed + url: https://storage.googleapis.com/bosh-core-stemcells/1.1411/bosh-stemcell-1.1411-openstack-kvm-ubuntu-jammy-go_agent.tgz diff --git a/stackit/use-resolute.yml b/stackit/use-resolute.yml new file mode 100644 index 00000000..e69210e1 --- /dev/null +++ b/stackit/use-resolute.yml @@ -0,0 +1,6 @@ +- name: stemcell + path: /resource_pools/name=vms/stemcell? + type: replace + value: + sha1: cf347d5d8e54ec13269cfd84e1e7e93e468f8e8c + url: https://storage.googleapis.com/bosh-core-stemcells/0.148/bosh-stemcell-0.148-openstack-kvm-ubuntu-resolute.tgz