Merge "Minor fixes on custom charts"

stx-openstack-helm-fluxcd/debian/deb_folder/rules

@@ -14,8 +14,8 @@ override_dh_auto_build:
 	# Stage helm-toolkit in the local repo.
 	cp $(HELM_FOLDER)/helm-toolkit-$(TOOLKIT_VERSION).tgz helm-charts/
 	# Host a server for the helm charts.
-	chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" \
-		--storage-local-rootdir="./helm-charts" &
+	chartmuseum --debug --port=8879 --context-path='/charts' \
+		--storage="local" --storage-local-rootdir="./helm-charts" &
 	sleep 2
 	helm repo add local http://localhost:8879/charts
 	# Create the TGZ file.
@@ -29,7 +29,7 @@ override_dh_auto_build:
 	cd helm-charts && make clients
 	# Terminate the helm chart server.
 	pkill chartmuseum
-	# Remove helm-toolkit. This will be packaged with openstack-helm-infra.
+	# Remove helm-toolkit.
 	rm  helm-charts/helm-toolkit-$(TOOLKIT_VERSION).tgz
 
 override_dh_auto_install:

stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/helm-charts/Makefile

@@ -1,15 +1,17 @@
 #
-# Copyright 2017 The Openstack-Helm Authors.
+# Copyright 2017-2023 The Openstack-Helm Authors.
 #
-# Copyright (c) 2018 Wind River Systems, Inc.
+# Copyright (c) 2018-2023 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
+
 # It's necessary to set this because some environments don't link sh -> bash.
 SHELL := /bin/bash
+HELM  := helm
 TASK  := build
 
-EXCLUDES := helm-toolkit doc tests tools logs tmp
+EXCLUDES := helm-toolkit doc tests tools logs tmp zuul.d releasenotes
 CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
 
 .PHONY: $(EXCLUDES) $(CHARTS)
@@ -25,12 +27,16 @@ $(CHARTS):
 
 init-%:
 	if [ -f $*/Makefile ]; then make -C $*; fi
-	if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+	if [ -f $*/requirements.yaml ]; then $(HELM) dep up $*; fi
 
 lint-%: init-%
-	if [ -d $* ]; then helm lint $*; fi
+	if [ -d $* ]; then $(HELM) lint $*; fi
 
 build-%: lint-%
+	if [ -d $* ]; then $(HELM) package $*; fi
+
+# This is used exclusively with helm3 building in the gate to publish
+package-%: init-%
 	if [ -d $* ]; then helm package $*; fi
 
 clean:
@@ -39,5 +45,14 @@ clean:
 	rm -f *tgz */charts/*tgz */requirements.lock
 	rm -rf */charts */tmpcharts
 
+pull-all-images:
+	@./tools/pull-images.sh
+
+pull-images:
+	@./tools/pull-images.sh $(filter-out $@,$(MAKECMDGOALS))
+
+dev-deploy:
+	@./tools/gate/devel/start.sh $(filter-out $@,$(MAKECMDGOALS))
+
 %:
 	@:

stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/helm-charts/clients/Chart.yaml

@@ -1,3 +1,17 @@
+# Copyright 2023 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 appVersion: "1.0"
 description: Helm chart for stx-openstack containerized openstack-clients

stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/helm-charts/dcdbsync/Chart.yaml

@@ -1,3 +1,17 @@
+# Copyright 2019 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 appVersion: "1.0"
 description: StarlingX-Helm dcdbsync

stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/helm-charts/keystone-api-proxy/Chart.yaml

@@ -1,3 +1,17 @@
+# Copyright 2019 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 appVersion: "1.0"
 description: StarlingX-Helm keystone-api-proxy

stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/helm-charts/nova-api-proxy/Chart.yaml

@@ -1,3 +1,17 @@
+# Copyright 2018 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 appVersion: "1.0"
 description: StarlingX-Helm nova-api-proxy

stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/helm-charts/pci-irq-affinity-agent/Chart.yaml

@@ -1,3 +1,17 @@
+# Copyright 2021 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 description: PCI IRQ Affinity Agent
 name: pci-irq-affinity-agent