Browse Source

sync examples

Ben Parees 7 years ago
parent
commit
1423ec5594

+ 2 - 2
roles/openshift_examples/files/examples/v3.10/image-streams/dotnet_imagestreams.json

@@ -14,7 +14,7 @@
             "metadata": {
                 "name": "dotnet",
                 "annotations": {
-                    "openshift.io/display-name": ".NET Core Builder Images"
+                    "openshift.io/display-name": ".NET Core"
                 }
             },
             "spec": {
@@ -99,7 +99,7 @@
             "metadata": {
                 "name": "dotnet-runtime",
                 "annotations": {
-                    "openshift.io/display-name": ".NET Core Runtime Images"
+                    "openshift.io/display-name": ".NET Core Runtime"
                 }
             },
             "spec": {

+ 2 - 2
roles/openshift_examples/files/examples/v3.10/image-streams/dotnet_imagestreams_centos.json

@@ -14,7 +14,7 @@
             "metadata": {
                 "name": "dotnet",
                 "annotations": {
-                    "openshift.io/display-name": ".NET Core Builder Images"
+                    "openshift.io/display-name": ".NET Core"
                 }
             },
             "spec": {
@@ -63,7 +63,7 @@
             "metadata": {
                 "name": "dotnet-runtime",
                 "annotations": {
-                    "openshift.io/display-name": ".NET Core Runtime Images"
+                    "openshift.io/display-name": ".NET Core Runtime"
                 }
             },
             "spec": {

+ 249 - 69
roles/openshift_examples/files/examples/v3.10/image-streams/image-streams-centos7.json

@@ -7,7 +7,7 @@
       "kind": "ImageStream",
       "metadata": {
         "annotations": {
-          "openshift.io/display-name": ".NET Core Builder Images"
+          "openshift.io/display-name": ".NET Core"
         },
         "name": "dotnet"
       },
@@ -76,7 +76,10 @@
               "kind": "ImageStreamTag",
               "name": "2.4"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -93,7 +96,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/httpd-24-centos7:latest"
             },
-            "name": "2.4"
+            "name": "2.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -121,7 +127,10 @@
               "kind": "ImageStreamTag",
               "name": "2"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -136,7 +145,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/jenkins-1-centos7:latest"
             },
-            "name": "1"
+            "name": "1",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -151,7 +163,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/jenkins-2-centos7:v3.10"
             },
-            "name": "2"
+            "name": "2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -179,7 +194,10 @@
               "kind": "ImageStreamTag",
               "name": "10.2"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -194,7 +212,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/mariadb-101-centos7:latest"
             },
-            "name": "10.1"
+            "name": "10.1",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -209,7 +230,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/mariadb-102-centos7:latest"
             },
-            "name": "10.2"
+            "name": "10.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -237,7 +261,10 @@
               "kind": "ImageStreamTag",
               "name": "3.4"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -252,7 +279,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/mongodb-24-centos7:latest"
             },
-            "name": "2.4"
+            "name": "2.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -260,14 +290,17 @@
               "iconClass": "icon-mongodb",
               "openshift.io/display-name": "MongoDB 2.6",
               "openshift.io/provider-display-name": "Red Hat, Inc.",
-              "tags": "database,mongodb",
+              "tags": "hidden,database,mongodb",
               "version": "2.6"
             },
             "from": {
               "kind": "DockerImage",
               "name": "docker.io/centos/mongodb-26-centos7:latest"
             },
-            "name": "2.6"
+            "name": "2.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -282,7 +315,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/mongodb-32-centos7:latest"
             },
-            "name": "3.2"
+            "name": "3.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -297,7 +333,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/mongodb-34-centos7:latest"
             },
-            "name": "3.4"
+            "name": "3.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -325,7 +364,10 @@
               "kind": "ImageStreamTag",
               "name": "5.7"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -340,7 +382,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/mysql-55-centos7:latest"
             },
-            "name": "5.5"
+            "name": "5.5",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -348,14 +393,17 @@
               "iconClass": "icon-mysql-database",
               "openshift.io/display-name": "MySQL 5.6",
               "openshift.io/provider-display-name": "Red Hat, Inc.",
-              "tags": "mysql",
+              "tags": "hidden,mysql",
               "version": "5.6"
             },
             "from": {
               "kind": "DockerImage",
               "name": "docker.io/centos/mysql-56-centos7:latest"
             },
