diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-27 09:42:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 09:42:31 -0400 |
| commit | bbe419ef9ffda699aa87ab0fcb2bdf50c0ff5058 (patch) | |
| tree | 85bf123d2a7e1c3439d7a2da9e4656eabfbf1fb7 /pkg | |
| parent | c44efb011003942adedb6ac74457be0123d23a02 (diff) | |
| parent | 7259a6315c7f7d97665d928de6357fc3cbcae136 (diff) | |
| download | podman-bbe419ef9ffda699aa87ab0fcb2bdf50c0ff5058.tar.gz podman-bbe419ef9ffda699aa87ab0fcb2bdf50c0ff5058.tar.bz2 podman-bbe419ef9ffda699aa87ab0fcb2bdf50c0ff5058.zip | |
Merge pull request #14023 from rhatdan/kube
Truncate annotations when generating kubernetes yaml files
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 6 | ||||
| -rw-r--r-- | pkg/machine/e2e/config_init.go | 2 | ||||
| -rw-r--r-- | pkg/machine/e2e/machine_test.go | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 5de475480..0da07bab8 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -78,7 +78,11 @@ func (ic *ContainerEngine) PlayKube(ctx context.Context, body io.Reader, options podTemplateSpec.ObjectMeta = podYAML.ObjectMeta podTemplateSpec.Spec = podYAML.Spec - + for name, val := range podYAML.Annotations { + if len(val) > define.MaxKubeAnnotation { + return nil, errors.Errorf("invalid annotation %q=%q value length exceeds Kubernetetes max %d", name, val, define.MaxKubeAnnotation) + } + } for name, val := range options.Annotations { if podYAML.Annotations == nil { podYAML.Annotations = make(map[string]string) diff --git a/pkg/machine/e2e/config_init.go b/pkg/machine/e2e/config_init.go index 55218221d..2340a1133 100644 --- a/pkg/machine/e2e/config_init.go +++ b/pkg/machine/e2e/config_init.go @@ -12,7 +12,7 @@ type initMachine struct { --image-path string Path to qcow image (default "testing") -m, --memory uint Memory in MB (default 2048) --now Start machine now - --rootful Whether this machine should prefer rootful container exectution + --rootful Whether this machine should prefer rootful container execution --timezone string Set timezone (default "local") -v, --volume stringArray Volumes to mount, source:target --volume-driver string Optional volume driver diff --git a/pkg/machine/e2e/machine_test.go b/pkg/machine/e2e/machine_test.go index 46fe18069..2b3b60b2b 100644 --- a/pkg/machine/e2e/machine_test.go +++ b/pkg/machine/e2e/machine_test.go @@ -116,7 +116,7 @@ func teardown(origHomeDir string, testDir string, mb *machineTestBuilder) { s := new(stopMachine) for _, name := range mb.names { if _, err := mb.setName(name).setCmd(s).run(); err != nil { - fmt.Printf("error occured rm'ing machine: %q\n", err) + fmt.Printf("error occurred rm'ing machine: %q\n", err) } } if err := os.RemoveAll(testDir); err != nil { |