From fd1157e47adf0179476073392d0af2f87fc0548f Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Thu, 29 May 2025 00:50:32 -0500 Subject: [PATCH] Update charts metadata After merger of osh-infra we have to update the home urls for all charts to point to the openstack-helm repo. Also cleanup references to osh-infra in other places. Change-Id: Iefeba8024b6720d25013c60cfd3a835950675801 --- CONTRIBUTING.rst | 9 ++------- ceph-rgw/templates/deployment-rgw.yaml | 2 +- doc/source/logging/elasticsearch.rst | 2 +- doc/source/logging/fluent-logging.rst | 2 +- doc/source/monitoring/nagios.rst | 2 +- doc/source/monitoring/prometheus.rst | 10 +++++----- doc/source/testing/ceph-resiliency/failure-domain.rst | 4 ++-- .../testing/ceph-resiliency/namespace-deletion.rst | 4 ++-- doc/source/upgrade/multiple-osd-releases.rst | 10 +++++----- elastic-apm-server/Chart.yaml | 2 +- elastic-filebeat/Chart.yaml | 2 +- elastic-metricbeat/Chart.yaml | 2 +- elastic-packetbeat/Chart.yaml | 2 +- fluentbit/Chart.yaml | 2 +- fluentd/Chart.yaml | 2 +- helm-toolkit/Chart.yaml | 2 +- kibana/Chart.yaml | 2 +- kubernetes-keystone-webhook/Chart.yaml | 2 +- kubernetes-node-problem-detector/Chart.yaml | 2 +- prometheus-alertmanager/Chart.yaml | 2 +- prometheus-blackbox-exporter/Chart.yaml | 2 +- prometheus-kube-state-metrics/Chart.yaml | 2 +- prometheus-node-exporter/Chart.yaml | 2 +- prometheus-openstack-exporter/Chart.yaml | 5 ++--- prometheus-process-exporter/Chart.yaml | 4 ++-- prometheus/Chart.yaml | 2 +- roles/override-images/tasks/main.yaml | 4 ++-- values_overrides/cinder/external-ceph-backend.yaml | 4 ++-- 28 files changed, 43 insertions(+), 49 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 416ce82ba6..f6bf7d5817 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,6 +1,6 @@ The source repository for this project can be found at: - https://opendev.org/openstack/openstack-helm-infra + https://opendev.org/openstack/openstack-helm.git Pull requests submitted through GitHub are not monitored. @@ -11,9 +11,4 @@ to set up and use Gerrit: Bugs should be filed on StoryBoard: - https://storyboard.openstack.org/#!/project/openstack/openstack-helm-infra - -For more specific information about contributing to this repository, see the -openstack-helm infra contributor guide: - - https://docs.openstack.org/openstack-helm-infra/latest/contributor/contributing.html + https://storyboard.openstack.org/#!/project/openstack/openstack-helm diff --git a/ceph-rgw/templates/deployment-rgw.yaml b/ceph-rgw/templates/deployment-rgw.yaml index 1fde8afe57..eff781b297 100644 --- a/ceph-rgw/templates/deployment-rgw.yaml +++ b/ceph-rgw/templates/deployment-rgw.yaml @@ -91,7 +91,7 @@ subjects: --- # This role bindig refers to the ClusterRole for # check-dns deployment. -# See: openstack-helm-infra/ceph-client/deployment-checkdns.yaml +# See: openstack-helm/ceph-client/deployment-checkdns.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: diff --git a/doc/source/logging/elasticsearch.rst b/doc/source/logging/elasticsearch.rst index f11a0e85f7..459a951e7b 100644 --- a/doc/source/logging/elasticsearch.rst +++ b/doc/source/logging/elasticsearch.rst @@ -1,7 +1,7 @@ Elasticsearch ============= -The Elasticsearch chart in openstack-helm-infra provides a distributed data +The Elasticsearch chart in openstack-helm provides a distributed data store to index and analyze logs generated from the OpenStack-Helm services. The chart contains templates for: diff --git a/doc/source/logging/fluent-logging.rst b/doc/source/logging/fluent-logging.rst index b3ea41899e..54c44462a5 100644 --- a/doc/source/logging/fluent-logging.rst +++ b/doc/source/logging/fluent-logging.rst @@ -1,7 +1,7 @@ Fluent-logging =============== -The fluent-logging chart in openstack-helm-infra provides the base for a +The fluent-logging chart in openstack-helm provides the base for a centralized logging platform for OpenStack-Helm. The chart combines two services, Fluentbit and Fluentd, to gather logs generated by the services, filter on or add metadata to logged events, then forward them to Elasticsearch diff --git a/doc/source/monitoring/nagios.rst b/doc/source/monitoring/nagios.rst index af970cf6bd..bcd7eb6662 100644 --- a/doc/source/monitoring/nagios.rst +++ b/doc/source/monitoring/nagios.rst @@ -1,7 +1,7 @@ Nagios ====== -The Nagios chart in openstack-helm-infra can be used to provide an alarming +The Nagios chart in openstack-helm can be used to provide an alarming service that's tightly coupled to an OpenStack-Helm deployment. The Nagios chart uses a custom Nagios core image that includes plugins developed to query Prometheus directly for scraped metrics and triggered alarms, query the Ceph diff --git a/doc/source/monitoring/prometheus.rst b/doc/source/monitoring/prometheus.rst index c51a73390e..4bf2ec9148 100644 --- a/doc/source/monitoring/prometheus.rst +++ b/doc/source/monitoring/prometheus.rst @@ -1,7 +1,7 @@ Prometheus ========== -The Prometheus chart in openstack-helm-infra provides a time series database and +The Prometheus chart in openstack-helm provides a time series database and a strong querying language for monitoring various components of OpenStack-Helm. Prometheus gathers metrics by scraping defined service endpoints or pods at specified intervals and indexing them in the underlying time series database. @@ -56,7 +56,7 @@ configuration components of the Prometheus deployment at runtime. Kubernetes Endpoint Configuration --------------------------------- -The Prometheus chart in openstack-helm-infra uses the built-in service discovery +The Prometheus chart in openstack-helm uses the built-in service discovery mechanisms for Kubernetes endpoints and pods to automatically configure scrape targets. Functions added to helm-toolkit allows configuration of these targets via annotations that can be applied to any service or pod that exposes metrics @@ -180,7 +180,7 @@ Extending Prometheus Prometheus can target various exporters to gather metrics related to specific applications to extend visibility into an OpenStack-Helm deployment. Currently, -openstack-helm-infra contains charts for: +openstack-helm contains charts for: - prometheus-kube-state-metrics: Provides additional Kubernetes metrics - prometheus-node-exporter: Provides metrics for nodes and linux kernels @@ -292,7 +292,7 @@ Rules Configuration Prometheus provides a querying language that can operate on defined rules which allow for the generation of alerts on specific metrics. The Prometheus chart in -openstack-helm-infra defines these rules via the values.yaml file. By defining +openstack-helm defines these rules via the values.yaml file. By defining these in the values file, it allows operators flexibility to provide specific rules via overrides at installation. The following rules keys are provided: @@ -324,7 +324,7 @@ Prometheus recording_ and alert_ rules documentation. Note: Prometheus releases prior to 2.0 used gotpl to define rules. Prometheus 2.0 changed the rules format to YAML, making them much easier to read. The -Prometheus chart in openstack-helm-infra uses Prometheus 2.0 by default to take +Prometheus chart in openstack-helm uses Prometheus 2.0 by default to take advantage of changes to the underlying storage layer and the handling of stale data. The chart will not support overrides for Prometheus versions below 2.0, as the command line flags for the service changed between versions. diff --git a/doc/source/testing/ceph-resiliency/failure-domain.rst b/doc/source/testing/ceph-resiliency/failure-domain.rst index 696786ff0a..f4e96f5d42 100644 --- a/doc/source/testing/ceph-resiliency/failure-domain.rst +++ b/doc/source/testing/ceph-resiliency/failure-domain.rst @@ -802,9 +802,9 @@ The charts can be updated with these overrides pre or post deployment. If this i :: cd /opt/openstack-helm - helm upgrade --install ceph-osd ../openstack-helm-infra/ceph-osd --namespace=ceph --values=/tmp/ceph.yaml + helm upgrade --install ceph-osd ../openstack-helm/ceph-osd --namespace=ceph --values=/tmp/ceph.yaml kubectl delete jobs/ceph-rbd-pool -n ceph - helm upgrade --install ceph-client ../openstack-helm-infra/ceph-client --namespace=ceph --values=/tmp/ceph.yaml + helm upgrade --install ceph-client ../openstack-helm/ceph-client --namespace=ceph --values=/tmp/ceph.yaml helm delete cinder --purge helm upgrade --install cinder ./cinder --namespace=openstack --values=/tmp/cinder.yaml diff --git a/doc/source/testing/ceph-resiliency/namespace-deletion.rst b/doc/source/testing/ceph-resiliency/namespace-deletion.rst index bc12856076..51653c05ac 100644 --- a/doc/source/testing/ceph-resiliency/namespace-deletion.rst +++ b/doc/source/testing/ceph-resiliency/namespace-deletion.rst @@ -89,7 +89,7 @@ This document captures steps to bring Ceph back up after deleting it's associate .. code-block:: console - cd /opt/openstack-helm-infra/ + cd /opt/openstack-helm/ ./tools/deployment/multinode/030-ceph.sh 3.5 Disable CephX authentication @@ -199,7 +199,7 @@ This document captures steps to bring Ceph back up after deleting it's associate .. code-block:: console - cd /opt/openstack-helm-infra/ + cd /opt/openstack-helm/ ./tools/deployment/multinode/030-ceph.sh ./tools/deployment/multinode/040-ceph-ns-activate.sh diff --git a/doc/source/upgrade/multiple-osd-releases.rst b/doc/source/upgrade/multiple-osd-releases.rst index cff53aba82..230b0d328c 100644 --- a/doc/source/upgrade/multiple-osd-releases.rst +++ b/doc/source/upgrade/multiple-osd-releases.rst @@ -83,12 +83,12 @@ step 1: setup - create multiple ceph osd charts as per requirement .. note:: - copy ceph-osd folder to multiple ceph osd charts in openstack-helm-infra folder + copy ceph-osd folder to multiple ceph osd charts in openstack-helm folder .. code-block:: console - ubuntu@k8smaster:/opt/openstack-helm-infra$ cp -r ceph-osd ceph-osd-vdb - ubuntu@k8smaster:/opt/openstack-helm-infra$ cp -r ceph-osd ceph-osd-vdc + ubuntu@k8smaster:/opt/openstack-helm$ cp -r ceph-osd ceph-osd-vdb + ubuntu@k8smaster:/opt/openstack-helm$ cp -r ceph-osd ceph-osd-vdc .. note:: make sure to correct chart name in each osd chart folder created above, need to @@ -112,7 +112,7 @@ step 1: setup and also have correct overrides as shown below. example1: for CHART in ceph-osd-vdb; do - helm upgrade --install ${CHART} ${OSH_INFRA_PATH}/${CHART} \ + helm upgrade --install ${CHART} ${OSH_PATH}/${CHART} \ --namespace=ceph \ --values=/tmp/ceph.yaml \ ${OSH_EXTRA_HELM_ARGS} \ @@ -127,7 +127,7 @@ step 1: setup location: /dev/vda1 example2: for CHART in ceph-osd-vdc; do - helm upgrade --install ${CHART} ${OSH_INFRA_PATH}/${CHART} \ + helm upgrade --install ${CHART} ${OSH_PATH}/${CHART} \ --namespace=ceph \ --values=/tmp/ceph.yaml \ ${OSH_EXTRA_HELM_ARGS} \ diff --git a/elastic-apm-server/Chart.yaml b/elastic-apm-server/Chart.yaml index 764fc9420f..6c0256f9e7 100644 --- a/elastic-apm-server/Chart.yaml +++ b/elastic-apm-server/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://www.elastic.co/guide/en/apm/get-started/current/index.html sources: - https://github.com/elastic/apm-server - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/elastic-filebeat/Chart.yaml b/elastic-filebeat/Chart.yaml index 45357abfbb..bc1160b266 100644 --- a/elastic-filebeat/Chart.yaml +++ b/elastic-filebeat/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://www.elastic.co/products/beats/filebeat sources: - https://github.com/elastic/beats/tree/master/filebeat - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/elastic-metricbeat/Chart.yaml b/elastic-metricbeat/Chart.yaml index 2b7843ad0e..0f4539b2c6 100644 --- a/elastic-metricbeat/Chart.yaml +++ b/elastic-metricbeat/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://www.elastic.co/products/beats/metricbeat sources: - https://github.com/elastic/beats/tree/master/metricbeat - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/elastic-packetbeat/Chart.yaml b/elastic-packetbeat/Chart.yaml index e83dc0e963..15367cff65 100644 --- a/elastic-packetbeat/Chart.yaml +++ b/elastic-packetbeat/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://www.elastic.co/products/beats/packetbeat sources: - https://github.com/elastic/beats/tree/master/packetbeat - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/fluentbit/Chart.yaml b/fluentbit/Chart.yaml index 361ca26341..ab1f136558 100644 --- a/fluentbit/Chart.yaml +++ b/fluentbit/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://www.fluentbit.io/ sources: - https://github.com/fluent/fluentbit - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/fluentd/Chart.yaml b/fluentd/Chart.yaml index 486b2ef94d..59afff3661 100644 --- a/fluentd/Chart.yaml +++ b/fluentd/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://www.fluentd.org/ sources: - https://github.com/fluent/fluentd - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml index 933be508c2..0fdb3230ef 100644 --- a/helm-toolkit/Chart.yaml +++ b/helm-toolkit/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://docs.openstack.org/openstack-helm icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png sources: - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index bb599644c7..e6b440c052 100644 --- a/kibana/Chart.yaml +++ b/kibana/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://www.elastic.co/products/kibana sources: - https://github.com/elastic/kibana - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/kubernetes-keystone-webhook/Chart.yaml b/kubernetes-keystone-webhook/Chart.yaml index b0b9e3486f..096725ef84 100644 --- a/kubernetes-keystone-webhook/Chart.yaml +++ b/kubernetes-keystone-webhook/Chart.yaml @@ -18,7 +18,7 @@ name: kubernetes-keystone-webhook version: 2025.1.0 home: https://github.com/kubernetes/cloud-provider-openstack sources: - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/kubernetes-node-problem-detector/Chart.yaml b/kubernetes-node-problem-detector/Chart.yaml index 7200d81d78..cd5c9644fa 100644 --- a/kubernetes-node-problem-detector/Chart.yaml +++ b/kubernetes-node-problem-detector/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://github.com/kubernetes/node-problem-detector sources: - https://github.com/kubernetes/node-problem-detector - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/prometheus-alertmanager/Chart.yaml b/prometheus-alertmanager/Chart.yaml index 2845faf08f..e45521d13a 100644 --- a/prometheus-alertmanager/Chart.yaml +++ b/prometheus-alertmanager/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://prometheus.io/docs/alerting/alertmanager/ sources: - https://github.com/prometheus/alertmanager - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/prometheus-blackbox-exporter/Chart.yaml b/prometheus-blackbox-exporter/Chart.yaml index 7ba5b4db82..ffa0b92d8d 100644 --- a/prometheus-blackbox-exporter/Chart.yaml +++ b/prometheus-blackbox-exporter/Chart.yaml @@ -17,7 +17,7 @@ name: prometheus-blackbox-exporter version: 2025.1.0 home: https://github.com/prometheus/blackbox_exporter sources: - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm - https://github.com/prometheus/blackbox_exporter maintainers: - name: OpenStack-Helm Authors diff --git a/prometheus-kube-state-metrics/Chart.yaml b/prometheus-kube-state-metrics/Chart.yaml index 16d734130d..4db2e82a50 100644 --- a/prometheus-kube-state-metrics/Chart.yaml +++ b/prometheus-kube-state-metrics/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://github.com/kubernetes/kube-state-metrics sources: - https://github.com/kubernetes/kube-state-metrics - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/prometheus-node-exporter/Chart.yaml b/prometheus-node-exporter/Chart.yaml index 65385ea51e..0c07369ad7 100644 --- a/prometheus-node-exporter/Chart.yaml +++ b/prometheus-node-exporter/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://github.com/prometheus/node_exporter sources: - https://github.com/prometheus/node_exporter - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/prometheus-openstack-exporter/Chart.yaml b/prometheus-openstack-exporter/Chart.yaml index e72bdaeded..1239b202d0 100644 --- a/prometheus-openstack-exporter/Chart.yaml +++ b/prometheus-openstack-exporter/Chart.yaml @@ -16,10 +16,9 @@ appVersion: v1.0.0 description: OpenStack Metrics Exporter for Prometheus name: prometheus-openstack-exporter version: 2025.1.0 -home: https://github.com/openstack/openstack-helm-infra +home: https://opendev.org/openstack/openstack-helm sources: - - https://opendev.org/openstack/openstack-helm-infra - - https://github.com/rakesh-patnaik/prometheus-openstack-exporter + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/prometheus-process-exporter/Chart.yaml b/prometheus-process-exporter/Chart.yaml index 6f8fa76cce..c822f16278 100644 --- a/prometheus-process-exporter/Chart.yaml +++ b/prometheus-process-exporter/Chart.yaml @@ -16,10 +16,10 @@ appVersion: v0.2.11 description: OpenStack-Helm Process Exporter for Prometheus name: prometheus-process-exporter version: 2025.1.0 -home: https://github.com/openstack/openstack-helm-infra +home: https://opendev.org/openstack/openstack-helm sources: - https://github.com/ncabatoff/process-exporter - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/prometheus/Chart.yaml b/prometheus/Chart.yaml index 2181170a88..be2e1a39f5 100644 --- a/prometheus/Chart.yaml +++ b/prometheus/Chart.yaml @@ -19,7 +19,7 @@ version: 2025.1.0 home: https://prometheus.io/ sources: - https://github.com/prometheus/prometheus - - https://opendev.org/openstack/openstack-helm-infra + - https://opendev.org/openstack/openstack-helm maintainers: - name: OpenStack-Helm Authors dependencies: diff --git a/roles/override-images/tasks/main.yaml b/roles/override-images/tasks/main.yaml index 566ce38e98..808a7b7478 100644 --- a/roles/override-images/tasks/main.yaml +++ b/roles/override-images/tasks/main.yaml @@ -34,12 +34,12 @@ repo: "{{ zj_zuul_artifact.metadata.repository }}" override_paths: - ../openstack-helm*/*/values* - - ../openstack-helm-infra/tools/deployment/ + - ../openstack-helm/tools/deployment/ - name: Diff shell: | set -ex; - for dir in openstack-helm openstack-helm-infra; do + for dir in openstack-helm; do path="{{ work_dir }}/../${dir}/" if [ ! -d "${path}" ]; then continue; fi echo "${dir} diff" diff --git a/values_overrides/cinder/external-ceph-backend.yaml b/values_overrides/cinder/external-ceph-backend.yaml index 663846551a..c160b1a228 100644 --- a/values_overrides/cinder/external-ceph-backend.yaml +++ b/values_overrides/cinder/external-ceph-backend.yaml @@ -1,7 +1,7 @@ # Note: This yaml file serves as an example for overriding the manifest # to enable additional externally managed Ceph Cinder backend. -# libvirt/values_overrides/cinder-external-ceph-backend.yaml in repo -# openstack-helm-infra is also needed for the attachment of ceph volumes. +# values_overrides/libvirt/cinder-external-ceph-backend.yaml in repo +# openstack-helm is also needed for the attachment of ceph volumes. --- ceph_client: enable_external_ceph_backend: True