creylopez
/
django-ex
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 2 Wiki Activity
Browse Source

Fix apiVersion for all API keys. 

Based on the `oc api-resources` the apiVersions should be

$ oc api-resources | grep imagestreams
imagestreams                          is                  image.openshift.io/v1                         true         ImageStream
$ oc api-resources | grep routes
routes                                                    route.openshift.io/v1                         true         Route
$ oc api-resources | grep deploymentconfig
deploymentconfigs                     dc                  apps.openshift.io/v1                          true         DeploymentConfig
$ oc api-resources | grep templates
templates                                                 template.openshift.io/v1                      true         Template

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
pull/208/head
Petr "Stone" Hracek 2 years ago
parent
a33a1e9762
commit
7e96a75807
3 changed files with 27 additions and 27 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +10
    -10
      openshift/templates/django-postgresql-persistent.json
  2. +10
    -10
      openshift/templates/django-postgresql.json
  3. +7
    -7
      openshift/templates/django.json

+ 10
- 10
openshift/templates/django-postgresql-persistent.json View File

@ -1,6 +1,6 @@
{ {
"kind": "Template", "kind": "Template",
"apiVersion": "v1",
"apiVersion": "template.openshift.io/v1",
"metadata": { "metadata": {
"name": "django-psql-persistent", "name": "django-psql-persistent",
"annotations": { "annotations": {
@ -58,7 +58,7 @@
}, },
{ {
"kind": "Route", "kind": "Route",
"apiVersion": "v1",
"apiVersion": "route.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}" "name": "${NAME}"
}, },
@ -72,7 +72,7 @@
}, },
{ {
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1",
"apiVersion": "image.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -82,7 +82,7 @@
}, },
{ {
"kind": "BuildConfig", "kind": "BuildConfig",
"apiVersion": "v1",
"apiVersion": "build.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -142,7 +142,7 @@
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1",
"apiVersion": "apps.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -306,7 +306,7 @@
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1",
"apiVersion": "apps.openshift.io/v1",
"metadata": { "metadata": {
"name": "${DATABASE_SERVICE_NAME}", "name": "${DATABASE_SERVICE_NAME}",
"annotations": { "annotations": {
@ -440,15 +440,15 @@
{ {
"name": "PYTHON_VERSION", "name": "PYTHON_VERSION",
"displayName": "Version of Python Image", "displayName": "Version of Python Image",
"description": "Version of Python image to be used (3.6 or latest).",
"value": "3.6",
"description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).",
"value": "3.8-ubi8",
"required": true "required": true
}, },
{ {
"name": "POSTGRESQL_VERSION", "name": "POSTGRESQL_VERSION",
"displayName": "Version of PostgreSQL Image", "displayName": "Version of PostgreSQL Image",
"description": "Version of PostgreSQL image to be used (10 or latest).",
"value": "10",
"description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).",
"value": "12-el8",
"required": true "required": true
}, },
{ {


+ 10
- 10
openshift/templates/django-postgresql.json View File

@ -1,6 +1,6 @@
{ {
"kind": "Template", "kind": "Template",
"apiVersion": "v1",
"apiVersion": "template.openshift.io/v1",
"metadata": { "metadata": {
"name": "django-psql-example", "name": "django-psql-example",
"annotations": { "annotations": {
@ -58,7 +58,7 @@
}, },
{ {
"kind": "Route", "kind": "Route",
"apiVersion": "v1",
"apiVersion": "route.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}" "name": "${NAME}"
}, },
@ -72,7 +72,7 @@
}, },
{ {
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1",
"apiVersion": "image.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -82,7 +82,7 @@
}, },
{ {
"kind": "BuildConfig", "kind": "BuildConfig",
"apiVersion": "v1",
"apiVersion": "build.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -142,7 +142,7 @@
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1",
"apiVersion": "apps.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -289,7 +289,7 @@
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1",
"apiVersion": "apps.openshift.io/v1",
"metadata": { "metadata": {
"name": "${DATABASE_SERVICE_NAME}", "name": "${DATABASE_SERVICE_NAME}",
"annotations": { "annotations": {
@ -421,15 +421,15 @@
{ {
"name": "PYTHON_VERSION", "name": "PYTHON_VERSION",
"displayName": "Version of Python Image", "displayName": "Version of Python Image",
"description": "Version of Python image to be used (3.6 or latest).",
"value": "3.6",
"description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).",
"value": "3.8-ubi8",
"required": true "required": true
}, },
{ {
"name": "POSTGRESQL_VERSION", "name": "POSTGRESQL_VERSION",
"displayName": "Version of PostgreSQL Image", "displayName": "Version of PostgreSQL Image",
"description": "Version of PostgreSQL image to be used (10 or latest).",
"value": "10",
"description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).",
"value": "12-el8",
"required": true "required": true
}, },
{ {


+ 7
- 7
openshift/templates/django.json View File

@ -1,6 +1,6 @@
{ {
"kind": "Template", "kind": "Template",
"apiVersion": "v1",
"apiVersion": "template.openshift.io/v1",
"metadata": { "metadata": {
"name": "django-example", "name": "django-example",
"annotations": { "annotations": {
@ -55,7 +55,7 @@
}, },
{ {
"kind": "Route", "kind": "Route",
"apiVersion": "v1",
"apiVersion": "route.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}" "name": "${NAME}"
}, },
@ -69,7 +69,7 @@
}, },
{ {
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1",
"apiVersion": "image.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -79,7 +79,7 @@
}, },
{ {
"kind": "BuildConfig", "kind": "BuildConfig",
"apiVersion": "v1",
"apiVersion": "build.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -139,7 +139,7 @@
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1",
"apiVersion": "apps.openshift.io/v1",
"metadata": { "metadata": {
"name": "${NAME}", "name": "${NAME}",
"annotations": { "annotations": {
@ -251,8 +251,8 @@
{ {
"name": "PYTHON_VERSION", "name": "PYTHON_VERSION",
"displayName": "Version of Python Image", "displayName": "Version of Python Image",
"description": "Version of Python image to be used (3.6 or latest).",
"value": "3.6",
"description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).",
"value": "3.8-ubi8",
"required": true "required": true
}, },
{ {


Write Preview
Loading…
Cancel
Save