diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 47892141..2dab71fe 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -2,7 +2,7 @@ openstack-helm openstack-helm-infra python3-k8sapp-openstack stx-openstack-helm-fluxcd -ingress-nginx-helm +upstream/helm-charts/ingress-nginx-helm upstream/openstack/openstack-pkg-tools upstream/openstack/python-cinderclient upstream/openstack/python-glanceclient diff --git a/ingress-nginx-helm/debian/deb_folder/changelog b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/changelog similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/changelog rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/changelog diff --git a/ingress-nginx-helm/debian/deb_folder/control b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/control similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/control rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/control diff --git a/ingress-nginx-helm/debian/deb_folder/copyright b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/copyright similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/copyright rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/copyright diff --git a/ingress-nginx-helm/debian/deb_folder/ingress-nginx-helm.install b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/ingress-nginx-helm.install similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/ingress-nginx-helm.install rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/ingress-nginx-helm.install diff --git a/ingress-nginx-helm/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch diff --git a/ingress-nginx-helm/debian/deb_folder/patches/series b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/patches/series similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/patches/series rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/patches/series diff --git a/ingress-nginx-helm/debian/deb_folder/rules b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/rules similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/rules rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/rules diff --git a/ingress-nginx-helm/debian/deb_folder/source/format b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/source/format similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/source/format rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/source/format diff --git a/ingress-nginx-helm/debian/meta_data.yaml b/upstream/helm-charts/ingress-nginx-helm/debian/meta_data.yaml similarity index 71% rename from ingress-nginx-helm/debian/meta_data.yaml rename to upstream/helm-charts/ingress-nginx-helm/debian/meta_data.yaml index 6788b6b5..860801dd 100644 --- a/ingress-nginx-helm/debian/meta_data.yaml +++ b/upstream/helm-charts/ingress-nginx-helm/debian/meta_data.yaml @@ -1,7 +1,7 @@ --- debname: ingress-nginx-helm debver: 4.12-1 -src_path: ${MY_REPO}/stx/openstack-armada-app/ingress-nginx-helm +src_path: ${MY_REPO}/stx/openstack-armada-app/upstream/helm-charts/ingress-nginx-helm dl_path: name: ingress-nginx-helm-chart-4.12.1.tar.gz url: https://github.com/kubernetes/ingress-nginx/archive/refs/tags/helm-chart-4.12.1.tar.gz diff --git a/ingress-nginx-helm/ingress-nginx-helm/files/Makefile b/upstream/helm-charts/ingress-nginx-helm/ingress-nginx-helm/files/Makefile similarity index 100% rename from ingress-nginx-helm/ingress-nginx-helm/files/Makefile rename to upstream/helm-charts/ingress-nginx-helm/ingress-nginx-helm/files/Makefile diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/changelog b/upstream/helm-charts/openstack-helm/debian/deb_folder/changelog new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/control b/upstream/helm-charts/openstack-helm/debian/deb_folder/control new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/copyright b/upstream/helm-charts/openstack-helm/debian/deb_folder/copyright new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/openstack-helm.install b/upstream/helm-charts/openstack-helm/debian/deb_folder/openstack-helm.install new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/rules b/upstream/helm-charts/openstack-helm/debian/deb_folder/rules new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/meta_data.yaml b/upstream/helm-charts/openstack-helm/debian/meta_data.yaml new file mode 100644 index 00000000..d4ef0a48 --- /dev/null +++ b/upstream/helm-charts/openstack-helm/debian/meta_data.yaml @@ -0,0 +1 @@ +# Placeholder for the OSH metadata diff --git a/upstream/helm-charts/openstack-helm/files/index.yaml b/upstream/helm-charts/openstack-helm/files/index.yaml new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/files/repositories.yaml b/upstream/helm-charts/openstack-helm/files/repositories.yaml new file mode 100644 index 00000000..e69de29b