Remove option to disable secureCookies

Author: LEDfan

docs/deployment/bases/clustered/resources/shinyproxy-operator.deployment.yaml

@@ -31,8 +31,6 @@ spec:
           #     value: "0" # 0 is default
           #   - name: SPO_PROBE_FAILURE_THRESHOLD
           #     value: "5" # 5 is default
-          #   - name: SPO_DISABLE_SECURE_COOKIES
-          #     value: "TRUE" # when specifying the env variable with any value secure cookies are disabled (this by default the operator uses secure cookies)
           #   - name: "SPO_LOG_LEVEL"
           #     VALUE: "DEBUG" # by default DEBUG
           #   - name: SPO_PROCESS_MAX_LIFETIME

docs/deployment/bases/namespaced/resources/shinyproxy-operator.deployment.yaml

@@ -31,8 +31,6 @@ spec:
           #     value: "0" # 0 is default
           #   - name: SPO_PROBE_FAILURE_THRESHOLD
           #     value: "5" # 5 is default
-          #   - name: SPO_DISABLE_SECURE_COOKIES
-          #     value: "TRUE" # when specifying the env variable with any value secure cookies are disabled (this by default the operator uses secure cookies)
           #   - name: "SPO_LOG_LEVEL"
           #     VALUE: "DEBUG" # by default DEBUG
           #   - name: SPO_PROCESS_MAX_LIFETIME

src/main/kotlin/eu/openanalytics/shinyproxyoperator/Operator.kt

@@ -60,7 +60,6 @@ import kotlin.system.exitProcess
 
 class Operator(client: NamespacedKubernetesClient? = null,
                mode: Mode? = null,
-               disableSecureCookies: Boolean? = null,
                reconcileListener: IReconcileListener? = null,
                probeInitialDelay: Int? = null,
                probeFailureThreshold: Int? = null,
@@ -73,7 +72,6 @@ class Operator(client: NamespacedKubernetesClient? = null,
     private val client: NamespacedKubernetesClient
     val mode: Mode
     val namespace: String
-    val disableSecureCookies: Boolean
     val probeInitialDelay: Int
     val probeFailureThreshold: Int
     val probeTimeout: Int
@@ -113,7 +111,6 @@ class Operator(client: NamespacedKubernetesClient? = null,
                 else -> error("Unsupported operator mode: $it")
             }
         }
-        this.disableSecureCookies = readConfigValue(disableSecureCookies, false, "SPO_DISABLE_SECURE_COOKIES") { true }
         this.probeInitialDelay = readConfigValue(probeInitialDelay, 0, "SPO_PROBE_INITIAL_DELAY", String::toInt)
         this.probeFailureThreshold = readConfigValue(probeFailureThreshold, 0, "SPO_PROBE_FAILURE_THRESHOLD", String::toInt)
         this.probeTimeout = readConfigValue(probeTimeout, 1, "SPO_PROBE_TIMEOUT", String::toInt)

src/test/kotlin/eu/openanalytics/shinyproxyoperator/MainIntegrationTest.kt

@@ -655,7 +655,6 @@ class MainIntegrationTest : IntegrationTestBase() {
     @Test
     fun `may no re-create instance after remove`() = setup(
         Mode.NAMESPACED,
-        disableSecureCookies = true
     ) { namespace, shinyProxyClient, namespacedClient, _, operator, reconcileListener, _ ->
         if (chaosEnabled) return@setup // this test depends on timings and therefore it does not work with chaos enabled
         // 1. create a SP instance

src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/IntegrationTestBase.kt

@@ -83,7 +83,7 @@ abstract class IntegrationTestBase {
 
     }
 
-    protected fun setup(mode: Mode, disableSecureCookies: Boolean = false, block: suspend (String, ShinyProxyClient, NamespacedKubernetesClient, NamespacedKubernetesClient, Operator, ReconcileListener, MockRecyclableChecker) -> Unit) {
+    protected fun setup(mode: Mode, block: suspend (String, ShinyProxyClient, NamespacedKubernetesClient, NamespacedKubernetesClient, Operator, ReconcileListener, MockRecyclableChecker) -> Unit) {
         runBlocking {
 
             // 1. Create the namespace
@@ -104,9 +104,9 @@ abstract class IntegrationTestBase {
             val reconcileListener = ReconcileListener()
 
             val operator = if (stableClient.isStartupProbesSupported()) {
-                Operator(namespacedKubernetesClient, mode, disableSecureCookies, reconcileListener, recyclableChecker=recyclableChecker)
+                Operator(namespacedKubernetesClient, mode, reconcileListener, recyclableChecker=recyclableChecker)
             } else {
-                Operator(namespacedKubernetesClient, mode, disableSecureCookies, reconcileListener, 40, 2, recyclableChecker=recyclableChecker)
+                Operator(namespacedKubernetesClient, mode, reconcileListener, 40, 2, recyclableChecker=recyclableChecker)
             }
 
             Operator.setOperatorInstance(operator)