summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-02-24 12:16:40 -0500
committerGitHub <noreply@github.com>2022-02-24 12:16:40 -0500
commit874bde20504830ac6c5169190cddcf5fe6a9caa9 (patch)
tree03e70833500f41a545d78c1e393691238fca4ea3
parent283fd60e9d3bca1cc8f7bbd25ea929b23a6b8784 (diff)
parenta7fc8a146075805c0c4941652bcaf377943f4d1c (diff)
downloadpodman-874bde20504830ac6c5169190cddcf5fe6a9caa9.tar.gz
podman-874bde20504830ac6c5169190cddcf5fe6a9caa9.tar.bz2
podman-874bde20504830ac6c5169190cddcf5fe6a9caa9.zip
Merge pull request #13325 from xordspar0/configmap-error-msg
Improve the error message for usused configMaps
-rw-r--r--docs/source/markdown/podman-play-kube.1.md13
-rw-r--r--pkg/domain/infra/abi/play.go3
2 files changed, 9 insertions, 7 deletions
diff --git a/docs/source/markdown/podman-play-kube.1.md b/docs/source/markdown/podman-play-kube.1.md
index f85ea9046..389affc3a 100644
--- a/docs/source/markdown/podman-play-kube.1.md
+++ b/docs/source/markdown/podman-play-kube.1.md
@@ -72,9 +72,11 @@ disable builds.
`Kubernetes ConfigMap`
-Kubernetes ConfigMap can be referred as a source of environment variables in Pods or Deployments.
+Kubernetes ConfigMap can be referred as a source of environment variables or volumes in Pods or Deployments.
+ConfigMaps aren't a standalone object in Podman; instead, when a container uses a ConfigMap, Podman will create environment variables or volumes as needed.
+
+For example, the following YAML document defines a ConfigMap and then uses it in a Pod:
-For example ConfigMap defined in following YAML:
```
apiVersion: v1
kind: ConfigMap
@@ -82,14 +84,11 @@ metadata:
name: foo
data:
FOO: bar
-```
-
-can be referred in a Pod in following way:
-```
+---
apiVersion: v1
kind: Pod
metadata:
-...
+ name: foobar
spec:
containers:
- command:
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 1cd80a6d2..8cbf5da9a 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -128,6 +128,9 @@ func (ic *ContainerEngine) PlayKube(ctx context.Context, path string, options en
}
if validKinds == 0 {
+ if len(configMaps) > 0 {
+ return nil, fmt.Errorf("ConfigMaps in podman are not a standalone object and must be used in a container")
+ }
return nil, fmt.Errorf("YAML document does not contain any supported kube kind")
}