-            "name": "5.6"
+            "name": "5.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -370,7 +418,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/mysql-57-centos7:latest"
             },
-            "name": "5.7"
+            "name": "5.7",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -401,7 +452,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/nginx-18-centos7:latest"
             },
-            "name": "1.8"
+            "name": "1.8",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -418,7 +472,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/nginx-110-centos7:latest"
             },
-            "name": "1.10"
+            "name": "1.10",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -435,7 +492,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/nginx-112-centos7:latest"
             },
-            "name": "1.12"
+            "name": "1.12",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -451,7 +511,10 @@
               "kind": "ImageStreamTag",
               "name": "1.12"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -481,7 +544,10 @@
               "kind": "ImageStreamTag",
               "name": "8"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -498,7 +564,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/nodejs-010-centos7:latest"
             },
-            "name": "0.10"
+            "name": "0.10",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -508,14 +577,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/nodejs-ex.git",
               "supports": "nodejs:4,nodejs",
-              "tags": "builder,nodejs",
+              "tags": "hidden,builder,nodejs",
               "version": "4"
             },
             "from": {
               "kind": "DockerImage",
               "name": "docker.io/centos/nodejs-4-centos7:latest"
             },
-            "name": "4"
+            "name": "4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -532,7 +604,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/nodejs-6-centos7:latest"
             },
-            "name": "6"
+            "name": "6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -548,7 +623,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/nodejs-8-centos7:latest"
             },
-            "name": "8"
+            "name": "8",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -578,7 +656,10 @@
               "kind": "ImageStreamTag",
               "name": "5.24"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -595,7 +676,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/perl-516-centos7:latest"
             },
-            "name": "5.16"
+            "name": "5.16",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -605,14 +689,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/dancer-ex.git",
               "supports": "perl:5.20,perl",
-              "tags": "builder,perl",
+              "tags": "hidden,builder,perl",
               "version": "5.20"
             },
             "from": {
               "kind": "DockerImage",
               "name": "docker.io/centos/perl-520-centos7:latest"
             },
-            "name": "5.20"
+            "name": "5.20",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -629,7 +716,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/perl-524-centos7:latest"
             },
-            "name": "5.24"
+            "name": "5.24",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -659,7 +749,10 @@
               "kind": "ImageStreamTag",
               "name": "7.1"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -676,7 +769,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/php-55-centos7:latest"
             },
-            "name": "5.5"
+            "name": "5.5",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -686,14 +782,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/cakephp-ex.git",
               "supports": "php:5.6,php",
-              "tags": "builder,php",
+              "tags": "hidden,builder,php",
               "version": "5.6"
             },
             "from": {
               "kind": "DockerImage",
               "name": "docker.io/centos/php-56-centos7:latest"
             },
-            "name": "5.6"
+            "name": "5.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -710,7 +809,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/php-70-centos7:latest"
             },
-            "name": "7.0"
+            "name": "7.0",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -727,7 +829,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/php-71-centos7:latest"
             },
-            "name": "7.1"
+            "name": "7.1",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -755,7 +860,10 @@
               "kind": "ImageStreamTag",
               "name": "9.6"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -770,7 +878,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/postgresql-92-centos7:latest"
             },
-            "name": "9.2"
+            "name": "9.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -778,14 +889,17 @@
               "iconClass": "icon-postgresql",
               "openshift.io/display-name": "PostgreSQL 9.4",
               "openshift.io/provider-display-name": "Red Hat, Inc.",
-              "tags": "database,postgresql",
+              "tags": "hidden,database,postgresql",
               "version": "9.4"
             },
             "from": {
               "kind": "DockerImage",
               "name": "docker.io/centos/postgresql-94-centos7:latest"
             },
-            "name": "9.4"
+            "name": "9.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -800,7 +914,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/postgresql-95-centos7:latest"
             },
-            "name": "9.5"
+            "name": "9.5",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -815,7 +932,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/postgresql-96-centos7:latest"
             },
-            "name": "9.6"
+            "name": "9.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -845,7 +965,10 @@
               "kind": "ImageStreamTag",
               "name": "3.6"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -862,7 +985,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/python-33-centos7:latest"
             },
-            "name": "3.3"
+            "name": "3.3",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -879,7 +1005,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/python-27-centos7:latest"
             },
-            "name": "2.7"
+            "name": "2.7",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -889,14 +1018,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/django-ex.git",
               "supports": "python:3.4,python",
