Merge pull request #33 from nephio-project/revert-31-release_prep

Revert "changing tag to full path"
nephio-project · Feb 5, 2024 · b0397e5 · b0397e5
2 parents 2a8f16f + f329895
commit b0397e5
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git 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/cluster-capi-kind/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: configsync
     repo: catalog-nephio-core
-    revision: infra/capi/nephio-workload-cluster/configsync/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: workload-crds
     repo: catalog-nephio-core
-    revision: infra/capi/nephio-workload-cluster/workload-crds/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: kindnet
     repo: catalog-infra-capi
-    revision: infra/capi/nephio-workload-cluster/kindnet/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: local-path-provisioner
     repo: catalog-infra-capi
-    revision: infra/capi/nephio-workload-cluster/local-path-provisioner/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: metallb
     repo: catalog-distros-sandbox
-    revision: infra/capi/nephio-workload-cluster/metallb/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: multus
     repo: catalog-infra-capi
-    revision: infra/capi/nephio-workload-cluster/multus/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: repository
     repo: catalog-distros-sandbox
-    revision: infra/capi/nephio-workload-cluster/repository/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: rootsync
     repo: catalog-nephio-optional
-    revision: infra/capi/nephio-workload-cluster/rootsync/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: vlanindex
     repo: catalog-infra-capi
-    revision: infra/capi/nephio-workload-cluster/vlanindex/v2.0.0
+    revision: 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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: cc-repo-csr
     repo: blueprints-infra-gcp
-    revision: infra/gcp/nephio-blueprint-repo/cc-repo-csr/v2.0.0
+    revision: main
   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
@@ -8,7 +8,7 @@ spec:
   upstream:
     package: cc-cluster-gke-std-csr-cs
     repo: blueprints-infra-gcp
-    revision: infra/gcp/nephio-workload-cluster-gke/cc-cluster-gke-std-csr-cs/v2.0.0
+    revision: main
   downstream:
     package: example
     repo: config-control

diff --git 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/pkg-example-cucp-bp/v2.0.0
+    revision: 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
@@ -6,7 +6,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai
     package: pkg-example-cuup-bp
-    revision: workloads/oai/package-variants/pkg-example-cuup-bp/v2.0.0
+    revision: 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
@@ -6,7 +6,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai
     package: pkg-example-du-bp
-    revision: workloads/oai/package-variants/pkg-example-du-bp/v2.0.0
+    revision: 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
@@ -6,7 +6,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai
     package: oai-ran-operator
-    revision: workloads/oai/package-variants/oai-ran-operator/v2.0.0
+    revision: 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
@@ -6,7 +6,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai
     package: pkg-example-ue-bp
-    revision: workloads/oai/package-variants/pkg-example-ue-bp/v2.0.0
+    revision: v2.0.0
   downstream:
     repo: edge
     package: oai-ran-ue