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

Jump to bottom

Fix alpha helm chart installation #307

Merged
merged 5 commits into from
Nov 20, 2019
Merged

Fix alpha helm chart installation #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ddab92d
Fix alpha helm chart installation
Nov 20, 2019
5e1cb6f
Generate new 'setup-sumologic.yaml.tmpl'
Nov 20, 2019
c463256
Generate new overrides yaml file(s).
Nov 20, 2019
01358b4
Fix tlsProxy support for new prometheus operator version
Nov 20, 2019
f458b94
Generate new overrides yaml file(s).
Nov 20, 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
5 changes: 5 additions & 0 deletions deploy/helm/prometheus-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ alertmanager:
grafana:
enabled: false
defaultDashboardsEnabled: false
prometheusOperator:
admissionWebhooks:
enabled: false
tlsProxy:
enabled: false
prometheus:
additionalServiceMonitors:
- name: collection-sumologic
Expand Down
29 changes: 17 additions & 12 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sumologic:
setupEnabled: true

# If enabled, accessId and accessKey will be sourced from Secret Name given
# envFromSecret: sumo-api-secret
#envFromSecret: sumo-api-secret

# Sumo access ID
#accessId: ""
Expand All @@ -47,39 +47,39 @@ sumologic:
# ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security
#endpoint: ""

# Collector name
#collectorName: ""

# Cluster name
clusterName: "kubernetes"

setup:
clusterRole:
annotations:
helm.sh/hook: pre-install
helm.sh/hook-weight: 1
helm.sh/hook-weight: "1"
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
clusterRoleBinding:
annotations:
helm.sh/hook: pre-install
helm.sh/hook-weight: 2
helm.sh/hook-weight: "2"
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
configMap:
annotations:
helm.sh/hook: pre-install
helm.sh/hook-weight: 2
helm.sh/hook-weight: "2"
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
job:
annotations:
helm.sh/hook: pre-install
helm.sh/hook-weight: 3
helm.sh/hook-weight: "3"
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
serviceAccount:
annotations:
helm.sh/hook: pre-install
helm.sh/hook-weight: 0
helm.sh/hook-weight: "0"
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded

# Collector name
#collectorName: ""

# Cluster name
clusterName: "kubernetes"

# If enabled, collect K8s events
eventCollectionEnabled: true

Expand Down Expand Up @@ -291,6 +291,11 @@ prometheus-operator:
grafana:
enabled: false
defaultDashboardsEnabled: false
prometheusOperator:
admissionWebhooks:
enabled: false
tlsProxy:
enabled: false
prometheus:
additionalServiceMonitors:
- name: collection-sumologic
Expand Down
38 changes: 23 additions & 15 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,9 +7,10 @@ kind: ConfigMap
metadata:
name: collection-sumologic-setup
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook-weight": "2"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
helm.sh/hook-weight: "2"

labels:
app: collection-sumologic

Expand Down Expand Up @@ -174,12 +175,14 @@ kind: ServiceAccount
metadata:
name: collection-sumologic-setup
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook-weight": "0"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
helm.sh/hook-weight: "0"

labels:
app: collection-sumologic


---
# Source: sumologic/templates/setup/setup-clusterrole.yaml

Expand All @@ -188,9 +191,10 @@ kind: ClusterRole
metadata:
name: collection-sumologic-setup
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook-weight": "1"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
helm.sh/hook-weight: "1"

labels:
app: collection-sumologic

Expand All @@ -201,6 +205,7 @@ rules:
- secrets
- namespaces
verbs: ["get", "create", "describe", "patch"]

---
# Source: sumologic/templates/setup/setup-clusterrolebinding.yaml

Expand All @@ -209,9 +214,10 @@ kind: ClusterRoleBinding
metadata:
name: collection-sumologic-setup
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook-weight": "2"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
helm.sh/hook-weight: "2"

labels:
app: collection-sumologic

Expand All @@ -223,6 +229,7 @@ subjects:
- kind: ServiceAccount
name: collection-sumologic-setup
namespace: $NAMESPACE

---
# Source: sumologic/templates/setup/setup-job.yaml

Expand All @@ -232,9 +239,10 @@ metadata:
name: collection-sumologic-setup
namespace: $NAMESPACE
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook-weight": "3"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
helm.sh/hook-weight: "3"

labels:
app: collection-sumologic

Expand Down