-              "tags": "builder,python",
+              "tags": "hidden,builder,python",
               "version": "3.4"
             },
             "from": {
               "kind": "DockerImage",
               "name": "docker.io/centos/python-34-centos7:latest"
             },
-            "name": "3.4"
+            "name": "3.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -913,7 +1045,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/python-35-centos7:latest"
             },
-            "name": "3.5"
+            "name": "3.5",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -930,7 +1065,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/python-36-centos7:latest"
             },
-            "name": "3.6"
+            "name": "3.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -958,7 +1096,10 @@
               "kind": "ImageStreamTag",
               "name": "3.2"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -973,7 +1114,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/redis-32-centos7:latest"
             },
-            "name": "3.2"
+            "name": "3.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -1003,7 +1147,10 @@
               "kind": "ImageStreamTag",
               "name": "2.4"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1020,7 +1167,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/ruby-20-centos7:latest"
             },
-            "name": "2.0"
+            "name": "2.0",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1030,14 +1180,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/ruby-ex.git",
               "supports": "ruby:2.2,ruby",
-              "tags": "builder,ruby",
+              "tags": "hidden,builder,ruby",
               "version": "2.2"
             },
             "from": {
               "kind": "DockerImage",
               "name": "docker.io/centos/ruby-22-centos7:latest"
             },
-            "name": "2.2"
+            "name": "2.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1054,7 +1207,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/ruby-23-centos7:latest"
             },
-            "name": "2.3"
+            "name": "2.3",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1071,7 +1227,10 @@
               "kind": "DockerImage",
               "name": "docker.io/centos/ruby-24-centos7:latest"
             },
-            "name": "2.4"
+            "name": "2.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -1101,7 +1260,10 @@
               "kind": "ImageStreamTag",
               "name": "12.0"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1118,7 +1280,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/wildfly-81-centos7:latest"
             },
-            "name": "8.1"
+            "name": "8.1",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1135,7 +1300,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/wildfly-90-centos7:latest"
             },
-            "name": "9.0"
+            "name": "9.0",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1152,7 +1320,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/wildfly-100-centos7:latest"
             },
-            "name": "10.0"
+            "name": "10.0",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1169,7 +1340,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/wildfly-101-centos7:latest"
             },
-            "name": "10.1"
+            "name": "10.1",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1186,7 +1360,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/wildfly-110-centos7:latest"
             },
-            "name": "11.0"
+            "name": "11.0",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1203,7 +1380,10 @@
               "kind": "DockerImage",
               "name": "docker.io/openshift/wildfly-120-centos7:latest"
             },
-            "name": "12.0"
+            "name": "12.0",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }

+ 220 - 61
roles/openshift_examples/files/examples/v3.10/image-streams/image-streams-rhel7.json

@@ -27,7 +27,10 @@
               "kind": "ImageStreamTag",
               "name": "2.4"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -44,7 +47,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/httpd-24-rhel7"
             },
-            "name": "2.4"
+            "name": "2.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -72,7 +78,10 @@
               "kind": "ImageStreamTag",
               "name": "2"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -87,7 +96,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/jenkins-1-rhel7:latest"
             },
-            "name": "1"
+            "name": "1",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -102,7 +114,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7:v3.10"
             },
-            "name": "2"
+            "name": "2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -130,7 +145,10 @@
               "kind": "ImageStreamTag",
               "name": "10.2"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -145,7 +163,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/mariadb-101-rhel7:latest"
             },
-            "name": "10.1"
+            "name": "10.1",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -160,7 +181,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/mariadb-102-rhel7:latest"
             },
-            "name": "10.2"
+            "name": "10.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -188,7 +212,10 @@
               "kind": "ImageStreamTag",
               "name": "3.4"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -203,7 +230,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/mongodb-24-rhel7:latest"
             },
-            "name": "2.4"
+            "name": "2.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -211,14 +241,17 @@
               "iconClass": "icon-mongodb",
               "openshift.io/display-name": "MongoDB 2.6",
               "openshift.io/provider-display-name": "Red Hat, Inc.",
-              "tags": "database,mongodb",
+              "tags": "hidden,database,mongodb",
               "version": "2.6"
             },
             "from": {
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/mongodb-26-rhel7:latest"
             },
-            "name": "2.6"
+            "name": "2.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -233,7 +266,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/mongodb-32-rhel7:latest"
             },
