You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/11/05 21:47:42 UTC
[sling-org-apache-sling-app-cms] branch master updated (6ab4cfe ->
8f0c29e)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from 6ab4cfe Adding initial helm configuration
new 525373d Adding license headers
new 983d57f Making the proxied URLs configurable
new 45b7f36 Fixing to use a specific port
new 8f0c29e Fixing live / ready checks to not time out too soon
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Chart.yaml | 23 ----------
docker/docker-compose.yml | 6 ++-
docker/webcache/cms.conf | 5 ++-
docker/webcache/site.conf | 10 +++--
helm/slingcms-standalone/.helmignore | 17 ++++++++
helm/slingcms-standalone/Chart.yaml | 14 +++++++
helm/slingcms-standalone/README.md | 19 +++++++++
helm/slingcms-standalone/templates/NOTES.txt | 16 +++++++
helm/slingcms-standalone/templates/_helpers.tpl | 16 +++++++
helm/slingcms-standalone/templates/deployment.yaml | 43 ++++++++++++++++++-
helm/slingcms-standalone/templates/ingress.yaml | 16 +++++++
.../templates/persistentvolumeclaim.yaml | 16 +++++++
helm/slingcms-standalone/templates/service.yaml | 18 +++++++-
.../templates/serviceaccount.yaml | 16 +++++++
.../templates/tests/test-connection.yaml | 16 +++++++
helm/slingcms-standalone/values.yaml | 49 ++++++++++++++++++++++
16 files changed, 268 insertions(+), 32 deletions(-)
delete mode 100644 Chart.yaml
[sling-org-apache-sling-app-cms] 02/04: Making the proxied URLs
configurable
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 983d57f027dd6e4a5e14875c015f61491a244652
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Nov 5 16:46:02 2020 -0500
Making the proxied URLs configurable
---
docker/docker-compose.yml | 6 +++++-
docker/webcache/cms.conf | 5 +++--
docker/webcache/site.conf | 10 ++++++----
helm/slingcms-standalone/templates/deployment.yaml | 5 +++++
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a50a1c1..1c75929 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,7 +30,11 @@ services:
volumes:
- sling-renderer:/opt/slingcms/launcher/composite/repository-global
webcache:
- build: webcache
+ environment:
+ AUTHOR_URL: author
+ RENDERER_URL: renderer
+ build:
+ context: webcache
ports:
- "80:80"
volumes:
diff --git a/docker/webcache/cms.conf b/docker/webcache/cms.conf
index f0af36e..b0accd1 100644
--- a/docker/webcache/cms.conf
+++ b/docker/webcache/cms.conf
@@ -17,7 +17,8 @@
ErrorLog /var/log/apache2/sling-cms-err.log
TransferLog /var/log/apache2/sling-cms-access.log
+ ProxyPassInterpolateEnv On
ProxyPass /.well-known !
- ProxyPass / http://author:8080/
- ProxyPassReverse / http://author:8080/
+ ProxyPass / http://${AUTHOR_URL}:8080/ interpolate
+ ProxyPassReverse / http://${AUTHOR_URL}:8080/ interpolate
</VirtualHost>
diff --git a/docker/webcache/site.conf b/docker/webcache/site.conf
index 1949259..549cc95 100644
--- a/docker/webcache/site.conf
+++ b/docker/webcache/site.conf
@@ -17,6 +17,7 @@
DocumentRoot /var/www/vhosts/sling
ErrorLog /var/log/apache2/sling-err.log
TransferLog /var/log/apache2/sling-access.log
+ DirectoryIndex index.html
# Configure mod_cache
CacheEnable disk /
@@ -37,12 +38,13 @@
ExpiresByType application/javascript "access plus 1 month"
# Configure Proxy
+ ProxyPassInterpolateEnv On
ProxyPass /.well-known !
ProxyPass /ERROR !
- ProxyPass /static/clientlibs/reference/ http://renderer:8080/static/clientlibs/reference/ connectiontimeout=10 timeout=60 retry=0
- ProxyPassReverse /static/clientlibs/reference/ http://renderer:8080/static/clientlibs/reference/
- ProxyPass / http://renderer:8080/content/apache/sling-apache-org/ connectiontimeout=10 timeout=60 retry=0
- ProxyPassReverse /content/apache/sling-apache-org/ http://renderer:8080/content/apache/sling-apache-org/
+ ProxyPass /static/clientlibs/reference/ http://${RENDERER_URL}:8080/static/clientlibs/reference/ connectiontimeout=10 timeout=60 retry=0 interpolate
+ ProxyPassReverse /static/clientlibs/reference/ http://${RENDERER_URL}:8080/static/clientlibs/reference/ interpolate
+ ProxyPass / http://${RENDERER_URL}:8080/content/apache/sling-apache-org/ connectiontimeout=10 timeout=60 retry=0 interpolate
+ ProxyPassReverse /content/apache/sling-apache-org/ http://${RENDERER_URL}:8080/content/apache/sling-apache-org/ interpolate
# Security / Hardening
AllowEncodedSlashes on
diff --git a/helm/slingcms-standalone/templates/deployment.yaml b/helm/slingcms-standalone/templates/deployment.yaml
index 38ddc60..0857c30 100644
--- a/helm/slingcms-standalone/templates/deployment.yaml
+++ b/helm/slingcms-standalone/templates/deployment.yaml
@@ -68,6 +68,11 @@ spec:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.web.repository }}:{{ .Values.image.web.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.web.pullPolicy }}
+ env:
+ - name: AUTHOR_URL
+ value: localhost
+ - name: RENDERER_URL
+ value: localhost
ports:
- name: http
containerPort: 80
[sling-org-apache-sling-app-cms] 01/04: Adding license headers
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 525373df08a48829cd2191d3056c07e2286b67aa
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Nov 5 16:44:50 2020 -0500
Adding license headers
---
Chart.yaml | 23 ----------------------
helm/slingcms-standalone/.helmignore | 17 ++++++++++++++++
helm/slingcms-standalone/Chart.yaml | 14 +++++++++++++
helm/slingcms-standalone/README.md | 19 ++++++++++++++++++
helm/slingcms-standalone/templates/NOTES.txt | 16 +++++++++++++++
helm/slingcms-standalone/templates/_helpers.tpl | 16 +++++++++++++++
helm/slingcms-standalone/templates/deployment.yaml | 16 +++++++++++++++
helm/slingcms-standalone/templates/ingress.yaml | 16 +++++++++++++++
.../templates/persistentvolumeclaim.yaml | 16 +++++++++++++++
helm/slingcms-standalone/templates/service.yaml | 16 +++++++++++++++
.../templates/serviceaccount.yaml | 16 +++++++++++++++
.../templates/tests/test-connection.yaml | 16 +++++++++++++++
helm/slingcms-standalone/values.yaml | 17 ++++++++++++++++
13 files changed, 195 insertions(+), 23 deletions(-)
diff --git a/Chart.yaml b/Chart.yaml
deleted file mode 100644
index 2c9cc6c..0000000
--- a/Chart.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: v2
-name: slingcms
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16.0
diff --git a/helm/slingcms-standalone/.helmignore b/helm/slingcms-standalone/.helmignore
index 0e8a0eb..3f5000e 100644
--- a/helm/slingcms-standalone/.helmignore
+++ b/helm/slingcms-standalone/.helmignore
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
diff --git a/helm/slingcms-standalone/Chart.yaml b/helm/slingcms-standalone/Chart.yaml
index e44bb67..c96b592 100644
--- a/helm/slingcms-standalone/Chart.yaml
+++ b/helm/slingcms-standalone/Chart.yaml
@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
apiVersion: v2
name: slingcms-standalone
description: A Helm chart for Kubernetes
diff --git a/helm/slingcms-standalone/README.md b/helm/slingcms-standalone/README.md
index db7cbc6..0730da7 100644
--- a/helm/slingcms-standalone/README.md
+++ b/helm/slingcms-standalone/README.md
@@ -1,3 +1,22 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+
# Apache Sling CMS Standalone Helm Chart
A Helm template for running Apache Sling CMS as a standalone instance in Kubernetes.
diff --git a/helm/slingcms-standalone/templates/NOTES.txt b/helm/slingcms-standalone/templates/NOTES.txt
index 18bc230..98d353e 100644
--- a/helm/slingcms-standalone/templates/NOTES.txt
+++ b/helm/slingcms-standalone/templates/NOTES.txt
@@ -1,3 +1,19 @@
+{{- /*
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range $host := .Values.ingress.hosts }}
diff --git a/helm/slingcms-standalone/templates/_helpers.tpl b/helm/slingcms-standalone/templates/_helpers.tpl
index c9d2ce0..900d5fa 100644
--- a/helm/slingcms-standalone/templates/_helpers.tpl
+++ b/helm/slingcms-standalone/templates/_helpers.tpl
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
{{/*
Expand the name of the chart.
*/}}
diff --git a/helm/slingcms-standalone/templates/deployment.yaml b/helm/slingcms-standalone/templates/deployment.yaml
index af81b26..38ddc60 100644
--- a/helm/slingcms-standalone/templates/deployment.yaml
+++ b/helm/slingcms-standalone/templates/deployment.yaml
@@ -1,3 +1,19 @@
+{{- /*
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
apiVersion: apps/v1
kind: Deployment
metadata:
diff --git a/helm/slingcms-standalone/templates/ingress.yaml b/helm/slingcms-standalone/templates/ingress.yaml
index bd3d413..0850847 100644
--- a/helm/slingcms-standalone/templates/ingress.yaml
+++ b/helm/slingcms-standalone/templates/ingress.yaml
@@ -1,3 +1,19 @@
+{{- /*
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "slingcms-standalone.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
diff --git a/helm/slingcms-standalone/templates/persistentvolumeclaim.yaml b/helm/slingcms-standalone/templates/persistentvolumeclaim.yaml
index 6b0bce7..7e68b1f 100644
--- a/helm/slingcms-standalone/templates/persistentvolumeclaim.yaml
+++ b/helm/slingcms-standalone/templates/persistentvolumeclaim.yaml
@@ -1,3 +1,19 @@
+{{- /*
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
diff --git a/helm/slingcms-standalone/templates/service.yaml b/helm/slingcms-standalone/templates/service.yaml
index ebea78d..fa2fa5a 100644
--- a/helm/slingcms-standalone/templates/service.yaml
+++ b/helm/slingcms-standalone/templates/service.yaml
@@ -1,3 +1,19 @@
+{{- /*
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
apiVersion: v1
kind: Service
metadata:
diff --git a/helm/slingcms-standalone/templates/serviceaccount.yaml b/helm/slingcms-standalone/templates/serviceaccount.yaml
index a2ba57c..0889606 100644
--- a/helm/slingcms-standalone/templates/serviceaccount.yaml
+++ b/helm/slingcms-standalone/templates/serviceaccount.yaml
@@ -1,3 +1,19 @@
+{{- /*
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
{{- if .Values.serviceAccount.create -}}
apiVersion: v1
kind: ServiceAccount
diff --git a/helm/slingcms-standalone/templates/tests/test-connection.yaml b/helm/slingcms-standalone/templates/tests/test-connection.yaml
index cd2a48b..9e515b9 100644
--- a/helm/slingcms-standalone/templates/tests/test-connection.yaml
+++ b/helm/slingcms-standalone/templates/tests/test-connection.yaml
@@ -1,3 +1,19 @@
+{{- /*
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
apiVersion: v1
kind: Pod
metadata:
diff --git a/helm/slingcms-standalone/values.yaml b/helm/slingcms-standalone/values.yaml
index ac25fd4..5f89b39 100644
--- a/helm/slingcms-standalone/values.yaml
+++ b/helm/slingcms-standalone/values.yaml
@@ -1,3 +1,20 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
# Default values for slingcms.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
[sling-org-apache-sling-app-cms] 04/04: Fixing live / ready checks
to not time out too soon
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 8f0c29e094b69695c1edc6eb01bd110d12509be7
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Nov 5 16:47:29 2020 -0500
Fixing live / ready checks to not time out too soon
---
helm/slingcms-standalone/templates/deployment.yaml | 22 ++++++++++++++-
helm/slingcms-standalone/values.yaml | 32 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/helm/slingcms-standalone/templates/deployment.yaml b/helm/slingcms-standalone/templates/deployment.yaml
index 0857c30..cfe95b4 100644
--- a/helm/slingcms-standalone/templates/deployment.yaml
+++ b/helm/slingcms-standalone/templates/deployment.yaml
@@ -54,10 +54,20 @@ spec:
containerPort: 8080
protocol: TCP
livenessProbe:
+ initialDelaySeconds: {{ .Values.livenessProbe.cms.initialDelaySeconds }}
+ periodSeconds: {{ .Values.livenessProbe.cms.periodSeconds }}
+ timeoutSeconds: {{ .Values.livenessProbe.cms.timeoutSeconds }}
+ successThreshold: {{ .Values.livenessProbe.cms.successThreshold }}
+ failureThreshold: {{ .Values.livenessProbe.cms.failureThreshold }}
httpGet:
path: /system/health
port: http
readinessProbe:
+ initialDelaySeconds: {{ .Values.readinessProbe.cms.initialDelaySeconds }}
+ periodSeconds: {{ .Values.readinessProbe.cms.periodSeconds }}
+ timeoutSeconds: {{ .Values.readinessProbe.cms.timeoutSeconds }}
+ successThreshold: {{ .Values.readinessProbe.cms.successThreshold }}
+ failureThreshold: {{ .Values.readinessProbe.cms.failureThreshold }}
httpGet:
path: /system/health
port: http
@@ -78,10 +88,20 @@ spec:
containerPort: 80
protocol: TCP
livenessProbe:
+ initialDelaySeconds: {{ .Values.livenessProbe.web.initialDelaySeconds }}
+ periodSeconds: {{ .Values.livenessProbe.web.periodSeconds }}
+ timeoutSeconds: {{ .Values.livenessProbe.web.timeoutSeconds }}
+ successThreshold: {{ .Values.livenessProbe.web.successThreshold }}
+ failureThreshold: {{ .Values.livenessProbe.web.failureThreshold }}
httpGet:
path: /
port: http
readinessProbe:
+ initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+ periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+ timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+ successThreshold: {{ .Values.readinessProbe.successThreshold }}
+ failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
httpGet:
path: /
port: http
@@ -98,4 +118,4 @@ spec:
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- end }}
\ No newline at end of file
diff --git a/helm/slingcms-standalone/values.yaml b/helm/slingcms-standalone/values.yaml
index 5f89b39..1243fda 100644
--- a/helm/slingcms-standalone/values.yaml
+++ b/helm/slingcms-standalone/values.yaml
@@ -33,6 +33,38 @@ image:
# Overrides the image tag whose default is the chart appVersion.
tag: 0.16.3-snapshot
+
+livenessProbe:
+ cms:
+ enabled: true
+ initialDelaySeconds: 120
+ periodSeconds: 5
+ timeoutSeconds: 5
+ failureThreshold: 24
+ successThreshold: 1
+ web:
+ enabled: true
+ initialDelaySeconds: 60
+ periodSeconds: 10
+ timeoutSeconds: 5
+ failureThreshold: 6
+ successThreshold: 1
+readinessProbe:
+ cms:
+ enabled: true
+ initialDelaySeconds: 120
+ periodSeconds: 5
+ timeoutSeconds: 5
+ failureThreshold: 24
+ successThreshold: 1
+ web:
+ enabled: true
+ initialDelaySeconds: 30
+ periodSeconds: 10
+ timeoutSeconds: 5
+ failureThreshold: 6
+ successThreshold: 1
+
resources:
cms:
requests:
[sling-org-apache-sling-app-cms] 03/04: Fixing to use a specific
port
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 45b7f36062ca6c617cf02648c39a34da7fe32d09
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Nov 5 16:46:39 2020 -0500
Fixing to use a specific port
---
helm/slingcms-standalone/templates/service.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helm/slingcms-standalone/templates/service.yaml b/helm/slingcms-standalone/templates/service.yaml
index fa2fa5a..0f4a928 100644
--- a/helm/slingcms-standalone/templates/service.yaml
+++ b/helm/slingcms-standalone/templates/service.yaml
@@ -24,7 +24,7 @@ spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
- targetPort: http
+ targetPort: 80
protocol: TCP
name: http
selector: