Merge pull request #142 from rhuss/master

chore: 1.1.0 release files
syndesisio · Oct 23, 2017 · 16ef0e1 · 16ef0e1
2 parents 2dc88d7 + 852e3cd
commit 16ef0e1
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 486 deletions.
diff --git a/syndesis-ci.yml b/syndesis-ci.yml
@@ -4,16 +4,16 @@
 apiVersion: v1
 kind: Template
 metadata:
-  name: syndesis-ci
+  name: syndesis-ci-1.1
 #
 # Template flavor:
 #
 # Allow localhost refs: false
 # Use docker images: false
 # Ephemeral: false
 # Without Probes: true
-# Atlasmap Tag: latest
-# Syndesis Tag: latest
+# Atlasmap Tag: 1.31
+# Syndesis Tag: 1.1
 # Restricted environment: false
 #
   labels:
@@ -93,7 +93,7 @@ parameters:
   displayName: Syndesis Image Registry
   name: SYNDESIS_REGISTRY
   required: true
-  value: 'docker.io'
+  value: 'registry.fuse-ignite.openshift.com'
 - description: Should deployment of integrations be enabled?
   displayName: Enable Integration Deployment
   name: CONTROLLERS_INTEGRATION_ENABLED
@@ -109,7 +109,7 @@ parameters:
 - description: Namespace containing image streams
   displayName: Image Stream Namespace
   name: IMAGE_STREAM_NAMESPACE
-  value: ''
+  value: 'fuse-ignite'
 - description: Secret to use to encrypt oauth cookies
   displayName: OAuth Cookie Secret
   name: OAUTH_COOKIE_SECRET
@@ -118,97 +118,6 @@ parameters:
 message: |-
   Syndesis is deployed to ${ROUTE_HOSTNAME}.
 objects:
-- apiVersion: v1
-  kind: ImageStream
-  metadata:
-    name: syndesis-rest
-    labels:
-      app: syndesis
-      component: syndesis-rest
-  spec:
-    tags:
-    - from:
-        kind: DockerImage
-        name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-rest:latest
-      importPolicy:
-        scheduled: true
-      name: "latest"
-- apiVersion: v1
-  kind: ImageStream
-  metadata:
-    name: syndesis-ui
-    labels:
-      app: syndesis
-      component: syndesis-ui
-  spec:
-    tags:
-    - from:
-        kind: DockerImage
-        name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-ui:latest
-      importPolicy:
-        scheduled: true
-      name: "latest"
-- apiVersion: v1
-  kind: ImageStream
-  metadata:
-    name: atlasmap
-    labels:
-      app: syndesis
-      component: syndesis-atlasmap
-  spec:
-    tags:
-    - from:
-        kind: DockerImage
-        name: ${SYNDESIS_REGISTRY}/atlasmap/atlasmap:latest
-      importPolicy:
-        scheduled: true
-      name: "latest"
-- apiVersion: v1
-  kind: ImageStream
-  metadata:
-    name: syndesis-verifier
-    labels:
-      app: syndesis
-      component: syndesis-verifier
-  spec:
-    tags:
-    - from:
-        kind: DockerImage
-        name: ${SYNDESIS_REGISTRY}/syndesis/syndesis-verifier:latest
-      importPolicy:
-        scheduled: true
-      name: "latest"
-- apiVersion: v1
-  kind: ImageStream
-  metadata:
-    name: oauth-proxy
-    labels:
-      app: syndesis
-      component: syndesis-oauthproxy
-  spec:
-    tags:
-    - from:
-        kind: DockerImage
-        name: ${SYNDESIS_REGISTRY}/openshift/oauth-proxy:v1.0.0
-      importPolicy:
-        scheduled: true
-      name: "v1.0.0"
-
-- apiVersion: v1
-  kind: ImageStream
-  metadata:
-    name: s2i-java
-    labels:
-      app: syndesis
-      component: s2i-java
-  spec:
-    tags:
-    - from:
-        kind: DockerImage
-        name: fabric8/s2i-java:2.0
-      importPolicy:
-        scheduled: true
-      name: "2.0"
 
 - apiVersion: v1
   kind: Secret
