Synchronize upstreamed folder to 36e3128

upstreamed/magento/Chart.yaml

@@ -1,5 +1,5 @@
 name: magento
-version: 1.0.2
+version: 1.0.3
 appVersion: 2.2.4
 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more.
 keywords:

upstreamed/magento/templates/deployment.yaml

@@ -90,7 +90,7 @@ spec:
             httpHeaders:
             - name: Host
               value: {{ include "magento.host" . | quote }}
-          initialDelaySeconds: 420
+          initialDelaySeconds: 1000
           timeoutSeconds: 5
           failureThreshold: 6
         readinessProbe:

upstreamed/mediawiki/Chart.yaml

@@ -1,5 +1,5 @@
 name: mediawiki
-version: 1.0.2
+version: 1.0.3
 appVersion: 1.30.0
 description: Extremely powerful, scalable software and a feature-rich wiki implementation
   that uses PHP to process and display data stored in a database.

upstreamed/mediawiki/templates/svc.yaml

@@ -9,6 +9,9 @@ metadata:
     heritage: "{{ .Release.Service }}"
 spec:
   type: {{ .Values.serviceType }}
+  {{ if .Values.serviceLoadBalancerIP -}}
+  loadBalancerIP: {{ .Values.serviceLoadBalancerIP }}
+  {{ end -}}
   ports:
   - name: http
     port: 80

upstreamed/mediawiki/values.yaml

@@ -117,7 +117,11 @@ mariadb:
 ## Kubernetes configuration
 ## For minikube, set this to NodePort, elsewhere use LoadBalancer
 ##
+## Use serviceLoadBalancerIP to request a specific static IP,
+## otherwise leave blank
+##
 serviceType: LoadBalancer
+# serviceLoadBalancerIP:
 
 ## Enable persistence using Persistent Volume Claims
 ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/