Skip to content

Commit

Permalink
Update ACK runtime to v0.16.0 (#61)
Browse files Browse the repository at this point in the history
### Update ACK runtime to `v0.16.0`

----------
NOTE:
This PR increments the release version of service controller from `v0.0.7` to `v0.0.8`

Once this PR is merged, release `v0.0.8` will be automatically created for `s3-controller`

**Please close this PR, if you do not want the new patch release for `s3-controller`**

----------

#### stdout for `make build-controller`:

```
building ack-generate ... ok.
==== building s3-controller ====
Copying common custom resource definitions into s3
Building Kubernetes API objects for s3
Generating deepcopy code for s3
Generating custom resource definitions for s3
Building service controller for s3
Generating RBAC manifests for s3
Running gofmt against generated code for s3
Updating additional GitHub repository maintenance files
==== building s3-controller release artifacts ====
Building release artifacts for s3-v0.0.8
Generating common custom resource definitions
Generating custom resource definitions for s3
Generating RBAC manifests for s3
```

----------

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
  • Loading branch information
ack-bot authored Jan 10, 2022
1 parent 09fdd2a commit d8b7ab6
Show file tree
Hide file tree
Showing 12 changed files with 1,110 additions and 266 deletions.
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2021-11-23T23:59:02Z"
build_hash: 966e9a9ac6dfb4bbc2d3ded1972ce2b706391d44
go_version: go1.17.1
version: v0.15.2
build_date: "2022-01-07T21:01:01Z"
build_hash: 3e184727de8a4dfd4769e3d88f4f52f885858335
go_version: go1.17.5
version: v0.16.0
api_directory_checksum: 3cc5d56eb9770025b494d6a41eb40f45e27cc9b1
api_version: v1alpha1
aws_sdk_go_version: v1.37.10
Expand Down
11 changes: 11 additions & 0 deletions config/controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,15 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
securityContext:
allowPrivilegeEscalation: false
privileged: false
runAsNonRoot: true
runAsUser: 1000
capabilities:
drop:
- ALL
terminationGracePeriodSeconds: 10
hostIPC: false
hostNetwork: false
hostPID: false
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.0
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: adoptedresources.services.k8s.aws
spec:
Expand Down
69 changes: 61 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,68 @@
module github.com/aws-controllers-k8s/s3-controller

go 1.14
go 1.17

require (
github.com/aws-controllers-k8s/runtime v0.15.2
github.com/aws-controllers-k8s/runtime v0.16.0
github.com/aws/aws-sdk-go v1.37.10
github.com/go-logr/logr v0.1.0
github.com/go-logr/logr v1.2.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.5.1
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.6
k8s.io/client-go v0.18.2
sigs.k8s.io/controller-runtime v0.6.0
github.com/stretchr/testify v1.7.0
k8s.io/api v0.23.0
k8s.io/apimachinery v0.23.0
k8s.io/client-go v0.23.0
sigs.k8s.io/controller-runtime v0.11.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/zapr v1.2.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/jaypipes/envutil v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/stretchr/objx v0.2.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.23.0 // indirect
k8s.io/component-base v0.23.0 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
955 changes: 724 additions & 231 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: s3-chart
description: A Helm chart for the ACK service controller for Amazon Simple Storage Service (S3)
version: v0.0.7
appVersion: v0.0.7
version: v0.0.8
appVersion: v0.0.8
home: https://github.com/aws-controllers-k8s/s3-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
20 changes: 20 additions & 0 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,25 @@ spec:
value: {{ .Values.log.level | quote }}
- name: ACK_RESOURCE_TAGS
value: {{ join "," .Values.resourceTags | quote }}
securityContext:
allowPrivilegeEscalation: false
privileged: false
runAsNonRoot: true
runAsUser: 1000
capabilities:
drop:
- ALL
terminationGracePeriodSeconds: 10
nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}
{{ if .Values.deployment.tolerations -}}
tolerations: {{ toYaml .Values.deployment.tolerations | nindent 8 }}
{{ end -}}
{{ if .Values.deployment.affinity -}}
affinity: {{ toYaml .Values.deployment.affinity | nindent 8 }}
{{ end -}}
{{ if .Values.deployment.priorityClassName -}}
priorityClassName: {{ .Values.deployment.priorityClassName -}}
{{ end -}}
hostIPC: false
hostNetwork: false
hostPID: false
211 changes: 211 additions & 0 deletions helm/values.schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
{
"$schema": "https://json-schema.org/draft-07/schema#",
"properties": {
"image": {
"description": "Container Image",
"properties": {
"repository": {
"type": "string",
"minLength": 1
},
"tag": {
"type": "string",
"minLength": 1
},
"pullPolicy": {
"type": "string",
"enum": ["IfNotPresent", "Always", "Never"]
},
"pullSecrets": {
"type": "array"
}
},
"required": [
"repository",
"tag",
"pullPolicy"
],
"type": "object"
},
"nameOverride": {
"type": "string"
},
"fullNameOverride": {
"type": "string"
},
"deployment": {
"description": "Deployment settings",
"properties": {
"annotations": {
"type": "object"
},
"labels": {
"type": "object"
},
"containerPort": {
"type": "integer",
"minimum": 1,
"maximum": 65535
},
"nodeSelector": {
"type": "object"
},
"tolerations": {
"type": "object"
},
"affinity": {
"type": "object"
},
"priorityClassName": {
"type": "string"
}
},
"required": [
"containerPort"
],
"type": "object"
},
"metrics": {
"description": "Metrics settings",
"properties": {
"service": {
"description": "Kubernetes service settings",
"properties": {
"create": {
"type": "boolean"
},
"type": {
"type": "string",
"enum": ["ClusterIP", "NodePort", "LoadBalancer", "ExternalName"]
}
},
"required": [
"create",
"type"
],
"type": "object"
}
},
"required": [
"service"
],
"type": "object"
},
"resources": {
"description": "Kubernetes resources settings",
"properties": {
"requests": {
"description": "Kubernetes resource requests",
"properties": {
"memory": {
"oneOf": [
{ "type": "number" },
{ "type": "string" }
]
},
"cpu": {
"oneOf": [
{ "type": "number" },
{ "type": "string" }
]
}
},
"required": [
"memory",
"cpu"
],
"type": "object"
},
"limits": {
"description": "Kubernetes resource limits",
"properties": {
"memory": {
"oneOf": [
{ "type": "number" },
{ "type": "string" }
]
},
"cpu": {
"oneOf": [
{ "type": "number" },
{ "type": "string" }
]
}
},
"required": [
"memory",
"cpu"
],
"type": "object"
}
},
"required": [
"requests",
"limits"
],
"type": "object"
},
"aws": {
"description": "AWS API settings",
"properties": {
"region": {
"type": "string"
},
"endpoint": {
"type": "string"
}
},
"type": "object"
},
"log": {
"description": "Logging settings",
"properties": {
"enable_development_logging": {
"type": "boolean"
},
"level": {
"type": "string"
}
},
"type": "object"
},
"installScope": {
"type": "string",
"enum": ["cluster", "namespace"]
},
"resourceTags": {
"type": "array",
"items": {
"type": "string",
"pattern": "^.*=.*$"
}
},
"serviceAccount": {
"description": "ServiceAccount settings",
"properties": {
"create": {
"type": "boolean"
},
"name": {
"type": "string"
},
"annotations": {
"type": "object"
}
},
"type": "object"
}
},
"required": [
"image",
"deployment",
"metrics",
"resources",
"log",
"installScope",
"resourceTags",
"serviceAccount"
],
"title": "Values",
"type": "object"
}
15 changes: 13 additions & 2 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/s3-controller
tag: v0.0.7
tag: v0.0.8
pullPolicy: IfNotPresent
pullSecrets: []

Expand All @@ -15,9 +15,20 @@ deployment:
annotations: {}
labels: {}
containerPort: 8080
# Which nodeSelector to set?
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
nodeSelector:
kubernetes.io/os: linux

# Which tolerations to set?
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
tolerations: {}
# What affinity to set?
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
affinity: {}
# Which priorityClassName to set?
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
priorityClassName: ""

metrics:
service:
# Set to true to automatically create a Kubernetes Service resource for the
Expand Down
Loading

0 comments on commit d8b7ab6

Please sign in to comment.