[stable/gocd] Remove https port (helm#21548)

* [stable/gocd] Remove usages of 8154 https port Signed-off-by: GaneshSPatil <ganeshpl@thoughtworks.com> * Update docs to mention about TLS changes Signed-off-by: GaneshSPatil <ganeshpl@thoughtworks.com> * Bump up chart version to 1.24.0 Signed-off-by: GaneshSPatil <ganeshpl@thoughtworks.com>
quantopian · Jul 13, 2020 · b51c8ca · b51c8ca
1 parent 2f8b129
commit b51c8ca
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 17 deletions.
diff --git a/stable/gocd/CHANGELOG.md b/stable/gocd/CHANGELOG.md
@@ -1,11 +1,18 @@
+### 1.24.0
+
+* [5b3b6e173](https://github.com/kubernetes/charts/commit/5b3b6e173): Update docs to mention about TLS changes
+* [c10bb1088](https://github.com/kubernetes/charts/commit/c10bb1088): Remove usages of 8154 https port
+
 ### 1.23.0
 * [efc2c8c](https://github.com/kubernetes/charts/commit/efc2c8c): Bump up GoCD Version to 20.2.0
+
 ### 1.22.1
 * [b856007](https://github.com/kubernetes/charts/commit/b856007): Ingress version api change
 * [e2f27a9](https://github.com/kubernetes/charts/commit/e2f27a9): Quote ingress host
 
 ### 1.22.0
 * [bcd9825](https://github.com/kubernetes/charts/commit/bcd9825): Bump up GoCD Version to 20.1.0
+
 ### 1.21.0
 * [e4ffdda](https://github.com/kubernetes/charts/commit/e4ffdda): Bump up GoCD Version to 19.12.0
 ### 1.20.1

diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: gocd
 home: https://www.gocd.org/
-version: 1.23.0
+version: 1.24.0
 appVersion: 20.2.0
 description: GoCD is an open-source continuous delivery server to model and visualize complex workflows with ease.
 icon: https://gocd.github.io/assets/images/go-icon-black-192x192.png

diff --git a/stable/gocd/README.md b/stable/gocd/README.md
@@ -90,7 +90,6 @@ The following tables list the configurable parameters of the GoCD chart and thei
 | `server.service.type`                      | Type of GoCD server Kubernetes service                                                                        | `NodePort`          |
 | `server.service.loadBalancerSourceRanges`  | GoCD server service Load Balancer source IP ranges to whitelist                                               | `nil`               |
 | `server.service.httpPort`                  | GoCD server service HTTP port                                                                                 | `8153`              |
-| `server.service.httpsPort`                 | GoCD server service HTTPS port                                                                                | `8154`              |  
 | `server.service.nodeHttpPort`              | GoCD server service node HTTP port. **Note**: A random nodePort will get assigned if not specified            | `nil`               |  
 | `server.service.nodeHttpsPort`             | GoCD server service node HTTPS port. **Note**: A random nodePort will get assigned if not specified           | `nil`               |  
 | `server.ingress.enabled`                   | Enable/disable GoCD ingress. Allow traffic from outside the cluster via http. Do `kubectl describe ing` to get the public ip to access the gocd server.                                | `true`              |                                                                                     
@@ -440,6 +439,12 @@ env:
 
 - If you are adding a plugin to an existing Go server, it will result in a new Go server pod being created that has the plugin installed and running.
 
+# TLS for GoCD
+
+As part of GoCD Release v20.2.0, GoCD changed how it handles SSL support. If you are upgrading to GoCD 20.2.0 or above, agents will have to be reconfigured to connect to the server. Know more about the GoCD SSL/TLS changes [here](https://github.com/gocd/gocd/issues/7872). 
+
+To set up TLS for GoCD, system admins will be required to front the GoCD server with a reverse proxy that supports TLS (like Apache, NGINX). Any existing agents that are using TLS, can connect to this reverse proxy. Reverse proxies have the advantage that they make it a lot easier and more convenient to setup and configure various TLS connection parameters. Refer the [GoCD documentation](https://docs.gocd.org/current/installation/configure-reverse-proxy.html) to setup a reverse proxy.
+
 # License
 
 ```plain

diff --git a/stable/gocd/templates/NOTES.txt b/stable/gocd/templates/NOTES.txt
@@ -43,7 +43,7 @@
 {{ end }}
 
 3. The GoCD server URL for configuring the Kubernetes elastic agent plugin settings:
-    echo "https://$(kubectl get service {{ template "gocd.fullname" . }}-server --namespace={{ .Release.Namespace }}  -o jsonpath='{.spec.clusterIP}'):8154/go"
+    echo "http://$(kubectl get service {{ template "gocd.fullname" . }}-server --namespace={{ .Release.Namespace }}  -o jsonpath='{.spec.clusterIP}'):8153/go"
 
 4. The cluster URL for configuring the Kubernetes elastic agent plugin settings can be obtained by:
     kubectl cluster-info
@@ -66,4 +66,4 @@
 6. Deprecations
    The property `agent.env.agentAutoRegisterEnvironemnts` is deprecated in favor of `agent.env.agentAutoRegisterEnvironments`.
    Please note that the deprecated property will be removed in GoCD 19.3.0 (that is, when Chart.appVersion is 19.3.0). Users are encouraged to use the new property `agent.env.agentAutoRegisterEnvironments`.
-{{ end }}
+{{ end }}
diff --git a/stable/gocd/templates/configmap.yaml b/stable/gocd/templates/configmap.yaml
@@ -47,7 +47,7 @@ data:
         "properties": [
               {
                 "key": "go_server_url",
-                "value": "https://{{ template "gocd.fullname" . }}-server:{{ .Values.server.service.httpsPort }}/go"
+                "value": "http://{{ template "gocd.fullname" . }}-server:{{ .Values.server.service.httpPort }}/go"
             },
             {
                 "key": "kubernetes_cluster_url",

diff --git a/stable/gocd/templates/gocd-agent-deployment.yaml b/stable/gocd/templates/gocd-agent-deployment.yaml
@@ -74,7 +74,7 @@ spec:
             {{- if .Values.agent.env.goServerUrl }}
               value: {{ .Values.agent.env.goServerUrl }}
             {{- else }}
-              value: "https://{{ template "gocd.fullname" . }}-server:{{ .Values.server.service.httpsPort }}/go"
+              value: "http://{{ template "gocd.fullname" . }}-server:{{ .Values.server.service.httpPort }}/go"
             {{- end }}
 
             {{- if .Values.agent.env.agentAutoRegisterKey }}

diff --git a/stable/gocd/templates/gocd-server-deployment.yaml b/stable/gocd/templates/gocd-server-deployment.yaml
@@ -84,7 +84,6 @@ spec:
             {{- end }}
           ports:
             - containerPort: 8153
-            - containerPort: 8154
           livenessProbe:
             httpGet:
               path: /go/api/v1/health

diff --git a/stable/gocd/templates/service.yaml b/stable/gocd/templates/service.yaml
@@ -29,14 +29,6 @@ spec:
       {{- end}}
       protocol: TCP
       name: http
-
-    - port: {{ .Values.server.service.httpsPort }}
-      targetPort: 8154
-      {{- if .Values.server.service.nodeHttpsPort }}
-      nodePort: {{ .Values.server.service.nodeHttpsPort }}
-      {{- end}}
-      protocol: TCP
-      name: https
   selector:
     app: {{ template "gocd.name" . }}
     release: {{ .Release.Name | quote }}

diff --git a/stable/gocd/values.yaml b/stable/gocd/values.yaml
@@ -130,8 +130,6 @@ server:
     type: "NodePort"
     # server.service.httpPort is the GoCD Server HTTP port
     httpPort: 8153
-    # server.service.httpPort is the GoCD Server HTTPS port
-    httpsPort: 8154
     # Provide the nodeHttpPort and nodeHttpsPort if you want the service to be exposed on specific ports. Without this, random node ports will be assigned.
     # server.service.nodeHttpPort is the GoCD Server Service Node HTTP port
     nodeHttpPort: