diff --git a/install/syndesis-dev.yml b/install/syndesis-dev.yml index a4084577524..5acc2150714 100644 --- a/install/syndesis-dev.yml +++ b/install/syndesis-dev.yml @@ -10,7 +10,7 @@ metadata: # # Allow localhost refs: true # Use docker images: false -# Syndesis Tag: latest +# Syndesis Tag: 1.4.2 # Prometheus Tag: v2.1.0 # Postgresql Tag: 9.5 # OAuthProxy Tag: v1.1.0 @@ -138,6 +138,11 @@ parameters: name: MAX_INTEGRATIONS_PER_USER value: "1" required: true +- description: Interval for checking the state of the integrations. + displayName: Integration state check interval + name: INTEGRATION_STATE_CHECK_INTERVAL + value: "60" + required: true - description: Key used to perform authentication of client side stored state. displayName: Client side state authentication key from: '[a-zA-Z0-9]{32}' @@ -166,10 +171,10 @@ objects: tags: - from: kind: DockerImage - name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-server:latest + name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-server:1.4.2 importPolicy: scheduled: true - name: "latest" + name: "1.4.2" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -183,10 +188,10 @@ objects: tags: - from: kind: DockerImage - name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-ui:latest + name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-ui:1.4.2 importPolicy: scheduled: true - name: "latest" + name: "1.4.2" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -200,10 +205,10 @@ objects: tags: - from: kind: DockerImage - name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-meta:latest + name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-meta:1.4.2 importPolicy: scheduled: true - name: "latest" + name: "1.4.2" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -252,10 +257,10 @@ objects: tags: - from: kind: DockerImage - name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-s2i:latest + name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-s2i:1.4.2 importPolicy: scheduled: true - name: "latest" + name: "1.4.2" - apiVersion: v1 kind: Secret @@ -287,7 +292,7 @@ objects: syndesis.io/app: syndesis syndesis.io/type: infrastructure stringData: - syndesis: "latest" + syndesis: "1.4.2" postgresql: "9.5" oauthproxy: "v1.1.0" prometheus: "v2.1.0" @@ -403,7 +408,7 @@ objects: - syndesis-ui from: kind: ImageStreamTag - name: syndesis-ui:latest + name: syndesis-ui:1.4.2 namespace: ${IMAGE_STREAM_NAMESPACE} type: ImageChange @@ -803,7 +808,7 @@ objects: - syndesis-meta from: kind: ImageStreamTag - name: syndesis-meta:latest + name: syndesis-meta:1.4.2 namespace: ${IMAGE_STREAM_NAMESPACE} type: ImageChange @@ -1080,6 +1085,8 @@ objects: value: "1" - name: MAX_INTEGRATIONS_PER_USER value: ${MAX_INTEGRATIONS_PER_USER} + - name: INTEGRATION_STATE_CHECK_INTERVAL + value: ${INTEGRATION_STATE_CHECK_INTERVAL} - name: JAVA_DEBUG value: "true" image: ' ' @@ -1130,7 +1137,7 @@ objects: - syndesis-server from: kind: ImageStreamTag - name: syndesis-server:latest + name: syndesis-server:1.4.2 namespace: ${IMAGE_STREAM_NAMESPACE} type: ImageChange @@ -1190,7 +1197,7 @@ objects: apiBaseUrl: ${OPENSHIFT_MASTER}/oapi/v1 namespace: ${NAMESPACE} imageStreamNamespace: ${IMAGE_STREAM_NAMESPACE} - builderImageStreamTag: syndesis-s2i:latest + builderImageStreamTag: syndesis-s2i:1.4.2 deploymentMemoryRequestMi: 200 deploymentMemoryLimitMi: 512 mavenOptions: "-XX:+UseG1GC -XX:+UseStringDeduplication -Xmx310m" @@ -1199,6 +1206,7 @@ objects: controllers: maxIntegrationsPerUser: ${MAX_INTEGRATIONS_PER_USER} maxDeploymentsPerUser: ${MAX_INTEGRATIONS_PER_USER} + integrationStateCheckInterval: ${INTEGRATION_STATE_CHECK_INTERVAL} - apiVersion: v1 kind: Service metadata: diff --git a/install/syndesis.yml b/install/syndesis.yml index 28d9649a525..8666e73a29b 100644 --- a/install/syndesis.yml +++ b/install/syndesis.yml @@ -10,7 +10,7 @@ metadata: # # Allow localhost refs: false # Use docker images: false -# Syndesis Tag: latest +# Syndesis Tag: 1.4.2 # Prometheus Tag: v2.1.0 # Postgresql Tag: 9.5 # OAuthProxy Tag: v1.1.0 @@ -138,6 +138,11 @@ parameters: name: MAX_INTEGRATIONS_PER_USER value: "1" required: true +- description: Interval for checking the state of the integrations. + displayName: Integration state check interval + name: INTEGRATION_STATE_CHECK_INTERVAL + value: "60" + required: true - description: Key used to perform authentication of client side stored state. displayName: Client side state authentication key from: '[a-zA-Z0-9]{32}' @@ -166,10 +171,10 @@ objects: tags: - from: kind: DockerImage - name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-server:latest + name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-server:1.4.2 importPolicy: scheduled: true - name: "latest" + name: "1.4.2" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -183,10 +188,10 @@ objects: tags: - from: kind: DockerImage - name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-ui:latest + name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-ui:1.4.2 importPolicy: scheduled: true - name: "latest" + name: "1.4.2" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -200,10 +205,10 @@ objects: tags: - from: kind: DockerImage - name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-meta:latest + name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-meta:1.4.2 importPolicy: scheduled: true - name: "latest" + name: "1.4.2" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -252,10 +257,10 @@ objects: tags: - from: kind: DockerImage - name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-s2i:latest + name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-s2i:1.4.2 importPolicy: scheduled: true - name: "latest" + name: "1.4.2" - apiVersion: v1 kind: Secret @@ -287,7 +292,7 @@ objects: syndesis.io/app: syndesis syndesis.io/type: infrastructure stringData: - syndesis: "latest" + syndesis: "1.4.2" postgresql: "9.5" oauthproxy: "v1.1.0" prometheus: "v2.1.0" @@ -403,7 +408,7 @@ objects: - syndesis-ui from: kind: ImageStreamTag - name: syndesis-ui:latest + name: syndesis-ui:1.4.2 namespace: ${IMAGE_STREAM_NAMESPACE} type: ImageChange @@ -801,7 +806,7 @@ objects: - syndesis-meta from: kind: ImageStreamTag - name: syndesis-meta:latest + name: syndesis-meta:1.4.2 namespace: ${IMAGE_STREAM_NAMESPACE} type: ImageChange @@ -1078,6 +1083,8 @@ objects: value: "1" - name: MAX_INTEGRATIONS_PER_USER value: ${MAX_INTEGRATIONS_PER_USER} + - name: INTEGRATION_STATE_CHECK_INTERVAL + value: ${INTEGRATION_STATE_CHECK_INTERVAL} image: ' ' imagePullPolicy: IfNotPresent @@ -1126,7 +1133,7 @@ objects: - syndesis-server from: kind: ImageStreamTag - name: syndesis-server:latest + name: syndesis-server:1.4.2 namespace: ${IMAGE_STREAM_NAMESPACE} type: ImageChange @@ -1186,7 +1193,7 @@ objects: apiBaseUrl: ${OPENSHIFT_MASTER}/oapi/v1 namespace: ${NAMESPACE} imageStreamNamespace: ${IMAGE_STREAM_NAMESPACE} - builderImageStreamTag: syndesis-s2i:latest + builderImageStreamTag: syndesis-s2i:1.4.2 deploymentMemoryRequestMi: 200 deploymentMemoryLimitMi: 512 mavenOptions: "-XX:+UseG1GC -XX:+UseStringDeduplication -Xmx310m" @@ -1195,6 +1202,7 @@ objects: controllers: maxIntegrationsPerUser: ${MAX_INTEGRATIONS_PER_USER} maxDeploymentsPerUser: ${MAX_INTEGRATIONS_PER_USER} + integrationStateCheckInterval: ${INTEGRATION_STATE_CHECK_INTERVAL} - apiVersion: v1 kind: Service metadata: