From d5bb41f1f51090dc8d171a440e74ee0f13a6b946 Mon Sep 17 00:00:00 2001 From: Adam Haile Date: Wed, 25 Apr 2018 10:30:23 -0400 Subject: [PATCH 1/2] Updating for https://github.com/openshift/origin/pull/19509 --- .../images/openshift-enterprise-cli.yml | 22 +++++++++++++++++++ .../images/openshift-enterprise-hyperkube.yml | 22 +++++++++++++++++++ .../openshift-enterprise-hypershift.yml | 22 +++++++++++++++++++ ...penshift-enterprise-sti-builder-docker.yml | 16 -------------- .../images/openshift-enterprise-tests.yml | 22 +++++++++++++++++++ 5 files changed, 88 insertions(+), 16 deletions(-) create mode 100644 openshift-3.10/images/openshift-enterprise-cli.yml create mode 100644 openshift-3.10/images/openshift-enterprise-hyperkube.yml create mode 100644 openshift-3.10/images/openshift-enterprise-hypershift.yml delete mode 100644 openshift-3.10/images/openshift-enterprise-sti-builder-docker.yml create mode 100644 openshift-3.10/images/openshift-enterprise-tests.yml diff --git a/openshift-3.10/images/openshift-enterprise-cli.yml b/openshift-3.10/images/openshift-enterprise-cli.yml new file mode 100644 index 0000000000..71218955b8 --- /dev/null +++ b/openshift-3.10/images/openshift-enterprise-cli.yml @@ -0,0 +1,22 @@ +content: + source: + alias: ose + modifications: + - action: replace + match: origin-clients + replacement: openshift-enterprise-clients + path: images/cli +enabled_repos: +- rhel-server-ose-rpms +from: + member: openshift-enterprise-base-docker +labels: + License: GPLv2+ + architecture: x86_64 + io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications. + io.k8s.display-name: OpenShift Client + io.openshift.tags: openshift,cli + vendor: Red Hat +name: openshift3/ose-cli +distgit: + namespace: containers \ No newline at end of file diff --git a/openshift-3.10/images/openshift-enterprise-hyperkube.yml b/openshift-3.10/images/openshift-enterprise-hyperkube.yml new file mode 100644 index 0000000000..d32ec7449f --- /dev/null +++ b/openshift-3.10/images/openshift-enterprise-hyperkube.yml @@ -0,0 +1,22 @@ +content: + source: + alias: ose + modifications: + - action: replace + match: origin-hyperkube + replacement: openshift-enterprise-hyperkube + path: images/hyperkube +enabled_repos: +- rhel-server-ose-rpms +from: + member: openshift-enterprise-base-docker +labels: + License: GPLv2+ + architecture: x86_64 + io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications. + io.k8s.display-name: OpenShift Kubernetes Server Commands + io.openshift.tags: openshift,hyperkube + vendor: Red Hat +name: openshift3/ose-hyperkube +distgit: + namespace: containers \ No newline at end of file diff --git a/openshift-3.10/images/openshift-enterprise-hypershift.yml b/openshift-3.10/images/openshift-enterprise-hypershift.yml new file mode 100644 index 0000000000..2c7567482a --- /dev/null +++ b/openshift-3.10/images/openshift-enterprise-hypershift.yml @@ -0,0 +1,22 @@ +content: + source: + alias: ose + modifications: + - action: replace + match: origin-hypershift + replacement: openshift-enterprise-hypershift + path: images/hypershift +enabled_repos: +- rhel-server-ose-rpms +from: + member: openshift-enterprise-base-docker +labels: + License: GPLv2+ + architecture: x86_64 + io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications. + io.k8s.display-name: OpenShift Server Commands + io.openshift.tags: openshift,hypershift + vendor: Red Hat +name: openshift3/ose-hypershift +distgit: + namespace: containers \ No newline at end of file diff --git a/openshift-3.10/images/openshift-enterprise-sti-builder-docker.yml b/openshift-3.10/images/openshift-enterprise-sti-builder-docker.yml deleted file mode 100644 index a3cf109601..0000000000 --- a/openshift-3.10/images/openshift-enterprise-sti-builder-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ -content: - source: - alias: ose - path: images/builder/docker/sti-builder -from: - member: openshift-enterprise-docker -labels: - License: GPLv2+ - architecture: x86_64 - io.k8s.description: This is a component of OpenShift Container Platform and is responsible - for executing source-to-image (s2i) image builds. - io.k8s.display-name: OpenShift Container Platform S2I Builder - io.openshift.tags: openshift,sti,builder - vendor: Red Hat -name: openshift3/ose-sti-builder -owners: [] diff --git a/openshift-3.10/images/openshift-enterprise-tests.yml b/openshift-3.10/images/openshift-enterprise-tests.yml new file mode 100644 index 0000000000..85f731b6e5 --- /dev/null +++ b/openshift-3.10/images/openshift-enterprise-tests.yml @@ -0,0 +1,22 @@ +content: + source: + alias: ose + modifications: + - action: replace + match: origin-tests + replacement: openshift-enterprise-tests + path: images/tests +enabled_repos: +- rhel-server-ose-rpms +from: + member: openshift-enterprise-cli-container +labels: + License: GPLv2+ + architecture: x86_64 + io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications. + io.k8s.display-name: OpenShift End-to-End Tests + io.openshift.tags: openshift,tests,e2e + vendor: Red Hat +name: openshift3/ose-tests +distgit: + namespace: containers \ No newline at end of file From e0ccee72e2835cdf4277107484ca91cff51c3e4a Mon Sep 17 00:00:00 2001 From: Justin Pierce Date: Thu, 3 May 2018 16:49:26 -0400 Subject: [PATCH 2/2] Removing trailing -container --- openshift-3.10/images/openshift-enterprise-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openshift-3.10/images/openshift-enterprise-tests.yml b/openshift-3.10/images/openshift-enterprise-tests.yml index 85f731b6e5..2dbdab6b5f 100644 --- a/openshift-3.10/images/openshift-enterprise-tests.yml +++ b/openshift-3.10/images/openshift-enterprise-tests.yml @@ -9,7 +9,7 @@ content: enabled_repos: - rhel-server-ose-rpms from: - member: openshift-enterprise-cli-container + member: openshift-enterprise-cli labels: License: GPLv2+ architecture: x86_64 @@ -19,4 +19,4 @@ labels: vendor: Red Hat name: openshift3/ose-tests distgit: - namespace: containers \ No newline at end of file + namespace: containers