From b84c53a6bc59a3dec89dbfe3402e2f8ded2d8b74 Mon Sep 17 00:00:00 2001 From: Rado Chmiel Date: Mon, 5 Feb 2024 20:46:05 +0100 Subject: [PATCH 1/3] changing tag to full path --- infra/capi/nephio-workload-cluster/pv-cluster.yaml | 2 +- .../capi/nephio-workload-cluster/pv-local-path-provisioner.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-metallb.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-multus.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-repo.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-rootsync.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-vlanindex.yaml | 2 +- infra/gcp/nephio-blueprint-repo/pv-repo.yaml | 2 +- infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml | 2 +- workloads/oai/package-variants/oai-cucp.yaml | 2 +- workloads/oai/package-variants/oai-cuup.yaml | 2 +- workloads/oai/package-variants/oai-du.yaml | 2 +- workloads/oai/package-variants/oai-ran-operator.yaml | 2 +- workloads/oai/package-variants/oai-ue.yaml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/infra/capi/nephio-workload-cluster/pv-cluster.yaml b/infra/capi/nephio-workload-cluster/pv-cluster.yaml index f1824db..618a249 100644 --- a/infra/capi/nephio-workload-cluster/pv-cluster.yaml +++ b/infra/capi/nephio-workload-cluster/pv-cluster.yaml @@ -8,7 +8,7 @@ spec: upstream: package: cluster-capi-kind repo: catalog-infra-capi - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/v2.0.0 downstream: package: example-cluster repo: mgmt diff --git a/infra/capi/nephio-workload-cluster/pv-local-path-provisioner.yaml b/infra/capi/nephio-workload-cluster/pv-local-path-provisioner.yaml index 7ef9f0c..7bfda56 100644 --- a/infra/capi/nephio-workload-cluster/pv-local-path-provisioner.yaml +++ b/infra/capi/nephio-workload-cluster/pv-local-path-provisioner.yaml @@ -8,7 +8,7 @@ spec: upstream: package: local-path-provisioner repo: catalog-infra-capi - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/v2.0.0 downstream: package: example-local-path-provisioner repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-metallb.yaml b/infra/capi/nephio-workload-cluster/pv-metallb.yaml index 98248a2..5099817 100644 --- a/infra/capi/nephio-workload-cluster/pv-metallb.yaml +++ b/infra/capi/nephio-workload-cluster/pv-metallb.yaml @@ -8,7 +8,7 @@ spec: upstream: package: metallb repo: catalog-distros-sandbox - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/v2.0.0 downstream: package: example-metallb repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-multus.yaml b/infra/capi/nephio-workload-cluster/pv-multus.yaml index a94fcd3..bea14b3 100644 --- a/infra/capi/nephio-workload-cluster/pv-multus.yaml +++ b/infra/capi/nephio-workload-cluster/pv-multus.yaml @@ -8,7 +8,7 @@ spec: upstream: package: multus repo: catalog-infra-capi - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/v2.0.0 downstream: package: example-multus repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-repo.yaml b/infra/capi/nephio-workload-cluster/pv-repo.yaml index 0eb3285..11fcfa3 100644 --- a/infra/capi/nephio-workload-cluster/pv-repo.yaml +++ b/infra/capi/nephio-workload-cluster/pv-repo.yaml @@ -8,7 +8,7 @@ spec: upstream: package: repository repo: catalog-distros-sandbox - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/v2.0.0 downstream: package: example-repo repo: mgmt diff --git a/infra/capi/nephio-workload-cluster/pv-rootsync.yaml b/infra/capi/nephio-workload-cluster/pv-rootsync.yaml index c596a69..8a130cb 100644 --- a/infra/capi/nephio-workload-cluster/pv-rootsync.yaml +++ b/infra/capi/nephio-workload-cluster/pv-rootsync.yaml @@ -8,7 +8,7 @@ spec: upstream: package: rootsync repo: catalog-nephio-optional - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/v2.0.0 downstream: package: example-rootsync repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-vlanindex.yaml b/infra/capi/nephio-workload-cluster/pv-vlanindex.yaml index 408dc03..87ce787 100644 --- a/infra/capi/nephio-workload-cluster/pv-vlanindex.yaml +++ b/infra/capi/nephio-workload-cluster/pv-vlanindex.yaml @@ -8,7 +8,7 @@ spec: upstream: package: vlanindex repo: catalog-infra-capi - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/v2.0.0 downstream: package: example-vlanindex repo: mgmt diff --git a/infra/gcp/nephio-blueprint-repo/pv-repo.yaml b/infra/gcp/nephio-blueprint-repo/pv-repo.yaml index e3a8c33..315e7f8 100644 --- a/infra/gcp/nephio-blueprint-repo/pv-repo.yaml +++ b/infra/gcp/nephio-blueprint-repo/pv-repo.yaml @@ -8,7 +8,7 @@ spec: upstream: package: cc-repo-csr repo: blueprints-infra-gcp - revision: main + revision: infra/gcp/nephio-blueprint-repo/v2.0.0 downstream: package: example repo: config-control diff --git a/infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml b/infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml index 226dcf6..f431504 100644 --- a/infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml +++ b/infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml @@ -8,7 +8,7 @@ spec: upstream: package: cc-cluster-gke-std-csr-cs repo: blueprints-infra-gcp - revision: main + revision: infra/gcp/nephio-workload-cluster-gke/v2.0.0 downstream: package: example repo: config-control diff --git a/workloads/oai/package-variants/oai-cucp.yaml b/workloads/oai/package-variants/oai-cucp.yaml index bd71f3f..c719a6b 100644 --- a/workloads/oai/package-variants/oai-cucp.yaml +++ b/workloads/oai/package-variants/oai-cucp.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: pkg-example-cucp-bp - revision: v2.0.0 + revision: workloads/oai/package-variants/v2.0.0 downstream: repo: regional package: oai-ran-cucp diff --git a/workloads/oai/package-variants/oai-cuup.yaml b/workloads/oai/package-variants/oai-cuup.yaml index 2a7879a..8a2faea 100644 --- a/workloads/oai/package-variants/oai-cuup.yaml +++ b/workloads/oai/package-variants/oai-cuup.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: pkg-example-cuup-bp - revision: v2.0.0 + revision: workloads/oai/package-variants/v2.0.0 downstream: repo: edge package: oai-ran-cuup diff --git a/workloads/oai/package-variants/oai-du.yaml b/workloads/oai/package-variants/oai-du.yaml index f078a1e..fab7ee5 100644 --- a/workloads/oai/package-variants/oai-du.yaml +++ b/workloads/oai/package-variants/oai-du.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: pkg-example-du-bp - revision: v2.0.0 + revision: workloads/oai/package-variants/v2.0.0 downstream: repo: edge package: oai-ran-du diff --git a/workloads/oai/package-variants/oai-ran-operator.yaml b/workloads/oai/package-variants/oai-ran-operator.yaml index dcd4a14..edf0906 100644 --- a/workloads/oai/package-variants/oai-ran-operator.yaml +++ b/workloads/oai/package-variants/oai-ran-operator.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: oai-ran-operator - revision: v2.0.0 + revision: workloads/oai/package-variants/v2.0.0 targets: - objectSelector: apiVersion: infra.nephio.org/v1alpha1 diff --git a/workloads/oai/package-variants/oai-ue.yaml b/workloads/oai/package-variants/oai-ue.yaml index 347b0bf..0acc7bb 100644 --- a/workloads/oai/package-variants/oai-ue.yaml +++ b/workloads/oai/package-variants/oai-ue.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: pkg-example-ue-bp - revision: v2.0.0 + revision: workloads/oai/package-variants/v2.0.0 downstream: repo: edge package: oai-ran-ue From bed42a74a584352e2f8b0a25aa3899057c4a009f Mon Sep 17 00:00:00 2001 From: Rado Chmiel Date: Mon, 5 Feb 2024 20:52:38 +0100 Subject: [PATCH 2/3] fixing path with package name --- infra/capi/nephio-workload-cluster/pv-cluster.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-configsync.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-crds.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-kindnet.yaml | 2 +- .../capi/nephio-workload-cluster/pv-local-path-provisioner.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-metallb.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-multus.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-repo.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-rootsync.yaml | 2 +- infra/capi/nephio-workload-cluster/pv-vlanindex.yaml | 2 +- infra/gcp/nephio-blueprint-repo/pv-repo.yaml | 2 +- infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml | 2 +- workloads/oai/package-variants/oai-cucp.yaml | 2 +- workloads/oai/package-variants/oai-cuup.yaml | 2 +- workloads/oai/package-variants/oai-du.yaml | 2 +- workloads/oai/package-variants/oai-ran-operator.yaml | 2 +- workloads/oai/package-variants/oai-ue.yaml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/infra/capi/nephio-workload-cluster/pv-cluster.yaml b/infra/capi/nephio-workload-cluster/pv-cluster.yaml index 618a249..e8a9061 100644 --- a/infra/capi/nephio-workload-cluster/pv-cluster.yaml +++ b/infra/capi/nephio-workload-cluster/pv-cluster.yaml @@ -8,7 +8,7 @@ spec: upstream: package: cluster-capi-kind repo: catalog-infra-capi - revision: infra/capi/nephio-workload-cluster/v2.0.0 + revision: infra/capi/nephio-workload-cluster/cluster-capi-kind/v2.0.0 downstream: package: example-cluster repo: mgmt diff --git a/infra/capi/nephio-workload-cluster/pv-configsync.yaml b/infra/capi/nephio-workload-cluster/pv-configsync.yaml index d2ebd8d..b3bbce3 100644 --- a/infra/capi/nephio-workload-cluster/pv-configsync.yaml +++ b/infra/capi/nephio-workload-cluster/pv-configsync.yaml @@ -8,7 +8,7 @@ spec: upstream: package: configsync repo: catalog-nephio-core - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/onfigsync/v2.0.0 downstream: package: example-configsync repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-crds.yaml b/infra/capi/nephio-workload-cluster/pv-crds.yaml index e3c4608..64e83d4 100644 --- a/infra/capi/nephio-workload-cluster/pv-crds.yaml +++ b/infra/capi/nephio-workload-cluster/pv-crds.yaml @@ -8,7 +8,7 @@ spec: upstream: package: workload-crds repo: catalog-nephio-core - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/workload-crds/v2.0.0 downstream: package: example-crds repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-kindnet.yaml b/infra/capi/nephio-workload-cluster/pv-kindnet.yaml index 7446b97..8deebb5 100644 --- a/infra/capi/nephio-workload-cluster/pv-kindnet.yaml +++ b/infra/capi/nephio-workload-cluster/pv-kindnet.yaml @@ -8,7 +8,7 @@ spec: upstream: package: kindnet repo: catalog-infra-capi - revision: v2.0.0 + revision: infra/capi/nephio-workload-cluster/kindnet/v2.0.0 downstream: package: example-kindnet repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-local-path-provisioner.yaml b/infra/capi/nephio-workload-cluster/pv-local-path-provisioner.yaml index 7bfda56..05d449b 100644 --- a/infra/capi/nephio-workload-cluster/pv-local-path-provisioner.yaml +++ b/infra/capi/nephio-workload-cluster/pv-local-path-provisioner.yaml @@ -8,7 +8,7 @@ spec: upstream: package: local-path-provisioner repo: catalog-infra-capi - revision: infra/capi/nephio-workload-cluster/v2.0.0 + revision: infra/capi/nephio-workload-cluster/local-path-provisioner/v2.0.0 downstream: package: example-local-path-provisioner repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-metallb.yaml b/infra/capi/nephio-workload-cluster/pv-metallb.yaml index 5099817..47574eb 100644 --- a/infra/capi/nephio-workload-cluster/pv-metallb.yaml +++ b/infra/capi/nephio-workload-cluster/pv-metallb.yaml @@ -8,7 +8,7 @@ spec: upstream: package: metallb repo: catalog-distros-sandbox - revision: infra/capi/nephio-workload-cluster/v2.0.0 + revision: infra/capi/nephio-workload-cluster/metallb/v2.0.0 downstream: package: example-metallb repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-multus.yaml b/infra/capi/nephio-workload-cluster/pv-multus.yaml index bea14b3..1e20d04 100644 --- a/infra/capi/nephio-workload-cluster/pv-multus.yaml +++ b/infra/capi/nephio-workload-cluster/pv-multus.yaml @@ -8,7 +8,7 @@ spec: upstream: package: multus repo: catalog-infra-capi - revision: infra/capi/nephio-workload-cluster/v2.0.0 + revision: infra/capi/nephio-workload-cluster/multus/v2.0.0 downstream: package: example-multus repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-repo.yaml b/infra/capi/nephio-workload-cluster/pv-repo.yaml index 11fcfa3..6f981f1 100644 --- a/infra/capi/nephio-workload-cluster/pv-repo.yaml +++ b/infra/capi/nephio-workload-cluster/pv-repo.yaml @@ -8,7 +8,7 @@ spec: upstream: package: repository repo: catalog-distros-sandbox - revision: infra/capi/nephio-workload-cluster/v2.0.0 + revision: infra/capi/nephio-workload-cluster/repository/v2.0.0 downstream: package: example-repo repo: mgmt diff --git a/infra/capi/nephio-workload-cluster/pv-rootsync.yaml b/infra/capi/nephio-workload-cluster/pv-rootsync.yaml index 8a130cb..a90f372 100644 --- a/infra/capi/nephio-workload-cluster/pv-rootsync.yaml +++ b/infra/capi/nephio-workload-cluster/pv-rootsync.yaml @@ -8,7 +8,7 @@ spec: upstream: package: rootsync repo: catalog-nephio-optional - revision: infra/capi/nephio-workload-cluster/v2.0.0 + revision: infra/capi/nephio-workload-cluster/rootsync/v2.0.0 downstream: package: example-rootsync repo: mgmt-staging diff --git a/infra/capi/nephio-workload-cluster/pv-vlanindex.yaml b/infra/capi/nephio-workload-cluster/pv-vlanindex.yaml index 87ce787..56b5083 100644 --- a/infra/capi/nephio-workload-cluster/pv-vlanindex.yaml +++ b/infra/capi/nephio-workload-cluster/pv-vlanindex.yaml @@ -8,7 +8,7 @@ spec: upstream: package: vlanindex repo: catalog-infra-capi - revision: infra/capi/nephio-workload-cluster/v2.0.0 + revision: infra/capi/nephio-workload-cluster/vlanindex/v2.0.0 downstream: package: example-vlanindex repo: mgmt diff --git a/infra/gcp/nephio-blueprint-repo/pv-repo.yaml b/infra/gcp/nephio-blueprint-repo/pv-repo.yaml index 315e7f8..e598870 100644 --- a/infra/gcp/nephio-blueprint-repo/pv-repo.yaml +++ b/infra/gcp/nephio-blueprint-repo/pv-repo.yaml @@ -8,7 +8,7 @@ spec: upstream: package: cc-repo-csr repo: blueprints-infra-gcp - revision: infra/gcp/nephio-blueprint-repo/v2.0.0 + revision: infra/gcp/nephio-blueprint-repo/cc-repo-csr/v2.0.0 downstream: package: example repo: config-control diff --git a/infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml b/infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml index f431504..8a20a6b 100644 --- a/infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml +++ b/infra/gcp/nephio-workload-cluster-gke/pv-cluster.yaml @@ -8,7 +8,7 @@ spec: upstream: package: cc-cluster-gke-std-csr-cs repo: blueprints-infra-gcp - revision: infra/gcp/nephio-workload-cluster-gke/v2.0.0 + revision: infra/gcp/nephio-workload-cluster-gke/cc-cluster-gke-std-csr-cs/v2.0.0 downstream: package: example repo: config-control diff --git a/workloads/oai/package-variants/oai-cucp.yaml b/workloads/oai/package-variants/oai-cucp.yaml index c719a6b..0955104 100644 --- a/workloads/oai/package-variants/oai-cucp.yaml +++ b/workloads/oai/package-variants/oai-cucp.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: pkg-example-cucp-bp - revision: workloads/oai/package-variants/v2.0.0 + revision: workloads/oai/package-variants/pkg-example-cucp-bp/v2.0.0 downstream: repo: regional package: oai-ran-cucp diff --git a/workloads/oai/package-variants/oai-cuup.yaml b/workloads/oai/package-variants/oai-cuup.yaml index 8a2faea..38a1b89 100644 --- a/workloads/oai/package-variants/oai-cuup.yaml +++ b/workloads/oai/package-variants/oai-cuup.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: pkg-example-cuup-bp - revision: workloads/oai/package-variants/v2.0.0 + revision: workloads/oai/package-variants/pkg-example-cuup-bp/v2.0.0 downstream: repo: edge package: oai-ran-cuup diff --git a/workloads/oai/package-variants/oai-du.yaml b/workloads/oai/package-variants/oai-du.yaml index fab7ee5..74da252 100644 --- a/workloads/oai/package-variants/oai-du.yaml +++ b/workloads/oai/package-variants/oai-du.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: pkg-example-du-bp - revision: workloads/oai/package-variants/v2.0.0 + revision: workloads/oai/package-variants/pkg-example-du-bp/v2.0.0 downstream: repo: edge package: oai-ran-du diff --git a/workloads/oai/package-variants/oai-ran-operator.yaml b/workloads/oai/package-variants/oai-ran-operator.yaml index edf0906..fa572c7 100644 --- a/workloads/oai/package-variants/oai-ran-operator.yaml +++ b/workloads/oai/package-variants/oai-ran-operator.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: oai-ran-operator - revision: workloads/oai/package-variants/v2.0.0 + revision: workloads/oai/package-variants/oai-ran-operator/v2.0.0 targets: - objectSelector: apiVersion: infra.nephio.org/v1alpha1 diff --git a/workloads/oai/package-variants/oai-ue.yaml b/workloads/oai/package-variants/oai-ue.yaml index 0acc7bb..92b746f 100644 --- a/workloads/oai/package-variants/oai-ue.yaml +++ b/workloads/oai/package-variants/oai-ue.yaml @@ -6,7 +6,7 @@ spec: upstream: repo: catalog-workloads-oai package: pkg-example-ue-bp - revision: workloads/oai/package-variants/v2.0.0 + revision: workloads/oai/package-variants/pkg-example-ue-bp/v2.0.0 downstream: repo: edge package: oai-ran-ue From b7d83e81a8e5c811b9901d79c507911b6c40bf7d Mon Sep 17 00:00:00 2001 From: Rado Chmiel Date: Mon, 5 Feb 2024 20:54:03 +0100 Subject: [PATCH 3/3] fixing typo --- infra/capi/nephio-workload-cluster/pv-configsync.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/capi/nephio-workload-cluster/pv-configsync.yaml b/infra/capi/nephio-workload-cluster/pv-configsync.yaml index b3bbce3..578ec9a 100644 --- a/infra/capi/nephio-workload-cluster/pv-configsync.yaml +++ b/infra/capi/nephio-workload-cluster/pv-configsync.yaml @@ -8,7 +8,7 @@ spec: upstream: package: configsync repo: catalog-nephio-core - revision: infra/capi/nephio-workload-cluster/onfigsync/v2.0.0 + revision: infra/capi/nephio-workload-cluster/configsync/v2.0.0 downstream: package: example-configsync repo: mgmt-staging