-            "name": "3.2"
+            "name": "3.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -248,7 +284,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/mongodb-34-rhel7:latest"
             },
-            "name": "3.4"
+            "name": "3.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -276,7 +315,10 @@
               "kind": "ImageStreamTag",
               "name": "5.7"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -291,7 +333,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/mysql-55-rhel7:latest"
             },
-            "name": "5.5"
+            "name": "5.5",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -299,14 +344,17 @@
               "iconClass": "icon-mysql-database",
               "openshift.io/display-name": "MySQL 5.6",
               "openshift.io/provider-display-name": "Red Hat, Inc.",
-              "tags": "mysql",
+              "tags": "hidden,mysql",
               "version": "5.6"
             },
             "from": {
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/mysql-56-rhel7:latest"
             },
-            "name": "5.6"
+            "name": "5.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -321,7 +369,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/mysql-57-rhel7:latest"
             },
-            "name": "5.7"
+            "name": "5.7",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -352,7 +403,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/nginx-18-rhel7:latest"
             },
-            "name": "1.8"
+            "name": "1.8",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -369,7 +423,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/nginx-110-rhel7:latest"
             },
-            "name": "1.10"
+            "name": "1.10",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -386,7 +443,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/nginx-112-rhel7:latest"
             },
-            "name": "1.12"
+            "name": "1.12",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -402,7 +462,10 @@
               "kind": "ImageStreamTag",
               "name": "1.12"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -432,7 +495,10 @@
               "kind": "ImageStreamTag",
               "name": "8"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -449,7 +515,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/nodejs-010-rhel7:latest"
             },
-            "name": "0.10"
+            "name": "0.10",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -459,14 +528,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/nodejs-ex.git",
               "supports": "nodejs:4,nodejs",
-              "tags": "builder,nodejs",
+              "tags": "hidden,builder,nodejs",
               "version": "4"
             },
             "from": {
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/nodejs-4-rhel7:latest"
             },
-            "name": "4"
+            "name": "4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -483,7 +555,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/nodejs-6-rhel7:latest"
             },
-            "name": "6"
+            "name": "6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -499,7 +574,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/nodejs-8-rhel7:latest"
             },
-            "name": "8"
+            "name": "8",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -529,7 +607,10 @@
               "kind": "ImageStreamTag",
               "name": "5.24"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -546,7 +627,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/perl-516-rhel7:latest"
             },
-            "name": "5.16"
+            "name": "5.16",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -556,14 +640,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/dancer-ex.git",
               "supports": "perl:5.20,perl",
-              "tags": "builder,perl",
+              "tags": "hidden,builder,perl",
               "version": "5.20"
             },
             "from": {
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/perl-520-rhel7:latest"
             },
-            "name": "5.20"
+            "name": "5.20",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -580,7 +667,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/perl-524-rhel7:latest"
             },
-            "name": "5.24"
+            "name": "5.24",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -610,7 +700,10 @@
               "kind": "ImageStreamTag",
               "name": "7.1"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -627,7 +720,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/php-55-rhel7:latest"
             },
-            "name": "5.5"
+            "name": "5.5",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -637,14 +733,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/cakephp-ex.git",
               "supports": "php:5.6,php",
-              "tags": "builder,php",
+              "tags": "hidden,builder,php",
               "version": "5.6"
             },
             "from": {
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/php-56-rhel7:latest"
             },
-            "name": "5.6"
+            "name": "5.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -661,7 +760,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/php-70-rhel7:latest"
             },
-            "name": "7.0"
+            "name": "7.0",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -678,7 +780,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/php-71-rhel7:latest"
             },
-            "name": "7.1"
+            "name": "7.1",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -706,7 +811,10 @@
               "kind": "ImageStreamTag",
               "name": "9.6"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -721,7 +829,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/postgresql-92-rhel7:latest"
             },
-            "name": "9.2"
+            "name": "9.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -729,14 +840,17 @@
               "iconClass": "icon-postgresql",
               "openshift.io/display-name": "PostgreSQL 9.4",
               "openshift.io/provider-display-name": "Red Hat, Inc.",
-              "tags": "database,postgresql",
+              "tags": "hidden,database,postgresql",
               "version": "9.4"
             },
             "from": {
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/postgresql-94-rhel7:latest"
             },
-            "name": "9.4"
+            "name": "9.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -751,7 +865,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/postgresql-95-rhel7:latest"
             },
