Fix merge conflict

charts/rstudio-pm/NEWS.md

@@ -2,7 +2,7 @@
 
 ## 0.5.41
 
-- Pin the rstudio-library version dependency so we can update the library chart without breaking all the charts that depend on it.
+- Update the default `pod.startupProbe` to use the `/__api__/status` route instead of `/__ping__` for a more reliable startup.
 
 ## 0.5.40
 

charts/rstudio-pm/README.md

@@ -269,7 +269,7 @@ The Helm `config` values are converted into the `rstudio-pm.gcfg` service config
 | sharedStorage.selector | object | `{}` | selector for PVC definition |
 | sharedStorage.storageClassName | bool | `false` | storageClassName - the type of storage to use. Must allow ReadWriteMany |
 | sharedStorage.volumeName | string | `""` | the volumeName passed along to the persistentVolumeClaim. Optional |
-| startupProbe | object | `{"enabled":false,"failureThreshold":30,"httpGet":{"path":"/__ping__","port":4242},"initialDelaySeconds":10,"periodSeconds":10,"timeoutSeconds":1}` | startupProbe is used to configure the container's startupProbe |
+| startupProbe | object | `{"enabled":false,"failureThreshold":30,"httpGet":{"path":"/__api__/status","port":4242},"initialDelaySeconds":10,"periodSeconds":10,"timeoutSeconds":1}` | startupProbe is used to configure the container's startupProbe |
 | startupProbe.failureThreshold | int | `30` | failureThreshold * periodSeconds should be strictly > worst case startup time |
 | strategy | object | `{"rollingUpdate":{"maxSurge":"100%","maxUnavailable":0},"type":"RollingUpdate"}` | The update strategy used by the main service pod. |
 | tolerations | list | `[]` | An array used verbatim as the pod's "tolerations" definition |

charts/rstudio-pm/values.yaml

@@ -170,7 +170,7 @@ livenessProbe:
 startupProbe:
   enabled: false
   httpGet:
-    path: /__ping__
+    path: /__api__/status
     port: 4242
   initialDelaySeconds: 10
   periodSeconds: 10