Skip to content

feat(csc): release charts for csc v10.0.0 #165

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.

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

Merged
merged 1 commit into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions charts/collectorset-controller/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ maintainers:
- email: argus@logicmonitor.com
name: LogicMonitor
name: collectorset-controller
version: 9.3.0
version: 10.0.0
home: https://logicmonitor.github.io/helm-charts
appVersion: v11.2.0
appVersion: v12.0.0
dependencies:
- name: lmutil
repository: https://logicmonitor.github.io/helm-charts
Expand Down
9 changes: 9 additions & 0 deletions charts/collectorset-controller/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,15 @@ Argus proxy details or not, for this we're using Lookup function in helm.
secretKeyRef:
name: {{ include "lmutil.secret-name" . }}
key: account
- name: COMPANY_DOMAIN
{{- if and .Values.global.userDefinedSecret (or (not (hasKey $secretData "companyDomain")) (eq (get $secretData "companyDomain") "")) }}
value: "logicmonitor.com"
{{- else }}
valueFrom:
secretKeyRef:
name: {{ include "lmutil.secret-name" . }}
key: companyDomain
{{- end}}
{{- if $secretData.etcdDiscoveryToken }}
- name: ETCD_DISCOVERY_TOKEN
valueFrom:
Expand Down
1 change: 1 addition & 0 deletions charts/collectorset-controller/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ data:
accessID: {{ if .Values.accessID }} {{ .Values.accessID | b64enc }} {{ else }} {{ required "A valid .Values.accessID or .Values.global.accessID entry is required!" .Values.global.accessID | b64enc }} {{ end }}
accessKey: {{ if .Values.accessKey }} {{ .Values.accessKey | b64enc }} {{ else }} {{ required "A valid .Values.accessKey or .Values.global.accessKey entry is required!" .Values.global.accessKey | b64enc }} {{ end }}
account: {{ if .Values.account }} {{ .Values.account | b64enc }} {{ else }} {{ required "A valid .Values.account or .Values.global.account entry is required!" .Values.global.account | b64enc }} {{ end }}
companyDomain: {{ if not (empty .Values.global.companyDomain) }}{{ .Values.global.companyDomain | b64enc }}{{ else }}{{ "logicmonitor.com" | b64enc }}{{ end }}
etcdDiscoveryToken: {{ default "" .Values.etcdDiscoveryToken | b64enc | quote }}
{{- if .Values.proxy.user }}
proxyUser: {{ default "" .Values.proxy.user | b64enc }}
Expand Down
20 changes: 20 additions & 0 deletions charts/collectorset-controller/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"accessID": "",
"accessKey": "",
"account": "",
"companyDomain": "",
"collectorsetServiceNameSuffix": "",
"userDefinedSecret": "",
"proxy": {
Expand Down Expand Up @@ -103,6 +104,18 @@
""
]
},
"companyDomain": {
"$comment": "tf:optional",
"$id": "#/properties/companyDomain",
"type": "string",
"title": "The domain schema",
"description": "The Logicmonitor account domain",
"examples": [
"logicmonitor.com",
"qa-lmgov.us",
"lmgov.us"
]
},
"log": {
"$id": "#/properties/log",
"$comment": "tf:optional",
Expand Down Expand Up @@ -635,6 +648,13 @@
"type": "string",
"default": "",
"description": "User can provide LM credentials in a Secret instead of plain text. The secret should contain 'accessID', 'accessKey', 'account' along with optional params e.g. 'etcdDiscoveryToken', proxy credentials"
},
"companyDomain" : {
"$comment" : "tf:optional",
"$id" : "#/properties/global/properties/companyDomain",
"type" : "string",
"default": "",
"description" : "The Logicmonitor account domain"
}
}
},
Expand Down
1 change: 1 addition & 0 deletions charts/collectorset-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ global:
repository: ""
pullPolicy: Always
userDefinedSecret: ""
companyDomain: ""
imagePullSecrets: []

podSecurityContext: {}
Expand Down
Loading