-            "name": "9.5"
+            "name": "9.5",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -766,7 +883,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/postgresql-96-rhel7:latest"
             },
-            "name": "9.6"
+            "name": "9.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -796,7 +916,10 @@
               "kind": "ImageStreamTag",
               "name": "3.6"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -813,7 +936,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/python-33-rhel7:latest"
             },
-            "name": "3.3"
+            "name": "3.3",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -830,7 +956,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/python-27-rhel7:latest"
             },
-            "name": "2.7"
+            "name": "2.7",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -840,14 +969,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/django-ex.git",
               "supports": "python:3.4,python",
-              "tags": "builder,python",
+              "tags": "hidden,builder,python",
               "version": "3.4"
             },
             "from": {
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/python-34-rhel7:latest"
             },
-            "name": "3.4"
+            "name": "3.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -864,7 +996,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/python-35-rhel7:latest"
             },
-            "name": "3.5"
+            "name": "3.5",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -881,7 +1016,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/python-36-rhel7:latest"
             },
-            "name": "3.6"
+            "name": "3.6",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -909,7 +1047,10 @@
               "kind": "ImageStreamTag",
               "name": "3.2"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -924,7 +1065,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/redis-32-rhel7:latest"
             },
-            "name": "3.2"
+            "name": "3.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }
@@ -954,7 +1098,10 @@
               "kind": "ImageStreamTag",
               "name": "2.4"
             },
-            "name": "latest"
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -971,7 +1118,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/openshift3/ruby-20-rhel7:latest"
             },
-            "name": "2.0"
+            "name": "2.0",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -981,14 +1131,17 @@
               "openshift.io/provider-display-name": "Red Hat, Inc.",
               "sampleRepo": "https://github.com/openshift/ruby-ex.git",
               "supports": "ruby:2.2,ruby",
-              "tags": "builder,ruby",
+              "tags": "hidden,builder,ruby",
               "version": "2.2"
             },
             "from": {
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/ruby-22-rhel7:latest"
             },
-            "name": "2.2"
+            "name": "2.2",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1005,7 +1158,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/ruby-23-rhel7:latest"
             },
-            "name": "2.3"
+            "name": "2.3",
+            "referencePolicy": {
+              "type": "Local"
+            }
           },
           {
             "annotations": {
@@ -1022,7 +1178,10 @@
               "kind": "DockerImage",
               "name": "registry.access.redhat.com/rhscl/ruby-24-rhel7:latest"
             },
-            "name": "2.4"
+            "name": "2.4",
+            "referencePolicy": {
+              "type": "Local"
+            }
           }
         ]
       }

+ 3 - 0
roles/openshift_examples/files/examples/v3.10/quickstart-templates/README.md

