Merge pull request #2237 from sdodson/dot-net

Add dotnet image stream to enterprise installs

roles/openshift_examples/defaults/main.yml

@@ -11,7 +11,9 @@ content_version: "{{ openshift.common.examples_content_version }}"
 examples_base: "{{ openshift.common.config_base if openshift.common.is_containerized | bool else '/usr/share/openshift' }}/examples"
 image_streams_base: "{{ examples_base }}/image-streams"
 centos_image_streams: "{{ image_streams_base}}/image-streams-centos7.json"
-rhel_image_streams: "{{ image_streams_base}}/image-streams-rhel7.json"
+rhel_image_streams:
+ - "{{ image_streams_base}}/image-streams-rhel7.json"
+ - "{{ image_streams_base}}/dotnet_imagestreams.json"
 db_templates_base: "{{ examples_base }}/db-templates"
 xpaas_image_streams: "{{ examples_base }}/xpaas-streams/"
 xpaas_templates_base: "{{ examples_base }}/xpaas-templates"

roles/openshift_examples/examples-sync.sh

@@ -39,7 +39,7 @@ cp cakephp-ex-master/openshift/templates/* ${EXAMPLES_BASE}/quickstart-templates
 mv application-templates-${XPAAS_VERSION}/jboss-image-streams.json ${EXAMPLES_BASE}/xpaas-streams/
 find application-templates-${XPAAS_VERSION}/ -name '*.json' ! -wholename '*secret*' ! -wholename '*demo*' -exec mv {} ${EXAMPLES_BASE}/xpaas-templates/ \;
 wget https://raw.githubusercontent.com/jboss-fuse/application-templates/master/fis-image-streams.json          -O ${EXAMPLES_BASE}/xpaas-streams/fis-image-streams.json
-
+wget https://raw.githubusercontent.com/redhat-developer/s2i-dotnetcore/master/dotnet_imagestreams.json         -O ${EXAMPLES_BASE}/image-streams/dotnet_imagestreams.json
 wget https://raw.githubusercontent.com/openshift/origin-metrics/master/metrics.yaml                            -O ${EXAMPLES_BASE}/infrastructure-templates/origin/metrics-deployer.yaml
 wget https://raw.githubusercontent.com/openshift/origin-metrics/enterprise/metrics.yaml                        -O ${EXAMPLES_BASE}/infrastructure-templates/enterprise/metrics-deployer.yaml
 wget https://raw.githubusercontent.com/openshift/origin-aggregated-logging/master/deployer/deployer.yaml     -O ${EXAMPLES_BASE}/infrastructure-templates/origin/logging-deployer.yaml

roles/openshift_examples/files/examples/v1.2/image-streams/dotnet_imagestreams.json

@@ -0,0 +1,36 @@
+{
+    "kind": "List",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "dotnet-image-streams",
+        "annotations": {
+            "description": "ImageStream definitions for .Net Core on RHEL"
+        }
+    },
+    "items": [
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "dotnetcore-10-rhel7"
+            },
+            "spec": {
+                "dockerImageRepository": "registry.access.redhat.com/dotnet/dotnetcore-10-rhel7",
+                "tags": [
+                    {
+                        "name": "1.0",
+                        "annotations": {
+                            "description": ".Net Core 1.0 S2I image.",
+                            "iconClass": "icon-dotnet",
+                            "tags": "builder,.net,dotnet,dotnetcore,rh-dotnetcore10",
+                            "supports":"dotnet:1.0",
+                            "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore.git",
+                            "sampleContextDir": "1.0/test/asp-net-hello-world",
+                            "version": "1.0"
+                        }
+                    }
+                ]
+            }
+        }
+    ]
+}

roles/openshift_examples/files/examples/v1.3/image-streams/dotnet_imagestreams.json

@@ -0,0 +1,36 @@
+{
+    "kind": "List",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "dotnet-image-streams",
+        "annotations": {
+            "description": "ImageStream definitions for .Net Core on RHEL"
+        }
+    },
+    "items": [
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "dotnetcore-10-rhel7"
+            },
+            "spec": {
+                "dockerImageRepository": "registry.access.redhat.com/dotnet/dotnetcore-10-rhel7",
+                "tags": [
+                    {
+                        "name": "1.0",
+                        "annotations": {
+                            "description": ".Net Core 1.0 S2I image.",
+                            "iconClass": "icon-dotnet",
+                            "tags": "builder,.net,dotnet,dotnetcore,rh-dotnetcore10",
+                            "supports":"dotnet:1.0",
+                            "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore.git",
+                            "sampleContextDir": "1.0/test/asp-net-hello-world",
+                            "version": "1.0"
+                        }
+                    }
+                ]
+            }
+        }
+    ]
+}

roles/openshift_examples/tasks/main.yml

@@ -49,8 +49,10 @@
 # RHEL and Centos image streams are mutually exclusive
 - name: Import RHEL streams
   command: >
-    {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ rhel_image_streams }}
+    {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ item }}
   when: openshift_examples_load_rhel | bool
+  with_items:
+    - "{{ rhel_image_streams }}"
   register: oex_import_rhel_streams
   failed_when: "'already exists' not in oex_import_rhel_streams.stderr and oex_import_rhel_streams.rc != 0"
   changed_when: false
@@ -100,12 +102,15 @@
     path: "{{ item }}"
     state: absent
   with_items:
-    - "{{ xpaas_templates }}/sso70-basic.json"
+    - "{{ xpaas_templates_base }}/sso70-basic.json"
 
 - name: Remove old xPaas templates from openshift namespace
-  command: oc delete -n openshift {{ item }}
+  command: "{{ openshift.common.client_binary }} -n openshift delete templates/{{ item }}"
   with_items:
     - sso70-basic
+  register: oex_delete_old_xpaas_templates
+  failed_when: "'not found' not in oex_delete_old_xpaas_templates.stderr and oex_delete_old_xpaas_templates.rc != 0"
+  changed_when: false
 
 - name: Import xPaas image streams
   command: >