diff --git a/Makefile b/Makefile index e5d67887bd..47014a469e 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ schema-check: # Is the generated Go code synced with the schema? grep -q "$(DIGEST)" pkg/builds/cosa_v1.go grep -q "$(DIGEST)" pkg/builds/schema_doc.go - grep -q "$(DIGEST)" src/cmd-cloud-prune + grep -q "$(DIGEST)" src/cmd-coreos-prune install: install -d $(DESTDIR)$(PREFIX)/lib/coreos-assembler diff --git a/cmd/coreos-assembler.go b/cmd/coreos-assembler.go index 3804d37c05..d05eb7c405 100644 --- a/cmd/coreos-assembler.go +++ b/cmd/coreos-assembler.go @@ -16,7 +16,7 @@ var buildCommands = []string{"init", "fetch", "build", "osbuild", "run", "prune" var advancedBuildCommands = []string{"buildfetch", "buildupload", "oc-adm-release", "push-container"} var buildextendCommands = []string{"aliyun", "applehv", "aws", "azure", "digitalocean", "exoscale", "extensions-container", "gcp", "hyperv", "ibmcloud", "kubevirt", "live", "metal", "metal4k", "nutanix", "openstack", "qemu", "secex", "virtualbox", "vmware", "vultr"} -var utilityCommands = []string{"aws-replicate", "cloud-prune", "compress", "copy-container", "koji-upload", "kola", "push-container-manifest", "remote-build-container", "remote-session", "sign", "tag", "update-variant"} +var utilityCommands = []string{"aws-replicate", "coreos-prune", "compress", "copy-container", "koji-upload", "kola", "push-container-manifest", "remote-build-container", "remote-session", "sign", "tag", "update-variant"} var otherCommands = []string{"shell", "meta"} func init() { diff --git a/docs/cosa.md b/docs/cosa.md index a80ec0484b..45171035e8 100644 --- a/docs/cosa.md +++ b/docs/cosa.md @@ -65,7 +65,7 @@ Those less commonly used commands are listed here: | [oc-adm-release](https://github.com/coreos/coreos-assembler/blob/main/src/cmd-oc-adm-release) | Publish an oscontainer as the machine-os-content in an OpenShift release series | [offline-update](https://github.com/coreos/coreos-assembler/blob/main/src/cmd-offline-update) | Given a disk image and a coreos-assembler build, use supermin to update the disk image to the target OSTree commit "offline" | [prune](https://github.com/coreos/coreos-assembler/blob/main/src/cmd-prune) | This script removes previous builds. DO NOT USE on production pipelines -| [cloud-prune](https://github.com/coreos/coreos-assembler/blob/main/src/cmd-cloud-prune) | Prune resources as sepcified in policy.yaml +| [coreos-prune](https://github.com/coreos/coreos-assembler/blob/main/src/cmd-coreos-prune) | Prune resources as sepcified in policy.yaml | [sign](https://github.com/coreos/coreos-assembler/blob/main/src/cmd-sign) | Implements signing with RoboSignatory via fedora-messaging | [supermin-shell](https://github.com/coreos/coreos-assembler/blob/main/src/cmd-supermin-shell) | Get a supermin shell | [tag](https://github.com/coreos/coreos-assembler/blob/main/src/cmd-tag) | Operate on the tags in `builds.json` diff --git a/src/cmd-cloud-prune b/src/cmd-coreos-prune similarity index 99% rename from src/cmd-cloud-prune rename to src/cmd-coreos-prune index e7e4d01914..fef15ecb32 100755 --- a/src/cmd-cloud-prune +++ b/src/cmd-coreos-prune @@ -64,7 +64,7 @@ UNSUPPORTED = ["aliyun", "azure", "ibmcloud", "powervs"] def parse_args(): - parser = argparse.ArgumentParser(prog="coreos-assembler cloud-prune") + parser = argparse.ArgumentParser(prog="coreos-assembler coreos-prune") parser.add_argument("--policy", required=True, type=str, help="Path to policy YAML file") parser.add_argument("--dry-run", help="Don't actually delete anything", action='store_true') parser.add_argument("--upload-builds-json", help="Push builds.json", action='store_true')