-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #317 from multi-arch/master
Bug 1872080: Sync RHEL/CentOS/UBI 8 imagestreams changes
- Loading branch information
Showing
172 changed files
with
8,859 additions
and
9,451 deletions.
There are no files selected for viewing
84 changes: 84 additions & 0 deletions
84
assets/operator/ocp-ppc64le/golang/imagestreams/golang-rhel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| { | ||
| "kind": "ImageStream", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "golang", | ||
| "creationTimestamp": null, | ||
| "annotations": { | ||
| "openshift.io/display-name": "Go" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "lookupPolicy": { | ||
| "local": false | ||
| }, | ||
| "tags": [ | ||
| { | ||
| "name": "latest", | ||
| "annotations": { | ||
| "description": "Build and run Go applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.", | ||
| "iconClass": "icon-go-gopher", | ||
| "openshift.io/display-name": "Go (Latest)", | ||
| "openshift.io/provider-display-name": "Red Hat, Inc.", | ||
| "sampleRepo": "https://github.com/sclorg/golang-ex.git", | ||
| "supports": "golang", | ||
| "tags": "builder,golang,go" | ||
| }, | ||
| "from": { | ||
| "kind": "ImageStreamTag", | ||
| "name": "1.13.4-ubi8" | ||
| }, | ||
| "generation": null, | ||
| "importPolicy": {}, | ||
| "referencePolicy": { | ||
| "type": "Local" | ||
| } | ||
| }, | ||
| { | ||
| "name": "1.13.4-ubi8", | ||
| "annotations": { | ||
| "description": "Build and run Go applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", | ||
| "iconClass": "icon-go-gopher", | ||
| "openshift.io/display-name": "Go 1.13.4 (UBI 8)", | ||
| "openshift.io/provider-display-name": "Red Hat, Inc.", | ||
| "sampleRepo": "https://github.com/sclorg/golang-ex.git", | ||
| "supports": "golang", | ||
| "tags": "builder,golang,go" | ||
| }, | ||
| "from": { | ||
| "kind": "DockerImage", | ||
| "name": "registry.redhat.io/ubi8/go-toolset:1.13.4" | ||
| }, | ||
| "generation": null, | ||
| "importPolicy": {}, | ||
| "referencePolicy": { | ||
| "type": "Local" | ||
| } | ||
| }, | ||
| { | ||
| "name": "1.13.4-ubi7", | ||
| "annotations": { | ||
| "description": "Build and run Go applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", | ||
| "iconClass": "icon-go-gopher", | ||
| "openshift.io/display-name": "Go 1.13.4 (UBI 7)", | ||
| "openshift.io/provider-display-name": "Red Hat, Inc.", | ||
| "sampleRepo": "https://github.com/sclorg/golang-ex.git", | ||
| "supports": "golang", | ||
| "tags": "builder,golang,go" | ||
| }, | ||
| "from": { | ||
| "kind": "DockerImage", | ||
| "name": "registry.redhat.io/ubi7/go-toolset:1.13.4" | ||
| }, | ||
| "generation": null, | ||
| "importPolicy": {}, | ||
| "referencePolicy": { | ||
| "type": "Local" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "status": { | ||
| "dockerImageRepository": "" | ||
| } | ||
| } |
63 changes: 0 additions & 63 deletions
63
assets/operator/ocp-ppc64le/golang/imagestreams/golang-rhel7.json
This file was deleted.
Oops, something went wrong.
108 changes: 108 additions & 0 deletions
108
assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| { | ||
| "kind": "ImageStream", | ||
| "apiVersion": "v1", | ||
| "metadata": { | ||
| "name": "httpd", | ||
| "creationTimestamp": null, | ||
| "annotations": { | ||
| "openshift.io/display-name": "Apache HTTP Server (httpd)" | ||
| } | ||
| }, | ||
| "spec": { | ||
| "lookupPolicy": { | ||
| "local": false | ||
| }, | ||
| "tags": [ | ||
| { | ||
| "name": "latest", | ||
| "annotations": { | ||
| "description": "Build and serve static content via Apache HTTP Server (httpd) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major version updates.", | ||
| "iconClass": "icon-apache", | ||
| "openshift.io/display-name": "Apache HTTP Server (Latest)", | ||
| "openshift.io/provider-display-name": "Red Hat, Inc.", | ||
| "sampleRepo": "https://github.com/sclorg/httpd-ex.git", | ||
| "supports": "httpd", | ||
| "tags": "builder,httpd" | ||
| }, | ||
| "from": { | ||
| "kind": "ImageStreamTag", | ||
| "name": "2.4-el8" | ||
| }, | ||
| "generation": null, | ||
| "importPolicy": {}, | ||
| "referencePolicy": { | ||
| "type": "Local" | ||
| } | ||
| }, | ||
| { | ||
| "name": "2.4-el8", | ||
| "annotations": { | ||
| "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", | ||
| "iconClass": "icon-apache", | ||
| "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 8)", | ||
| "openshift.io/provider-display-name": "Red Hat, Inc.", | ||
| "sampleRepo": "https://github.com/sclorg/httpd-ex.git", | ||
| "supports": "httpd", | ||
| "tags": "builder,httpd", | ||
| "version": "2.4" | ||
| }, | ||
| "from": { | ||
| "kind": "DockerImage", | ||
| "name": "registry.redhat.io/rhel8/httpd-24" | ||
| }, | ||
| "generation": null, | ||
| "importPolicy": {}, | ||
| "referencePolicy": { | ||
| "type": "Local" | ||
| } | ||
| }, | ||
| { | ||
| "name": "2.4-el7", | ||
| "annotations": { | ||
| "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", | ||
| "iconClass": "icon-apache", | ||
| "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 7)", | ||
| "openshift.io/provider-display-name": "Red Hat, Inc.", | ||
| "sampleRepo": "https://github.com/sclorg/httpd-ex.git", | ||
| "supports": "httpd", | ||
| "tags": "builder,httpd", | ||
| "version": "2.4" | ||
| }, | ||
| "from": { | ||
| "kind": "DockerImage", | ||
| "name": "registry.redhat.io/rhscl/httpd-24-rhel7" | ||
| }, | ||
| "generation": null, | ||
| "importPolicy": {}, | ||
| "referencePolicy": { | ||
| "type": "Local" | ||
| } | ||
| }, | ||
| { | ||
| "name": "2.4", | ||
| "annotations": { | ||
| "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.", | ||
| "iconClass": "icon-apache", | ||
| "openshift.io/display-name": "Apache HTTP Server 2.4", | ||
| "openshift.io/provider-display-name": "Red Hat, Inc.", | ||
| "sampleRepo": "https://github.com/sclorg/httpd-ex.git", | ||
| "supports": "httpd", | ||
| "tags": "builder,httpd,hidden", | ||
| "version": "2.4" | ||
| }, | ||
| "from": { | ||
| "kind": "DockerImage", | ||
| "name": "registry.redhat.io/rhscl/httpd-24-rhel7" | ||
| }, | ||
| "generation": null, | ||
| "importPolicy": {}, | ||
| "referencePolicy": { | ||
| "type": "Local" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "status": { | ||
| "dockerImageRepository": "" | ||
| } | ||
| } |
64 changes: 0 additions & 64 deletions
64
assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel7.json
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.