@@ -294,7 +203,7 @@ objects:
         - syndesis-ui
         from:
           kind: ImageStreamTag
-          name: syndesis-ui:latest
+          name: fuse-ignite-ui:1.1
           namespace: ${IMAGE_STREAM_NAMESPACE}
       type: ImageChange
 
@@ -318,11 +227,11 @@ objects:
           "baseMappingServiceUrl": "https://${ROUTE_HOSTNAME}/v2/atlas/"
         },
         "branding": {
-          "logoWhiteBg": "assets/images/syndesis-logo-svg-white.svg",
-          "logoDarkBg": "assets/images/syndesis-logo-svg-white.svg",
-          "iconWhiteBg": "assets/images/glasses_logo_square.png",
-          "iconDarkBg": "assets/images/glasses_logo_square.png",
-          "appName": "Syndesis",
+          "logoWhiteBg": "",
+          "logoDarkBg": "",
+          "iconWhiteBg": "assets/images/FuseIgniteLogo_Black.svg",
+          "iconDarkBg": "assets/images/FuseIgniteLogo_White.svg",
+          "appName": "Ignite",
           "favicon32": "/favicon-32x32.png",
           "favicon16": "/favicon-16x16.png",
           "touchIcon": "/apple-touch-icon.png"
@@ -426,7 +335,7 @@ objects:
         - atlasmap
         from:
           kind: ImageStreamTag
-          name: atlasmap:latest
+          name: fuse-ignite-mapper:1.31
           namespace: ${IMAGE_STREAM_NAMESPACE}
       type: ImageChange
 
@@ -866,7 +775,7 @@ objects:
         - syndesis-rest
         from:
           kind: ImageStreamTag
-          name: syndesis-rest:latest
+          name: fuse-ignite-rest:1.1
           namespace: ${IMAGE_STREAM_NAMESPACE}
       type: ImageChange
 
@@ -915,7 +824,7 @@ objects:
         apiBaseUrl: ${OPENSHIFT_MASTER}/oapi/v1
         namespace: ${NAMESPACE}
         imageStreamNamespace: ${IMAGE_STREAM_NAMESPACE}
-        builderImageStreamTag: s2i-java:2.0
+        builderImageStreamTag: fuse-ignite-java-openshift:1.0
         deploymentMemoryRequestMi: 200
         deploymentMemoryLimitMi: 512
         mavenOptions: "-XX:+UseG1GC -XX:+UseStringDeduplication -Xmx310m"
@@ -1006,7 +915,7 @@ objects:
         - syndesis-verifier
         from:
           kind: ImageStreamTag
-          name: syndesis-verifier:latest
+          name: fuse-ignite-verifier:1.1
           namespace: ${IMAGE_STREAM_NAMESPACE}
       type: ImageChange
 

diff --git a/syndesis-dev-restricted.yml b/syndesis-dev-restricted.yml
@@ -4,16 +4,16 @@
 apiVersion: v1
 kind: Template
 metadata:
-  name: syndesis-dev-restricted
+  name: syndesis-dev-restricted-1.1
 #
 # Template flavor:
 #
 # Allow localhost refs: true
 # Use docker images: true
 # Ephemeral: false
 # Without Probes: false
-# Atlasmap Tag: latest
-# Syndesis Tag: latest
+# Atlasmap Tag: 1.31
+# Syndesis Tag: 1.1
 # Restricted environment: true
 #
   labels:
@@ -89,7 +89,7 @@ parameters:
   displayName: Syndesis Image Registry
   name: SYNDESIS_REGISTRY
   required: true
-  value: 'docker.io'
+  value: 'registry.fuse-ignite.openshift.com'
 - description: Should deployment of integrations be enabled?
   displayName: Enable Integration Deployment
   name: CONTROLLERS_INTEGRATION_ENABLED
@@ -105,7 +105,7 @@ parameters:
 - description: Namespace containing image streams
   displayName: Image Stream Namespace
   name: IMAGE_STREAM_NAMESPACE
-  value: ''
+  value: 'fuse-ignite'
 - description: Secret to use to encrypt oauth cookies
   displayName: OAuth Cookie Secret
   name: OAUTH_COOKIE_SECRET
@@ -115,22 +115,6 @@ message: |-
   Syndesis is deployed to ${ROUTE_HOSTNAME}.
 objects:
 
-- apiVersion: v1
-  kind: ImageStream
-  metadata:
-    name: s2i-java
-    labels:
-      app: syndesis
-      component: s2i-java
-  spec:
-    tags:
-    - from:
-        kind: DockerImage
-        name: fabric8/s2i-java:2.0
-      importPolicy:
-        scheduled: true
-      name: "2.0"
-
 - apiVersion: v1
   kind: Secret
   metadata:
@@ -189,7 +173,7 @@ objects:
       spec:
         containers:
         - name: syndesis-ui
-          image: ${SYNDESIS_REGISTRY}/syndesis/syndesis-ui:latest
+          image: ${SYNDESIS_REGISTRY}/syndesis/fuse-ignite-ui:1.1
 
           imagePullPolicy: IfNotPresent
           livenessProbe:
@@ -239,11 +223,11 @@ objects:
           "baseMappingServiceUrl": "https://${ROUTE_HOSTNAME}/v2/atlas/"
         },
         "branding": {
-          "logoWhiteBg": "assets/images/syndesis-logo-svg-white.svg",
-          "logoDarkBg": "assets/images/syndesis-logo-svg-white.svg",
-          "iconWhiteBg": "assets/images/glasses_logo_square.png",
-          "iconDarkBg": "assets/images/glasses_logo_square.png",
-          "appName": "Syndesis",
+          "logoWhiteBg": "",
+          "logoDarkBg": "",
+          "iconWhiteBg": "assets/images/FuseIgniteLogo_Black.svg",
+          "iconDarkBg": "assets/images/FuseIgniteLogo_White.svg",
+          "appName": "Ignite",
           "favicon32": "/favicon-32x32.png",
           "favicon16": "/favicon-16x16.png",
           "touchIcon": "/apple-touch-icon.png"
@@ -316,7 +300,7 @@ objects:
             value: "true"
           - name: JAVA_OPTIONS
             value: "-Djava.net.preferIPv4Stack=true -Duser.home=/tmp"
-          image: ${SYNDESIS_REGISTRY}/atlasmap/atlasmap:latest
+          image: ${SYNDESIS_REGISTRY}/atlasmap/fuse-ignite-mapper:1.31
 
           imagePullPolicy: IfNotPresent
           readinessProbe:
@@ -748,7 +732,7 @@ objects:
             value: ${CONTROLLERS_INTEGRATION_ENABLED}
           - name: POSTGRESQL_SAMPLEDB_PASSWORD
             value: ${POSTGRESQL_SAMPLEDB_PASSWORD}
-          image: ${SYNDESIS_REGISTRY}/syndesis/syndesis-rest:latest
+          image: ${SYNDESIS_REGISTRY}/syndesis/fuse-ignite-rest:1.1
 
           imagePullPolicy: IfNotPresent
           livenessProbe:
@@ -832,7 +816,7 @@ objects:
         apiBaseUrl: ${OPENSHIFT_MASTER}/oapi/v1
         namespace: ${NAMESPACE}
         imageStreamNamespace: ${IMAGE_STREAM_NAMESPACE}
-        builderImageStreamTag: s2i-java:2.0
+        builderImageStreamTag: fuse-ignite-java-openshift:1.0
         deploymentMemoryRequestMi: 200
         deploymentMemoryLimitMi: 512
         mavenOptions: "-XX:+UseG1GC -XX:+UseStringDeduplication -Xmx310m"
@@ -888,7 +872,7 @@ objects:
             value: /deployments
           - name: JAVA_OPTIONS
             value: "-Djava.net.preferIPv4Stack=true -Duser.home=/tmp"
-          image: ${SYNDESIS_REGISTRY}/syndesis/syndesis-verifier:latest
+          image: ${SYNDESIS_REGISTRY}/syndesis/fuse-ignite-verifier:1.1
 
           imagePullPolicy: IfNotPresent
           readinessProbe: