Switch away from using git subrepo, to a simple embedded copy scheme

.plano.py

@@ -57,3 +57,13 @@ def clean():
     remove("README.html")
     remove("htmlcov")
     remove(".coverage")
+
+@command
+def update_plano():
+    """
+    Update the embedded Plano repo
+    """
+
+    make_dir("external")
+    remove("external/plano-main")
+    run("curl -sfL https://github.com/ssorj/plano/archive/main.tar.gz | tar -C external -xz", shell=True)

README.md

@@ -21,32 +21,29 @@ use the [Skupper example template][template] as a starting point.
 
 [template]: https://github.com/skupperproject/skupper-example-template
 
-Make sure you have git-subrepo installed:
+Add the Skewer code as a subdirectory in your example project:
 
-    dnf install git-subrepo
-
-Add the Skewer code as a subrepo in your example project:
-
-    cd project-dir/
-    git subrepo clone https://github.com/skupperproject/skewer subrepos/skewer
+    cd <project-dir>/
+    mkdir external
+    curl -sfL https://github.com/skupperproject/skewer/archive/main.tar.gz | tar -C external -xz
 
 Symlink the Skewer library into your `python` directory:
 
     mkdir -p python
-    ln -s ../subrepos/skewer/python/skewer python/skewer
+    ln -s ../external/skewer-main/python/skewer python/skewer
 
 Symlink the `plano` command into the root of your project.  Symlink
 the standard `config/.plano.py` as `.plano.py` in the root as well:
 
-    ln -s subrepos/skewer/plano
-    ln -s subrepos/skewer/config/.plano.py
+    ln -s external/skewer-main/plano
+    ln -s external/skewer-main/config/.plano.py
 
 <!-- This sucks.  GitHub Actions doesn't support workflow files as symlinks. -->
 
 <!-- Symlink the standard GitHub Actions workflow file: -->
 
 <!--     mkdir -p .github/workflows -->
-<!--     ln -s ../../subrepos/skewer/config/.github/workflows/main.yaml .github/workflows/main.yaml -->
+<!--     ln -s ../../external/skewer-main/config/.github/workflows/main.yaml .github/workflows/main.yaml -->
 
 <!-- So I have a convenience for copying the latest version into place. -->
 
@@ -82,14 +79,15 @@ options:
   -f FILE, --file FILE  Load commands from FILE (default '.plano.py')
 
 commands:
-  {generate,render,run,run-external,demo,test,update-workflow}
+  {generate,render,run,run-external,demo,test,update-workflow,update-skewer}
     generate            Generate README.md from the data in skewer.yaml
     render              Render README.html from the data in skewer.yaml
     run                 Run the example steps using Minikube
     run-external        Run the example steps against external clusters
     demo                Run the example steps and pause before cleaning up
     test                Test README generation and run the steps on Minikube
     update-workflow     Update the GitHub Actions workflow file
+    update-skewer       Update the embedded Skewer repo
 ~~~
 
 ## Updating a Skewer subrepo inside your example project
@@ -98,15 +96,6 @@ Use `git subrepo pull`:
 
     git subrepo pull --force subrepos/skewer
 
-Some older versions of git-subrepo won't complete a force pull.  If
-that happens, you can simply blow away your changes and get the latest
-Skewer, using these commands:
-
-    git subrepo clean subrepos/skewer
-    git rm -rf subrepos/skewer/
-    git commit -am "Temporarily remove the previous version of Skewer"
-    git subrepo clone https://github.com/skupperproject/skewer subrepos/skewer
-
 ## Skewer YAML
 
 The top level:

config/.plano.py

@@ -117,8 +117,16 @@ def update_workflow():
     """
     Update the GitHub Actions workflow file
     """
+    copy("external/skewer-main/config/.github/workflows/main.yaml", ".github/workflows/main.yaml")
 
-    from_file = join("subrepos", "skewer", "config", ".github", "workflows", "main.yaml")
-    to_file = join(".github", "workflows", "main.yaml")
+@command
+def update_skewer():
+    """
+    Update the embedded Skewer repo
+    """
+    check_program("curl")
+
+    make_dir("external")
+    remove("external/skewer-main")
 
-    copy(from_file, to_file)
+    run("curl -sfL https://github.com/skupperproject/skewer/archive/main.tar.gz | tar -C external -xz", shell=True)

subrepos/plano/src/plano/main.py → external/plano-main/src/plano/main.py

@@ -718,7 +718,7 @@ def _run_curl(method, url, content=None, content_file=None, content_type=None, o
               user=None, password=None):
     check_program("curl")
 
-    args = ["curl", "-sf"]
+    args = ["curl", "-sfL"]
 
     if method != "GET":
         args.extend(["-X", method])

plano

@@ -1 +1 @@
-subrepos/plano/bin/plano
+external/plano-main/bin/plano

python/plano

@@ -1 +1 @@
-../subrepos/plano/src/plano
+../external/plano-main/src/plano

test-example/.plano.py

@@ -1 +1 @@
-subrepos/skewer/config/.plano.py
+external/skewer-main/config/.plano.py

test-example/external/skewer-main

@@ -0,0 +1 @@
+../..

test-example/plano

@@ -1 +1 @@
-subrepos/skewer/plano
+external/skewer-main/plano

test-example/python/skewer

@@ -1 +1 @@
-../subrepos/skewer/python/skewer
+../external/skewer-main/python/skewer