diff --git a/pipelines/deploy/kuadrant-nightly-update/pipeline.yaml b/pipelines/deploy/kuadrant-nightly-update/pipeline.yaml index a23cfca..19bad3a 100644 --- a/pipelines/deploy/kuadrant-nightly-update/pipeline.yaml +++ b/pipelines/deploy/kuadrant-nightly-update/pipeline.yaml @@ -23,10 +23,6 @@ spec: name: gateway-crd type: string default: v1.4.0 - - description: Keycloak subscription channel - name: keycloak-channel - type: string - default: stable-v26 - description: Additional flags for helm install command, example '--set=kuadrant.installPlanApproval=Manual --set=kuadrant.startingCSV=kuadrant-operator.v1.2.0' name: additional-helm-flags type: string @@ -74,8 +70,6 @@ spec: value: $(params.istio-provider) - name: gateway-crd value: $(params.gateway-crd) - - name: keycloak-channel - value: $(params.keycloak-channel) - name: operator-name value: $(params.operator-name) - name: kubeconfig-path diff --git a/pipelines/deploy/kuadrant-testsuite/pipeline.yaml b/pipelines/deploy/kuadrant-testsuite/pipeline.yaml index d569165..1a58399 100644 --- a/pipelines/deploy/kuadrant-testsuite/pipeline.yaml +++ b/pipelines/deploy/kuadrant-testsuite/pipeline.yaml @@ -31,10 +31,6 @@ spec: name: gateway-crd type: string default: v1.4.0 - - description: Keycloak subscription channel - name: keycloak-channel - type: string - default: stable-v26 - description: Additional flags for helm install command, example '--set=kuadrant.installPlanApproval=Manual --set=kuadrant.startingCSV=kuadrant-operator.v1.2.0' name: additional-helm-flags type: string @@ -82,8 +78,6 @@ spec: value: $(params.istio-provider) - name: gateway-crd value: $(params.gateway-crd) - - name: keycloak-channel - value: $(params.keycloak-channel) - name: operator-name value: $(params.operator-name) - name: kubeconfig-path diff --git a/pipelines/test/aro/pipeline.yaml b/pipelines/test/aro/pipeline.yaml index b169334..0c365be 100644 --- a/pipelines/test/aro/pipeline.yaml +++ b/pipelines/test/aro/pipeline.yaml @@ -50,10 +50,6 @@ spec: description: GatewayAPI CRD version. v1.0.0, v1.1.0, v1.2.1, v1.3.0 available; Leave empty if installing on OCP v4.19+ name: gateway-crd type: string - - default: stable-v26 - description: Keycloak subscription channel - name: keycloak-channel - type: string - default: "" description: Additional flags for helm install command, example '--set=kuadrant.installPlanApproval=Manual --set=kuadrant.startingCSV=kuadrant-operator.v1.2.0' name: additional-helm-flags @@ -204,8 +200,6 @@ spec: value: $(tasks.kubectl-login.results.kubeconfig-path) - name: gateway-crd value: $(params.gateway-crd) - - name: keycloak-channel - value: $(params.keycloak-channel) - name: additional-helm-flags value: $(params.additional-helm-flags) - name: additional-helm-tools-flags diff --git a/pipelines/test/osd-upgrade/pipeline.yaml b/pipelines/test/osd-upgrade/pipeline.yaml index 0cc710a..e26e5bc 100644 --- a/pipelines/test/osd-upgrade/pipeline.yaml +++ b/pipelines/test/osd-upgrade/pipeline.yaml @@ -62,10 +62,6 @@ spec: description: GatewayAPI CRD version. v1.0.0, v1.1.0, v1.2.1, v1.3.0 available; Leave empty if installing on OCP v4.19+ name: gateway-crd type: string - - default: stable-v26 - description: Keycloak subscription channel - name: keycloak-channel - type: string - default: "" description: Additional flags for helm install command, example '--set=kuadrant.installPlanApproval=Manual --set=kuadrant.startingCSV=kuadrant-operator.v1.2.0' name: additional-helm-flags @@ -368,8 +364,6 @@ spec: value: $(tasks.kubectl-login.results.kubeconfig-path) - name: gateway-crd value: $(params.gateway-crd) - - name: keycloak-channel - value: $(params.keycloak-channel) - name: additional-helm-flags value: $(params.additional-helm-flags) - name: additional-helm-tools-flags diff --git a/pipelines/test/osd/pipeline.yaml b/pipelines/test/osd/pipeline.yaml index 673cea0..1dd9333 100644 --- a/pipelines/test/osd/pipeline.yaml +++ b/pipelines/test/osd/pipeline.yaml @@ -62,10 +62,6 @@ spec: description: GatewayAPI CRD version. v1.0.0, v1.1.0, v1.2.1, v1.3.0 available; Leave empty if installing on OCP v4.19+ name: gateway-crd type: string - - default: stable-v26 - description: Keycloak subscription channel - name: keycloak-channel - type: string - default: "" description: Additional flags for helm install command, example '--set=kuadrant.installPlanApproval=Manual --set=kuadrant.startingCSV=kuadrant-operator.v1.2.0' name: additional-helm-flags @@ -364,8 +360,6 @@ spec: value: $(tasks.kubectl-login.results.kubeconfig-path) - name: gateway-crd value: $(params.gateway-crd) - - name: keycloak-channel - value: $(params.keycloak-channel) - name: additional-helm-flags value: $(params.additional-helm-flags) - name: additional-helm-tools-flags diff --git a/tasks/deploy/helm-deploy.yaml b/tasks/deploy/helm-deploy.yaml index 9153526..05a0970 100644 --- a/tasks/deploy/helm-deploy.yaml +++ b/tasks/deploy/helm-deploy.yaml @@ -16,9 +16,6 @@ spec: - description: GatewayAPI CRD version. v1.0.0, v1.1.0, v1.2.1, v1.3.0 available; Leave empty if installing on ocp4.19+ name: gateway-crd type: string - - description: Keycloak subscription channel - name: keycloak-channel - type: string - description: Path to workspace kubeconfig name: kubeconfig-path type: string @@ -164,7 +161,6 @@ spec: --set=kuadrant.operatorName="$(params.operator-name)" --set=istio.istioProvider="$(params.istio-provider)" --set=gatewayAPI.version="$(params.gateway-crd)" - --set=tools.keycloak.operator.channel="$(params.keycloak-channel)" --set=tools.enabled=true $(params.additional-helm-flags) --wait --debug @@ -188,7 +184,6 @@ spec: --set=kuadrant.operatorName="$(params.operator-name)" --set=istio.istioProvider="$(params.istio-provider)" --set=gatewayAPI.version="$(params.gateway-crd)" - --set=tools.keycloak.operator.channel="$(params.keycloak-channel)" --set=tools.enabled=true $(params.additional-helm-flags) --wait --debug