Skip to content

Commit e8d1493

Browse files
vijtrip2vijtrip2
authored
security hardening of service controllers (#257)
Issue #, if available: aws-controllers-k8s/community#1112 Description of changes: * Update base image to `public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424` and golang image to `1.17.5` for building controller images * Updated the `deployment.yaml` files to runAsUser 1000. This userId was selected as random. * Updated ACK runtime to `v0.16.0` ---------------- * validated that controller runs correctly when executed as non root user * tested locally by running ecr-controller e2e tests * validated that there were no security vulnerabilities in generated image By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 79311e5 commit e8d1493

File tree

10 files changed

+505
-105
lines changed

10 files changed

+505
-105
lines changed

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Base image to use for the final stage
2-
ARG base_image=public.ecr.aws/amazonlinux/amazonlinux:2
2+
ARG base_image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424
33
# Build the manager binary
4-
FROM public.ecr.aws/bitnami/golang:1.15.15 as builder
4+
FROM public.ecr.aws/bitnami/golang:1.17.5 as builder
55

66
ARG service_alias
77
# The tuple of controller image version information

‎Dockerfile.local

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Base image to use at runtime
2-
ARG base_image=public.ecr.aws/amazonlinux/amazonlinux:2
2+
ARG base_image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424
33
# Build the manager binary
4-
FROM public.ecr.aws/bitnami/golang:1.15.15 as builder
4+
FROM public.ecr.aws/bitnami/golang:1.17.5 as builder
55

66
ARG service_alias
77
# The tuple of controller image version information

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ GO111MODULE=on
66
AWS_SERVICE=$(shell echo $(SERVICE) | tr '[:upper:]' '[:lower:]')
77

88
# Build ldflags
9-
VERSION ?= "v0.15.2"
9+
VERSION ?= "v0.16.0"
1010
GITCOMMIT=$(shell git rev-parse HEAD)
1111
BUILDDATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
1212
IMPORT_PATH=github.com/aws-controllers-k8s/code-generator

‎go.mod

+75-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,90 @@
11
module github.com/aws-controllers-k8s/code-generator
22

3-
go 1.14
3+
go 1.17
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.15.2
6+
github.com/aws-controllers-k8s/runtime v0.16.0
77
github.com/aws/aws-sdk-go v1.37.10
88
github.com/dlclark/regexp2 v1.4.0
99
// pin to v0.1.1 due to release problem with v0.1.2
1010
github.com/gertd/go-pluralize v0.1.1
1111
github.com/ghodss/yaml v1.0.0
12-
github.com/go-logr/logr v0.3.0
12+
github.com/go-logr/logr v1.2.0
1313
github.com/iancoleman/strcase v0.1.3
1414
github.com/operator-framework/api v0.6.0
1515
github.com/pkg/errors v0.9.1
16-
github.com/spf13/cobra v1.1.1
16+
github.com/spf13/cobra v1.2.1
1717
github.com/stretchr/testify v1.7.0
18-
golang.org/x/mod v0.4.1
18+
golang.org/x/mod v0.4.2
1919
gopkg.in/src-d/go-git.v4 v4.13.1
20-
k8s.io/apimachinery v0.20.1
20+
k8s.io/apimachinery v0.23.0
21+
sigs.k8s.io/controller-runtime v0.11.0
22+
)
23+
24+
require (
25+
github.com/beorn7/perks v1.0.1 // indirect
26+
github.com/blang/semver/v4 v4.0.0 // indirect
27+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
28+
github.com/davecgh/go-spew v1.1.1 // indirect
29+
github.com/emirpasic/gods v1.12.0 // indirect
30+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
31+
github.com/fsnotify/fsnotify v1.5.1 // indirect
32+
github.com/go-logr/zapr v1.2.0 // indirect
33+
github.com/gogo/protobuf v1.3.2 // indirect
34+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
35+
github.com/golang/protobuf v1.5.2 // indirect
36+
github.com/google/go-cmp v0.5.5 // indirect
37+
github.com/google/gofuzz v1.1.0 // indirect
38+
github.com/google/uuid v1.1.2 // indirect
39+
github.com/googleapis/gnostic v0.5.5 // indirect
40+
github.com/imdario/mergo v0.3.12 // indirect
41+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
42+
github.com/jaypipes/envutil v1.0.0 // indirect
43+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
44+
github.com/jmespath/go-jmespath v0.4.0 // indirect
45+
github.com/json-iterator/go v1.1.12 // indirect
46+
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
47+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
48+
github.com/mitchellh/go-homedir v1.1.0 // indirect
49+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
50+
github.com/modern-go/reflect2 v1.0.2 // indirect
51+
github.com/pmezard/go-difflib v1.0.0 // indirect
52+
github.com/prometheus/client_golang v1.11.0 // indirect
53+
github.com/prometheus/client_model v0.2.0 // indirect
54+
github.com/prometheus/common v0.28.0 // indirect
55+
github.com/prometheus/procfs v0.6.0 // indirect
56+
github.com/sergi/go-diff v1.0.0 // indirect
57+
github.com/sirupsen/logrus v1.8.1 // indirect
58+
github.com/spf13/pflag v1.0.5 // indirect
59+
github.com/src-d/gcfg v1.4.0 // indirect
60+
github.com/xanzy/ssh-agent v0.2.1 // indirect
61+
go.uber.org/atomic v1.7.0 // indirect
62+
go.uber.org/multierr v1.6.0 // indirect
63+
go.uber.org/zap v1.19.1 // indirect
64+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
65+
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
66+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
67+
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
68+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
69+
golang.org/x/text v0.3.7 // indirect
70+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
71+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
72+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
73+
google.golang.org/appengine v1.6.7 // indirect
74+
google.golang.org/protobuf v1.27.1 // indirect
75+
gopkg.in/inf.v0 v0.9.1 // indirect
76+
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
77+
gopkg.in/warnings.v0 v0.1.2 // indirect
78+
gopkg.in/yaml.v2 v2.4.0 // indirect
79+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
80+
k8s.io/api v0.23.0 // indirect
81+
k8s.io/apiextensions-apiserver v0.23.0 // indirect
82+
k8s.io/client-go v0.23.0 // indirect
83+
k8s.io/component-base v0.23.0 // indirect
84+
k8s.io/klog/v2 v2.30.0 // indirect
85+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
86+
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
87+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
88+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
89+
sigs.k8s.io/yaml v1.3.0 // indirect
2190
)

0 commit comments

Comments
 (0)