Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for IAM proxies for S3 #1484

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Add support for IAM proxies for S3 #1484

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dcde2ab
Add support for IAM proxies for S3, like Kube2IAM and KIAM by:
aaqel-s Nov 8, 2019
a5e3c2f
Fix go sum
aaqel-s Dec 5, 2019
12bdf26
Update chart version
aaqel-s Dec 5, 2019
003c58f
Add missing end in helm template
aaqel-s Dec 5, 2019
53d6bd0
Bump Chart version
aaqel-s Dec 6, 2019
1fb5af1
Merge branch 'master' into add-k8s-iam-support
arschles Dec 6, 2019
e2bd87f
Merge branch 'master' into add-k8s-iam-support
arschles Dec 13, 2019
083ed6a
Merge branch 'master' into add-k8s-iam-support
marwan-at-work Jan 20, 2020
ca8ec0a
Merge branch 'master' into add-k8s-iam-support
arschles Feb 19, 2020
950c826
Merge branch 'master' into add-k8s-iam-support
arschles Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/athens-proxy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: athens-proxy
version: 0.4.1
version: 0.4.3
appVersion: 0.7.0
description: The proxy server for Go modules
icon: https://raw.githubusercontent.com/gomods/athens/master/docs/static/banner.png
Expand Down
7 changes: 7 additions & 0 deletions charts/athens-proxy/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
checksum/upstream: {{ include (print $.Template.BasePath "/config-upstream.yaml") . | sha256sum }}
checksum/ssh-config: {{ include (print $.Template.BasePath "/config-ssh-git-servers.yaml") . | sha256sum }}
checksum/ssh-secret: {{ include (print $.Template.BasePath "/secret-ssh-git-servers.yaml") . | sha256sum }}
{{- if .Values.storage.s3.iamRole }}
iam.amazonaws.com/role: {{ .Values.storage.s3.iamRole | quote }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aaqel-s will a controller/operator need to be present in the cluster to detect this annotation?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, here's an example https://github.com/uswitch/kiam

{{- end }}
spec:
{{- if .Values.sshGitServers }}
initContainers:
Expand Down Expand Up @@ -104,6 +107,10 @@ spec:
- name: ATHENS_STORAGE_GCP_JSON_KEY
value: {{ .Values.storage.gcp.serviceAccount | b64enc | quote }}
{{- end }}
{{- if .Values.storage.s3.use_iam_proxy }}
- name: AWS_USE_IAM_PROXY
value: {{ .Values.storage.s3.use_iam_proxy | quote }}
{{- end }}
{{- else if eq .Values.storage.type "minio" }}
{{- if .Values.storage.minio.endpoint }}
- name: ATHENS_MINIO_ENDPOINT
Expand Down
Loading