Helm chart repo changes

This patch points magnum to our new azimuth-cloud repo, and also
removes references to the old stackhpc repo in the READMEs.

Change-Id: Iaa00e9e9e17f0e0d39f6f078c88abf864183d8c1
This commit is contained in:
scrungus
2024-08-01 17:14:45 +01:00
parent 957ce61b3c
commit fd6c6be848
8 changed files with 20 additions and 15 deletions

View File

@@ -5,7 +5,7 @@ magnum-capi-helm
OpenStack Magnum driver using Helm to create k8s clusters OpenStack Magnum driver using Helm to create k8s clusters
with Cluster API. with Cluster API.
The driver uses `capi-helm-charts <https://github.com/stackhpc/capi-helm-charts>`_ The driver uses `capi-helm-charts <https://github.com/azimuth-cloud/capi-helm-charts>`_
to create the k8s resources needed to provision a k8s cluster using to create the k8s resources needed to provision a k8s cluster using
Cluster API, including various useful add-ons like a CNI and a monitoring Cluster API, including various useful add-ons like a CNI and a monitoring
stack. stack.

View File

@@ -187,9 +187,9 @@ if [[ ":$PATH:" != *":$new_path:"* ]]; then
fi fi
# Get latest capi-helm-charts tag # Get latest capi-helm-charts tag
LATEST_TAG=$(curl -fsL https://api.github.com/repos/stackhpc/capi-helm-charts/tags | jq -r '.[0].name') LATEST_TAG=$(curl -fsL https://api.github.com/repos/azimuth-cloud/capi-helm-charts/tags | jq -r '.[0].name')
# Curl the dependencies URL # Curl the dependencies URL
DEPENDENCIES_JSON=$(curl -fsL https://github.com/stackhpc/capi-helm-charts/releases/download/$LATEST_TAG/dependencies.json) DEPENDENCIES_JSON=$(curl -fsL https://github.com/azimuth-cloud/capi-helm-charts/releases/download/$LATEST_TAG/dependencies.json)
# Parse JSON into bash variables # Parse JSON into bash variables
ADDON_PROVIDER=$(echo $DEPENDENCIES_JSON | jq -r '.["addon-provider"]') ADDON_PROVIDER=$(echo $DEPENDENCIES_JSON | jq -r '.["addon-provider"]')
@@ -238,7 +238,7 @@ sudo install -o root -g root -m 0755 clusterctl /usr/local/bin/clusterctl
# Install Cluster API resources # Install Cluster API resources
# using the matching tested values here: # using the matching tested values here:
# https://github.com/stackhpc/capi-helm-charts/blob/main/dependencies.json # https://github.com/azimuth-cloud/capi-helm-charts/blob/main/dependencies.json
clusterctl init \ clusterctl init \
--core cluster-api:$CLUSTER_API \ --core cluster-api:$CLUSTER_API \
--bootstrap kubeadm:$CLUSTER_API \ --bootstrap kubeadm:$CLUSTER_API \
@@ -248,7 +248,7 @@ clusterctl init \
# Install addon manager # Install addon manager
helm upgrade cluster-api-addon-provider cluster-api-addon-provider \ helm upgrade cluster-api-addon-provider cluster-api-addon-provider \
--install \ --install \
--repo https://stackhpc.github.io/cluster-api-addon-provider \ --repo https://azimuth-cloud.github.io/cluster-api-addon-provider \
--version $ADDON_PROVIDER \ --version $ADDON_PROVIDER \
--namespace capi-addon-system \ --namespace capi-addon-system \
--create-namespace \ --create-namespace \
@@ -258,7 +258,7 @@ helm upgrade cluster-api-addon-provider cluster-api-addon-provider \
# Install janitor # Install janitor
helm upgrade cluster-api-janitor-openstack cluster-api-janitor-openstack \ helm upgrade cluster-api-janitor-openstack cluster-api-janitor-openstack \
--install \ --install \
--repo https://stackhpc.github.io/cluster-api-janitor-openstack \ --repo https://azimuth-cloud.github.io/cluster-api-janitor-openstack \
--version $CLUSTER_API_JANITOR_OPENSTACK \ --version $CLUSTER_API_JANITOR_OPENSTACK \
--namespace capi-janitor-system \ --namespace capi-janitor-system \
--create-namespace \ --create-namespace \
@@ -274,7 +274,7 @@ source /opt/stack/openrc admin admin
openstack flavor create ds2G20 --ram 2048 --disk 20 --id d5 --vcpus 2 --public openstack flavor create ds2G20 --ram 2048 --disk 20 --id d5 --vcpus 2 --public
# Curl the manifest # Curl the manifest
AZIMUTH_IMAGES=$(curl -fsL "https://github.com/stackhpc/azimuth-images/releases/download/$AZIMUTH_IMAGES_TAG/manifest.json") AZIMUTH_IMAGES=$(curl -fsL "https://github.com/azimuth-cloud/azimuth-images/releases/download/$AZIMUTH_IMAGES_TAG/manifest.json")
# Get the keys of the Kubernetes images # Get the keys of the Kubernetes images
K8S_IMAGE_KEYS="$(echo "$AZIMUTH_IMAGES" | jq -r '. | with_entries(select(.value | has("kubernetes_version"))) | keys | sort | .[]')" K8S_IMAGE_KEYS="$(echo "$AZIMUTH_IMAGES" | jq -r '. | with_entries(select(.value | has("kubernetes_version"))) | keys | sort | .[]')"

View File

@@ -9,7 +9,7 @@ The driver currently supports create, delete and upgrade operations as well
as updates to node groups and their sizes. as updates to node groups and their sizes.
The Kubernetes versions against which the CAPI Helm charts are currently being tested The Kubernetes versions against which the CAPI Helm charts are currently being tested
can be found `here <https://github.com/stackhpc/capi-helm-charts/blob/main/.github/workflows/ensure-capi-images.yaml#L9>`_. can be found `here <https://github.com/azimuth-cloud/capi-helm-charts/blob/main/.github/workflows/ensure-capi-images.yaml#L9>`_.
The driver respects the following cluster and template properties: The driver respects the following cluster and template properties:

View File

@@ -25,9 +25,7 @@ The driver uses a standard set of Helm charts to create the k8s resources
required to provision and manage a k8s cluster using Cluster API, required to provision and manage a k8s cluster using Cluster API,
including various useful add-ons like a CNI and a monitoring stack. including various useful add-ons like a CNI and a monitoring stack.
These Helm charts currently live at https://github.com/stackhpc/capi-helm-charts These Helm charts currently live at https://github.com/azimuth-cloud/capi-helm-charts.
but will soon be moved to https://opendev.org/openstack/magnum-capi-helm-charts
instead.
The Helm charts are intended to be a way to share a reference method to The Helm charts are intended to be a way to share a reference method to
create k8s clusters on OpenStack. The charts are not expected or intended to create k8s clusters on OpenStack. The charts are not expected or intended to

View File

@@ -10,7 +10,7 @@ Kolla-Ansible-based deployments.
If you install this Python package within your Magnum virtual environment, If you install this Python package within your Magnum virtual environment,
it should be picked up by Magnum:: it should be picked up by Magnum::
git clone https://github.com/stackhpc/magnum-capi-helm.git git clone https://opendev.org/openstack/magnum-capi-helm.git
cd magnum-capi-helm cd magnum-capi-helm
pip install -e . pip install -e .

View File

@@ -40,7 +40,7 @@ capi_helm_opts = [
), ),
cfg.StrOpt( cfg.StrOpt(
"helm_chart_repo", "helm_chart_repo",
default="https://stackhpc.github.io/capi-helm-charts", default="https://azimuth-cloud.github.io/capi-helm-charts",
help=( help=(
"Reference to the helm chart repository for " "Reference to the helm chart repository for "
"the cluster API driver. " "the cluster API driver. "
@@ -58,7 +58,7 @@ capi_helm_opts = [
), ),
cfg.StrOpt( cfg.StrOpt(
"default_helm_chart_version", "default_helm_chart_version",
default="0.4.0", default="0.10.1",
help=( help=(
"Version of the helm chart specified " "Version of the helm chart specified "
"by the config: capi_driver.helm_chart_repo " "by the config: capi_driver.helm_chart_repo "

View File

@@ -25,7 +25,7 @@ LOG = logging.getLogger(__name__)
CONF = conf.CONF CONF = conf.CONF
# This code is loosely based on: # This code is loosely based on:
# https://github.com/stackhpc/pyhelm3 # https://github.com/azimuth-cloud/pyhelm3
# Ideally we can share this code in the future. # Ideally we can share this code in the future.

View File

@@ -0,0 +1,7 @@
---
upgrades:
- |
Default helm repository is updated to 'azimuth-cloud.github.io/capi-helm-charts'.
deprecations:
- |
Helm repository 'stackhpc.github.io/capi-helm-charts' is deprecated. The last version supported on this repo is 0.9.0