@@ -20,6 +20,9 @@ instantiating them.
 * [Django](https://raw.githubusercontent.com/openshift/library/master/official/django/templates/django-psql-example.json) - Provides a basic Django (Python) application with a PostgreSQL database. For more information see the [source repository](https://github.com/openshift/django-ex).
 * [Django persistent](https://raw.githubusercontent.com/openshift/library/master/official/django/templates/django-psql-persistent.json) - Provides a basic Django (Python) application with a persistent PostgreSQL database. Note: requires available persistent volumes.  For more information see the [source repository](https://github.com/openshift/django-ex).
 
+* [.NET Core](https://raw.githubusercontent.com/openshift/library/master/official/dotnet/templates/dotnet-example.json) - Provides a basic .NET Core application. For more information see the [source repository](https://github.com/redhat-developer/s2i-dotnetcore).
+* [[.NET Core persistent](https://raw.githubusercontent.com/openshift/library/master/official/dotnet/templates/dotnet-pgsql-persistent.json) - Provides a basic .NET Core application with a persistent PostgreSQL database. Note: requires available persistent volumes.  For more information see the [source repository](https://github.com/redhat-developer/s2i-dotnetcore).
+
 * [Httpd](https://raw.githubusercontent.com/openshift/library/master/official/httpd/templates/httpd-example.json) - Provides a basic Httpd static content application. For more information see the [source repository](https://github.com/openshift/httpd-ex).
 
 * [Nginx](https://raw.githubusercontent.com/openshift/library/master/official/nginx/templates/nginx-example.json) - Provides a basic Nginx static content application. For more information see the [source repository](https://github.com/sclorg/nginx-ex).

+ 1 - 1
roles/openshift_examples/files/examples/v3.10/quickstart-templates/dotnet-example.json

@@ -307,7 +307,7 @@
             "value": ""
         },
         {
-            "name": "DOTNET_SDK_VERSION",
+            "name": "DOTNET_STARTUP_PROJECT",
             "displayName": "Startup Project",
             "description": "Set this to a project file (e.g. csproj) or a folder containing a single project file.",
             "value": "app"

+ 343 - 0
roles/openshift_examples/files/examples/v3.10/quickstart-templates/dotnet.json

@@ -0,0 +1,343 @@
+{
+    "apiVersion": "v1",
+    "kind": "Template",
+    "metadata": {
+        "annotations": {
+            "description": "An example .NET Core application.",
+            "iconClass": "icon-dotnet",
+            "openshift.io/display-name": ".NET Core Example",
+            "tags": "quickstart,dotnet,.net",
+            "template.openshift.io/documentation-url": "https://github.com/redhat-developer/s2i-dotnetcore",
+            "template.openshift.io/provider-display-name": "Red Hat, Inc.",
+            "template.openshift.io/support-url": "https://access.redhat.com"
+        },
+        "name": "dotnet-example"
+    },
+    "objects": [
+        {
+            "apiVersion": "v1",
+            "kind": "Route",
+            "metadata": {
+                "name": "${NAME}"
+            },
+            "spec": {
+                "host": "${APPLICATION_DOMAIN}",
+                "to": {
+                    "kind": "Service",
+                    "name": "${NAME}"
+                }
+            }
+        },
+        {
+            "apiVersion": "v1",
+            "kind": "Service",
+            "metadata": {
+                "annotations": {
+                    "description": "Exposes and load balances the application pods"
+                },
+                "name": "${NAME}"
+            },
+            "spec": {
+                "ports": [
+                    {
+                        "name": "web",
+                        "port": 8080,
+                        "targetPort": 8080
+                    }
+                ],
+                "selector": {
+                    "name": "${NAME}"
+                }
+            }
+        },
+        {
+            "apiVersion": "v1",
+            "kind": "ImageStream",
+            "metadata": {
+                "annotations": {
+                    "description": "Keeps track of changes in the application image"
+                },
+                "name": "${NAME}"
+            }
+        },
+        {
+            "apiVersion": "v1",
+            "kind": "BuildConfig",
+            "metadata": {
+                "annotations": {
+                    "description": "Defines how to build the application"
+                },
+                "name": "${NAME}"
+            },
+            "spec": {
+                "output": {
+                    "to": {
+                        "kind": "ImageStreamTag",
+                        "name": "${NAME}:latest"
+                    }
+                },
+                "source": {
+                    "contextDir": "${CONTEXT_DIR}",
+                    "git": {
+                        "ref": "${SOURCE_REPOSITORY_REF}",
+                        "uri": "${SOURCE_REPOSITORY_URL}"
+                    },
+                    "type": "Git"
+                },
+                "strategy": {
+                    "sourceStrategy": {
+                        "env": [
+                            {
+                                "name": "DOTNET_STARTUP_PROJECT",
+                                "value": "${DOTNET_STARTUP_PROJECT}"
+                            },
+                            {
+                                "name": "DOTNET_SDK_VERSION",
+                                "value": "${DOTNET_SDK_VERSION}"
+                            },
+                            {
+                                "name": "DOTNET_ASSEMBLY_NAME",
+                                "value": "${DOTNET_ASSEMBLY_NAME}"
+                            },
+                            {
+                                "name": "DOTNET_NPM_TOOLS",
+                                "value": "${DOTNET_NPM_TOOLS}"
+                            },
+                            {
+                                "name": "DOTNET_TEST_PROJECTS",
+                                "value": "${DOTNET_TEST_PROJECTS}"
+                            },
+                            {
+                                "name": "DOTNET_CONFIGURATION",
+                                "value": "${DOTNET_CONFIGURATION}"
+                            },
+                            {
+                                "name": "DOTNET_PUBLISH",
+                                "value": "true"
+                            },
+                            {
+                                "name": "DOTNET_RESTORE_SOURCES",
+                                "value": "${DOTNET_RESTORE_SOURCES}"
+                            }
+                        ],
+                        "from": {
+                            "kind": "ImageStreamTag",
+                            "name": "${DOTNET_IMAGE_STREAM_TAG}",
+                            "namespace": "${NAMESPACE}"
+                        }
+                    },
+                    "type": "Source"
+                },
+                "triggers": [
+                    {
+                        "type": "ImageChange"
+                    },
+                    {
+                        "type": "ConfigChange"
+                    },
+                    {
+                        "github": {
+                            "secret": "${GITHUB_WEBHOOK_SECRET}"
+                        },
+                        "type": "GitHub"
+                    },
+                    {
+                        "generic": {
+                            "secret": "${GENERIC_WEBHOOK_SECRET}"
+                        },
+                        "type": "Generic"
+                    }
+                ]
+            }
+        },
+        {
+            "apiVersion": "v1",
+            "kind": "DeploymentConfig",
+            "metadata": {
+                "annotations": {
+                    "description": "Defines how to deploy the application server"
+                },
+                "name": "${NAME}"
+            },
+            "spec": {
+                "replicas": 1,
+                "selector": {
+                    "name": "${NAME}"
+                },
+                "strategy": {
+                    "type": "Rolling"
+                },
+                "template": {
+                    "metadata": {
+                        "labels": {
+                            "name": "${NAME}"
+                        },
+                        "name": "${NAME}"
+                    },
+                    "spec": {
+                        "containers": [
+                            {
+                                "env": [],
+                                "image": " ",
+                                "livenessProbe": {
+                                    "httpGet": {
+                                        "path": "/",
+                                        "port": 8080,
+                                        "scheme": "HTTP"
+                                    },
+                                    "initialDelaySeconds": 40,
+                                    "timeoutSeconds": 15
+                                },
+                                "name": "dotnet-app",
+                                "ports": [
+                                    {
+                                        "containerPort": 8080
+                                    }
+                                ],
+                                "readinessProbe": {
+                                    "httpGet": {
+                                        "path": "/",
+                                        "port": 8080,
+                                        "scheme": "HTTP"
+                                    },
+                                    "initialDelaySeconds": 10,
+                                    "timeoutSeconds": 30
+                                },
+                                "resources": {
+                                    "limits": {
+                                        "memory": "${MEMORY_LIMIT}"
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                },
+                "triggers": [
+                    {
+                        "imageChangeParams": {
+                            "automatic": true,
+                            "containerNames": [
+                                "dotnet-app"
+                            ],
+                            "from": {
+                                "kind": "ImageStreamTag",
+                                "name": "${NAME}:latest"
+                            }
+                        },
+                        "type": "ImageChange"
+                    },
+                    {
+                        "type": "ConfigChange"
+                    }
+                ]
+            }
+        }
+    ],
+    "parameters": [
+        {
+            "description": "The name assigned to all of the frontend objects defined in this template.",
+            "displayName": "Name",
+            "name": "NAME",
+            "required": true,
+            "value": "dotnet-example"
+        },
+        {
+            "description": "Maximum amount of memory the container can use.",
+            "displayName": "Memory Limit",
+            "name": "MEMORY_LIMIT",
+            "required": true,
+            "value": "512Mi"
+        },
+        {
+            "description": "The image stream tag which is used to build the code.",
+            "displayName": ".NET builder",
+            "name": "DOTNET_IMAGE_STREAM_TAG",
+            "required": true,
+            "value": "dotnet:2.0"
+        },
+        {
+            "description": "The OpenShift Namespace where the ImageStream resides.",
+            "displayName": "Namespace",
+            "name": "NAMESPACE",
+            "required": true,
+            "value": "openshift"
+        },
+        {
+            "description": "The URL of the repository with your application source code.",
+            "displayName": "Git Repository URL",
+            "name": "SOURCE_REPOSITORY_URL",
+            "required": true,
+            "value": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git"
+        },
+        {
+            "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.",
+            "displayName": "Git Reference",
+            "name": "SOURCE_REPOSITORY_REF",
+            "value": "dotnetcore-2.0"
+        },
+        {
+            "description": "Set this to use a subdirectory of the source code repository",
+            "displayName": "Context Directory",
+            "name": "CONTEXT_DIR"
+        },
+        {
+            "description": "The exposed hostname that will route to the .NET Core service, if left blank a value will be defaulted.",
+            "displayName": "Application Hostname",
+            "name": "APPLICATION_DOMAIN",
+            "value": ""
+        },
+        {
+            "description": "A secret string used to configure the GitHub webhook.",
+            "displayName": "GitHub Webhook Secret",
+            "from": "[a-zA-Z0-9]{40}",
+            "generate": "expression",
+            "name": "GITHUB_WEBHOOK_SECRET"
+        },
+        {
+            "description": "A secret string used to configure the Generic webhook.",
+            "displayName": "Generic Webhook Secret",
+            "from": "[a-zA-Z0-9]{40}",
+            "generate": "expression",
+            "name": "GENERIC_WEBHOOK_SECRET"
+        },
+        {
+            "description": "Set this to configure the default SDK version. This can be set to a specific version, '' (lowest version) or 'latest' (highest version).",
+            "displayName": "SDK Version",
+            "name": "DOTNET_SDK_VERSION",
+            "value": ""
+        },
+        {
+            "description": "Set this to a project file (e.g. csproj) or a folder containing a single project file.",
+            "displayName": "Startup Project",
+            "name": "DOTNET_STARTUP_PROJECT",
+            "value": "app"
+        },
+        {
+            "description": "Set this when the assembly name is overridden in the project file.",
+            "displayName": "Startup Assembly",
+            "name": "DOTNET_ASSEMBLY_NAME"
+        },
+        {
+            "description": "Set this to a space separated list of npm tools needed to publish.",
+            "displayName": "Npm Tools",
+            "name": "DOTNET_NPM_TOOLS",
+            "value": "bower gulp"
+        },
+        {
+            "description": "Set this to a space separated list of test projects to run before publishing.",
+            "displayName": "Test projects",
+            "name": "DOTNET_TEST_PROJECTS"
+        },
+        {
+            "description": "Set this to configuration (Release/Debug).",
+            "displayName": "Configuration",
+            "name": "DOTNET_CONFIGURATION",
+            "value": "Release"
+        },
+        {
+            "description": "Set this to override the NuGet.config sources.",
+            "displayName": "NuGet package sources",
+            "name": "DOTNET_RESTORE_SOURCES"
+        }
+    ]
+}

+ 10 - 0
roles/openshift_examples/files/examples/v3.10/quickstart-templates/jenkins-ephemeral-template.json

@@ -78,6 +78,10 @@
                                         "value": "true"
                                     },
                                     {
+                                        "name": "DISABLE_ADMINISTRATIVE_MONITORS",
+                                        "value": "${DISABLE_ADMINISTRATIVE_MONITORS}"
+                                    },
+                                    {
                                         "name": "KUBERNETES_MASTER",
                                         "value": "https://kubernetes.default:443"
                                     },
@@ -278,6 +282,12 @@
             "value": "openshift"
         },
         {
+            "description": "Whether to perform memory intensive, possibly slow, synchronization with the Jenkins Update Center on start.  If true, the Jenkins core update monitor and site warnings monitor are disabled.",
+            "displayName": "Disable memory intensive administrative monitors",
+            "name": "DISABLE_ADMINISTRATIVE_MONITORS",
+            "value": "false"
+        },
+        {
             "description": "Name of the ImageStreamTag to be used for the Jenkins image.",
             "displayName": "Jenkins ImageStreamTag",
             "name": "JENKINS_IMAGE_STREAM_TAG",

+ 10 - 0
roles/openshift_examples/files/examples/v3.10/quickstart-templates/jenkins-persistent-template.json

@@ -95,6 +95,10 @@
                                         "value": "true"
                                     },
                                     {
+                                        "name": "DISABLE_ADMINISTRATIVE_MONITORS",
+                                        "value": "${DISABLE_ADMINISTRATIVE_MONITORS}"
+                                    },
+                                    {
                                         "name": "KUBERNETES_MASTER",
                                         "value": "https://kubernetes.default:443"
                                     },
@@ -302,6 +306,12 @@
             "value": "openshift"
         },
         {
+            "description": "Whether to perform memory intensive, possibly slow, synchronization with the Jenkins Update Center on start.  If true, the Jenkins core update monitor and site warnings monitor are disabled.",
+            "displayName": "Disable memory intensive administrative monitors",
+            "name": "DISABLE_ADMINISTRATIVE_MONITORS",
+            "value": "false"
+        },
+        {
             "description": "Name of the ImageStreamTag to be used for the Jenkins image.",
             "displayName": "Jenkins ImageStreamTag",
             "name": "JENKINS_IMAGE_STREAM_TAG",