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

Bump Dockerfile Sumo TF provider to 2.0.0 #282

Merged
merged 4 commits into from
Nov 9, 2019
Merged

Bump Dockerfile Sumo TF provider to 2.0.0 #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d58d314
Bump Dockerfile Sumo TF provider to 2.0.0
Nov 8, 2019
2f182d0
Generate new 'setup-sumologic.yaml.tmpl'
Nov 8, 2019
608dfe7
No longer require endpoint URL
Nov 8, 2019
8c63771
Merge branch 'rmiller-bump-dockerfile-tf-provider' of github.com:Sumo…
Nov 8, 2019
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 deploy/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ RUN mkdir /tmp/terraform && \
rm -rf /tmp/terraform

# Install sumologic provider and Kubernetes provider
ENV SUMO_PROVIDER_VERSION 1.3.0
ENV SUMO_PROVIDER_VERSION 2.0.0
ENV KUBERNETES_PROVIDER_VERSION 1.9.0
RUN mkdir -p /terraform && \
cd /terraform && \
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/templates/setup/setup-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ spec:
- name: SUMOLOGIC_ACCESSKEY
value: {{ required "A valid .Values.sumologic.accessKey entry required!" .Values.sumologic.accessKey }}
- name: SUMOLOGIC_BASE_URL
value: {{ required "A valid .Values.sumologic.endpoint entry required!" .Values.sumologic.endpoint }}
value: {{ .Values.sumologic.endpoint }}
{{- end }}
10 changes: 5 additions & 5 deletions deploy/kubernetes/setup-sumologic.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ kind: ConfigMap
metadata:
name: collection-sumologic-setup
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook": pre-install,pre-upgrade
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think these generated changes were missed in #281 which may have been built using an older master with older build.sh script

"helm.sh/hook-weight": "2"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
labels:
Expand Down Expand Up @@ -173,7 +173,7 @@ kind: ServiceAccount
metadata:
name: collection-sumologic-setup
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "0"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
labels:
Expand All @@ -187,7 +187,7 @@ kind: ClusterRole
metadata:
name: collection-sumologic-setup
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "1"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
labels:
Expand All @@ -208,7 +208,7 @@ kind: ClusterRoleBinding
metadata:
name: collection-sumologic-setup
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "2"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
labels:
Expand All @@ -231,7 +231,7 @@ metadata:
name: collection-sumologic-setup
namespace: $NAMESPACE
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-weight": "3"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
labels:
Expand Down