Skip to content

fix #6 by removing wrong conditions #7

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

Open
brightdroid wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix #6 by removing wrong conditions #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions templates/puppetserver-deployment-compilers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ spec:
- exec /opt/puppetlabs/bin/puppetserver foreground
{{- end }}
env:
{{- if not .Values.global.runAsNonRoot }}
# necessary to set certname and server in puppet.conf, required by
# puppetserver ca cli application
{{- if .Values.singleCA.enabled }}
Expand All @@ -233,7 +232,6 @@ spec:
value: "{{ template "puppetserver.puppetserver-masters.serviceName" . }}"
- name: CA_PORT
value: "{{ template "puppetserver.puppetserver-masters.port" . }}"
{{- end }}
{{- range $key, $value := .Values.global.extraEnv }}
- name: {{ $key }}
value: "{{ $value }}"
Expand All @@ -255,7 +253,7 @@ spec:
httpGet:
path: /status/v1/simple
port: {{ template "puppetserver.puppetserver-compilers.port" . }}
scheme: {{ .Values.puppetserver.compilers.readinessProbeScheme }}
scheme: {{ .Values.puppetserver.compilers.readinessProbeScheme }}
periodSeconds: {{ .Values.puppetserver.compilers.readinessProbePeriodSeconds }}
timeoutSeconds: {{ .Values.puppetserver.compilers.readinessProbeTimeout }}
failureThreshold: {{ .Values.puppetserver.compilers.readinessProbeFailureThreshold }}
Expand Down Expand Up @@ -447,7 +445,7 @@ spec:
- name: puppet-puppet-storage
mountPath: /etc/puppetlabs/puppet/
readinessProbe:
exec:
exec:
command: ["/bin/sh", "-ec", "test -f {{ .Values.r10k.hiera.cronJob.successFile }}"]
failureThreshold: 2
initialDelaySeconds: 5
Expand Down Expand Up @@ -553,7 +551,7 @@ spec:
{{- with .Values.puppetserver.compilers.extraContainers }}
{{- toYaml . | nindent 8 }}
{{- end }}

{{- if .Values.singleCA.puppetdb.overrideHostname }}
{{- $service := lookup "v1" "Service" .Release.Namespace (include "puppetdb.fullname" . ) }}
hostAliases:
Expand Down
4 changes: 1 addition & 3 deletions templates/puppetserver-deployment-masters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ spec:
- exec /opt/puppetlabs/bin/puppetserver foreground
{{- end }}
env:
{{- if not .Values.global.runAsNonRoot }}
- name: OPENVOXSERVER_HOSTNAME
value: puppet
# necessary to set certname and server in puppet.conf, required by
Expand All @@ -256,7 +255,6 @@ spec:
value: https://{{ if .Values.singleCA.enabled}}{{.Values.singleCA.puppetdb.overrideHostname}}{{else }}{{ ( include "puppetdb.fullname" . ) }}{{end}}:8081
- name: CA_ALLOW_SUBJECT_ALT_NAMES
value: "true"
{{- end }}
{{- range $key, $value := .Values.global.extraEnv }}
- name: {{ $key }}
value: "{{ $value }}"
Expand All @@ -278,7 +276,7 @@ spec:
httpGet:
path: /status/v1/simple
port: {{ template "puppetserver.puppetserver-masters.port" .}}
scheme: {{ .Values.puppetserver.masters.readinessProbeScheme }}
scheme: {{ .Values.puppetserver.masters.readinessProbeScheme }}
periodSeconds: {{ .Values.puppetserver.masters.readinessProbePeriodSeconds }}
timeoutSeconds: {{ .Values.puppetserver.masters.readinessProbeTimeout }}
failureThreshold: {{ .Values.puppetserver.masters.readinessProbeFailureThreshold }}
Expand Down