diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-08 14:21:12 -0500 | 
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-08 14:27:42 -0500 | 
| commit | 56b529e493a5f55ecfc75bc20a807a3d73e03507 (patch) | |
| tree | aaa5b3dc69dc41cb8cd62eee5bfc3bd434b19fe8 /roles | |
| parent | a4d4b530bd4390a4a7f4cc277d02fd52796ee144 (diff) | |
| download | openshift-56b529e493a5f55ecfc75bc20a807a3d73e03507.tar.gz openshift-56b529e493a5f55ecfc75bc20a807a3d73e03507.tar.bz2 openshift-56b529e493a5f55ecfc75bc20a807a3d73e03507.tar.xz openshift-56b529e493a5f55ecfc75bc20a807a3d73e03507.zip  | |
Fix examples image streams
Image streams older than 3.7 do not have a separate config
for centos for dotnet_imagestreams.json
This commit copies the new image stream to older supported verisons.
Diffstat (limited to 'roles')
2 files changed, 208 insertions, 0 deletions
diff --git a/roles/openshift_examples/files/examples/v1.5/image-streams/dotnet_imagestreams_centos.json b/roles/openshift_examples/files/examples/v1.5/image-streams/dotnet_imagestreams_centos.json new file mode 100644 index 000000000..79afc355b --- /dev/null +++ b/roles/openshift_examples/files/examples/v1.5/image-streams/dotnet_imagestreams_centos.json @@ -0,0 +1,104 @@ +{ +    "kind": "ImageStreamList", +    "apiVersion": "v1", +    "metadata": { +        "name": "dotnet-image-streams", +        "annotations": { +            "description": "ImageStream definitions for .NET Core on CentOS" +        } +    }, +    "items": [ +        { +            "kind": "ImageStream", +            "apiVersion": "v1", +            "metadata": { +                "name": "dotnet", +                "annotations": { +                    "openshift.io/display-name": ".NET Core Builder Images" +                } +            }, +            "spec": { +                "tags": [ +                    { +                        "name": "latest", +                        "annotations": { +                          "openshift.io/display-name": ".NET Core (Latest)", +                          "description": "Build and run .NET Core applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core available on OpenShift, including major versions updates.", +                          "iconClass": "icon-dotnet", +                          "tags": "builder,.net,dotnet,dotnetcore", +                          "supports":"dotnet", +                          "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git", +                          "sampleContextDir": "app", +                          "sampleRef": "dotnetcore-2.0" +                        }, +                        "from": { +                          "kind": "ImageStreamTag", +                          "name": "2.0" +                        } +                    }, +                    { +                        "name": "2.0", +                        "annotations": { +                            "openshift.io/display-name": ".NET Core 2.0", +                            "description": "Build and run .NET Core 2.0 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/build/README.md.", +                            "iconClass": "icon-dotnet", +                            "tags": "builder,.net,dotnet,dotnetcore,rh-dotnet20", +                            "supports":"dotnet:2.0,dotnet", +                            "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git", +                            "sampleContextDir": "app", +                            "sampleRef": "dotnetcore-2.0", +                            "version": "2.0" +                        }, +                        "from": { +                          "kind": "DockerImage", +                          "name": "registry.centos.org/dotnet/dotnet-20-centos7:latest" +                        } +                    } +                ] +            } +        }, +        { +            "kind": "ImageStream", +            "apiVersion": "v1", +            "metadata": { +                "name": "dotnet-runtime", +                "annotations": { +                    "openshift.io/display-name": ".NET Core Runtime Images" +                } +            }, +            "spec": { +                "tags": [ +                    { +                        "name": "latest", +                        "annotations": { +                          "openshift.io/display-name": ".NET Core Runtime (Latest)", +                          "description": "Run .NET Core applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.", +                          "iconClass": "icon-dotnet", +                          "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", +                          "supports":"dotnet-runtime" +                        }, +                        "from": { +                          "kind": "ImageStreamTag", +                          "name": "2.0" +                        } +                    }, +                    { +                        "name": "2.0", +                        "annotations": { +                            "openshift.io/display-name": ".NET Core 2.0 Runtime", +                            "description": "Run .NET Core applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/runtime/README.md.", +                            "iconClass": "icon-dotnet", +                            "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", +                            "supports":"dotnet-runtime", +                            "version": "2.0" +                        }, +                        "from": { +                          "kind": "DockerImage", +                          "name": "registry.centos.org/dotnet/dotnet-20-runtime-centos7:latest" +                        } +                    } +                ] +            } +        } +    ] +} diff --git a/roles/openshift_examples/files/examples/v3.6/image-streams/dotnet_imagestreams_centos.json b/roles/openshift_examples/files/examples/v3.6/image-streams/dotnet_imagestreams_centos.json new file mode 100644 index 000000000..79afc355b --- /dev/null +++ b/roles/openshift_examples/files/examples/v3.6/image-streams/dotnet_imagestreams_centos.json @@ -0,0 +1,104 @@ +{ +    "kind": "ImageStreamList", +    "apiVersion": "v1", +    "metadata": { +        "name": "dotnet-image-streams", +        "annotations": { +            "description": "ImageStream definitions for .NET Core on CentOS" +        } +    }, +    "items": [ +        { +            "kind": "ImageStream", +            "apiVersion": "v1", +            "metadata": { +                "name": "dotnet", +                "annotations": { +                    "openshift.io/display-name": ".NET Core Builder Images" +                } +            }, +            "spec": { +                "tags": [ +                    { +                        "name": "latest", +                        "annotations": { +                          "openshift.io/display-name": ".NET Core (Latest)", +                          "description": "Build and run .NET Core applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core available on OpenShift, including major versions updates.", +                          "iconClass": "icon-dotnet", +                          "tags": "builder,.net,dotnet,dotnetcore", +                          "supports":"dotnet", +                          "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git", +                          "sampleContextDir": "app", +                          "sampleRef": "dotnetcore-2.0" +                        }, +                        "from": { +                          "kind": "ImageStreamTag", +                          "name": "2.0" +                        } +                    }, +                    { +                        "name": "2.0", +                        "annotations": { +                            "openshift.io/display-name": ".NET Core 2.0", +                            "description": "Build and run .NET Core 2.0 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/build/README.md.", +                            "iconClass": "icon-dotnet", +                            "tags": "builder,.net,dotnet,dotnetcore,rh-dotnet20", +                            "supports":"dotnet:2.0,dotnet", +                            "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git", +                            "sampleContextDir": "app", +                            "sampleRef": "dotnetcore-2.0", +                            "version": "2.0" +                        }, +                        "from": { +                          "kind": "DockerImage", +                          "name": "registry.centos.org/dotnet/dotnet-20-centos7:latest" +                        } +                    } +                ] +            } +        }, +        { +            "kind": "ImageStream", +            "apiVersion": "v1", +            "metadata": { +                "name": "dotnet-runtime", +                "annotations": { +                    "openshift.io/display-name": ".NET Core Runtime Images" +                } +            }, +            "spec": { +                "tags": [ +                    { +                        "name": "latest", +                        "annotations": { +                          "openshift.io/display-name": ".NET Core Runtime (Latest)", +                          "description": "Run .NET Core applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.", +                          "iconClass": "icon-dotnet", +                          "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", +                          "supports":"dotnet-runtime" +                        }, +                        "from": { +                          "kind": "ImageStreamTag", +                          "name": "2.0" +                        } +                    }, +                    { +                        "name": "2.0", +                        "annotations": { +                            "openshift.io/display-name": ".NET Core 2.0 Runtime", +                            "description": "Run .NET Core applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.0/runtime/README.md.", +                            "iconClass": "icon-dotnet", +                            "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", +                            "supports":"dotnet-runtime", +                            "version": "2.0" +                        }, +                        "from": { +                          "kind": "DockerImage", +                          "name": "registry.centos.org/dotnet/dotnet-20-runtime-centos7:latest" +                        } +                    } +                ] +            } +        } +    ] +}  | 
