-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #145 from owncloud/pepare-chart-3.0.0
adapt to ocis 3.0.0-alpha.1
- Loading branch information
Showing
19 changed files
with
651 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,4 @@ a| [subs=-attributes] | |
| +~1.25.0+ | ||
| a| [subs=-attributes] | ||
| +~1.24.0+ | ||
| a| [subs=-attributes] | ||
| +~1.23.0+ | ||
| |=== | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| {{- $_ := set . "appName" "eventhistory" -}} | ||
| {{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.eventhistory.resources) -}} | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{ .appName }} | ||
| namespace: {{ template "ocis.namespace" . }} | ||
| labels: | ||
| {{- include "ocis.labels" . | nindent 4 }} | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| app: {{ .appName }} | ||
| replicas: 1 | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: {{ .appName }} | ||
| {{- include "ocis.labels" . | nindent 8 }} | ||
| spec: | ||
| securityContext: | ||
| fsGroup: {{ .Values.securityContext.fsGroup }} | ||
| fsGroupChangePolicy: {{ .Values.securityContext.fsGroupChangePolicy }} | ||
| {{- with .Values.topologySpreadConstraints }} | ||
| topologySpreadConstraints: | ||
| {{- tpl . $ | nindent 8 }} | ||
| {{- end }} | ||
| containers: | ||
| - name: {{ .appName }} | ||
| image: {{ template "ocis.image" $ }} | ||
| imagePullPolicy: {{ .Values.image.pullPolicy }} | ||
| command: ["ocis"] | ||
| args: ["eventhistory", "server"] | ||
| securityContext: | ||
| runAsNonRoot: true | ||
| runAsUser: {{ .Values.securityContext.runAsUser }} | ||
| runAsGroup: {{ .Values.securityContext.runAsGroup }} | ||
| readOnlyRootFilesystem: true | ||
| env: | ||
| - name: MICRO_REGISTRY | ||
| value: kubernetes | ||
|
|
||
| - name: EVENTHISTORY_LOG_COLOR | ||
| value: {{ .Values.logging.color | quote }} | ||
| - name: EVENTHISTORY_LOG_LEVEL | ||
| value: {{ .Values.logging.level | quote }} | ||
| - name: EVENTHISTORY_LOG_PRETTY | ||
| value: {{ .Values.logging.pretty | quote }} | ||
|
|
||
| - name: EVENTHISTORY_DEBUG_PPROF | ||
| value: {{ .Values.debug.profiling | quote }} | ||
|
|
||
| - name: EVENTHISTORY_GRPC_ADDR | ||
| value: 0.0.0.0:8080 | ||
| # - name: EVENTHISTORY_DEBUG_ADDR | ||
| # value: 0.0.0.0:8081 | ||
|
|
||
| # - name: EVENTHISTORY_STORE_TYPE | ||
| # value: "mem" # TODO | ||
| # - name: EVENTHISTORY_STORE_ADDRESSES | ||
| # value: "nats:9233" # TODO | ||
|
|
||
| - name: EVENTHISTORY_EVENTS_ENDPOINT | ||
| {{- if not .Values.messagingSystem.external.enabled }} | ||
| value: nats:9233 | ||
| {{- else }} | ||
| value: {{ .Values.messagingSystem.external.endpoint | quote }} | ||
| - name: EVENTHISTORY_EVENTS_CLUSTER | ||
| value: {{ .Values.messagingSystem.external.cluster | quote }} | ||
| - name: EVENTHISTORY_EVENTS_ENABLE_TLS | ||
| value: {{ .Values.messagingSystem.external.tls.enabled | quote }} | ||
| - name: EVENTHISTORY_EVENTS_TLS_INSECURE | ||
| value: {{ .Values.messagingSystem.external.tls.insecure | quote }} | ||
| - name: EVENTHISTORY_EVENTS_TLS_ROOT_CA_CERTIFICATE | ||
| {{- if not .Values.messagingSystem.external.tls.certTrusted }} | ||
| value: /etc/ocis/messaging-system-ca/messaging-system-ca.crt | ||
| {{- else }} | ||
| value: "" # no cert needed | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| # TODO: This service does not currently provide a debug port, re-enable this once that is implemented | ||
| # See: https://github.com/owncloud/ocis-charts/issues/111 | ||
| # livenessProbe: | ||
| # httpGet: | ||
| # path: /healthz | ||
| # port: metrics-debug | ||
| # timeoutSeconds: 10 | ||
| # initialDelaySeconds: 60 | ||
| # periodSeconds: 20 | ||
| # failureThreshold: 3 | ||
|
|
||
| resources: {{ toYaml .resources | nindent 12 }} | ||
|
|
||
| ports: | ||
| - name: grpc | ||
| containerPort: 8080 | ||
| # TODO: This service does not currently provide a debug port, re-enable this once that is implemented | ||
| # - name: metrics-debug | ||
| # containerPort: 8081 | ||
|
|
||
| volumeMounts: | ||
| - name: ocis-config-tmp | ||
| mountPath: /etc/ocis # we mount that volume only to apply fsGroup to that path | ||
| - name: messaging-system-ca | ||
| mountPath: /etc/ocis/messaging-system-ca | ||
| readOnly: true | ||
|
|
||
| volumes: | ||
| - name: ocis-config-tmp | ||
| emptyDir: {} | ||
| - name: messaging-system-ca | ||
| {{ if and (.Values.messagingSystem.external.enabled) (not .Values.messagingSystem.external.tls.certTrusted) }} | ||
| secret: | ||
| secretName: {{ .Values.secretRefs.messagingSystemCaRef }} | ||
| {{ else }} | ||
| emptyDir: {} | ||
| {{ end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| {{- $_ := set . "appName" "eventhistory" -}} | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: {{ .appName }} | ||
| namespace: {{ template "ocis.namespace" . }} | ||
| labels: | ||
| app: {{ .appName }} | ||
| ocis-metrics: enabled | ||
| {{- include "ocis.labels" . | nindent 4 }} | ||
| spec: | ||
| selector: | ||
| app: {{ .appName }} | ||
| ports: | ||
| - name: grpc | ||
| port: 8080 | ||
| protocol: TCP | ||
| # - name: metrics-debug | ||
| # port: 8081 | ||
| # protocol: TCP |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,5 +19,4 @@ spec: | |
| - name: metrics-debug | ||
| port: 9134 | ||
| protocol: TCP | ||
|
|
||
| {{- end }} | ||
Oops, something went wrong.