summaryrefslogtreecommitdiff
path: root/cmd/podman/registry
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-05-28 12:14:42 +0200
committerGitHub <noreply@github.com>2021-05-28 12:14:42 +0200
commitaa1e15961ee749378e2da2537679498cc9ecd97d (patch)
treeed6e4ef547f6700ed7fa2ed2b44363c5c9021cc2 /cmd/podman/registry
parent3d8f37120d95c9a2d3293acdea6ab01a4c066806 (diff)
parent33944cefe7c1f3e11c8389bedb3e4c80af8541bd (diff)
downloadpodman-aa1e15961ee749378e2da2537679498cc9ecd97d.tar.gz
podman-aa1e15961ee749378e2da2537679498cc9ecd97d.tar.bz2
podman-aa1e15961ee749378e2da2537679498cc9ecd97d.zip
Merge pull request #10385 from jwhonce/wip/engine_mode
[Techinal Debt][NO TESTS NEEDED] Cleanup ABI vs. Tunnel CLI commands
Diffstat (limited to 'cmd/podman/registry')
-rw-r--r--cmd/podman/registry/config.go13
-rw-r--r--cmd/podman/registry/registry.go1
2 files changed, 12 insertions, 2 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go
index 3ce6e3899..25139a3de 100644
--- a/cmd/podman/registry/config.go
+++ b/cmd/podman/registry/config.go
@@ -15,14 +15,25 @@ import (
)
const (
- ParentNSRequired = "ParentNSRequired"
+ // ParentNSRequired used as cobra.Annotation when command requires root access
+ ParentNSRequired = "ParentNSRequired"
+
+ // UnshareNSRequired used as cobra.Annotation when command requires modified user namespace
UnshareNSRequired = "UnshareNSRequired"
+
+ // EngineMode used as cobra.Annotation when command supports a limited number of Engines
+ EngineMode = "EngineMode"
)
var (
podmanOptions entities.PodmanConfig
podmanSync sync.Once
abiSupport = false
+
+ // ABIMode used in cobra.Annotations registry.EngineMode when command only supports ABIMode
+ ABIMode = entities.ABIMode.String()
+ // TunnelMode used in in cobra.Annotations registry.EngineMode when command only supports TunnelMode
+ TunnelMode = entities.TunnelMode.String()
)
// PodmanConfig returns an entities.PodmanConfig built up from
diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go
index 0b1d9293a..607ef6d8e 100644
--- a/cmd/podman/registry/registry.go
+++ b/cmd/podman/registry/registry.go
@@ -19,7 +19,6 @@ const DefaultRootAPIPath = "/run/podman/podman.sock"
const DefaultRootAPIAddress = "unix:" + DefaultRootAPIPath
type CliCommand struct {
- Mode []entities.EngineMode
Command *cobra.Command
Parent *cobra.Command
}