From 7e96a758075b4ece077b2f0bcc8c2089f25207a5 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 10 Nov 2023 14:47:07 +0100 Subject: [PATCH] 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 --- .../django-postgresql-persistent.json | 20 +++++++++---------- openshift/templates/django-postgresql.json | 20 +++++++++---------- openshift/templates/django.json | 14 ++++++------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/openshift/templates/django-postgresql-persistent.json b/openshift/templates/django-postgresql-persistent.json index fa89710e..e3d43bfd 100644 --- a/openshift/templates/django-postgresql-persistent.json +++ b/openshift/templates/django-postgresql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-persistent", "annotations": { @@ -58,7 +58,7 @@ }, { "kind": "Route", - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "metadata": { "name": "${NAME}" }, @@ -72,7 +72,7 @@ }, { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -82,7 +82,7 @@ }, { "kind": "BuildConfig", - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -142,7 +142,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -306,7 +306,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${DATABASE_SERVICE_NAME}", "annotations": { @@ -440,15 +440,15 @@ { "name": "PYTHON_VERSION", "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 }, { "name": "POSTGRESQL_VERSION", "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 }, { diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json index 7b822c72..6a1c21c8 100644 --- a/openshift/templates/django-postgresql.json +++ b/openshift/templates/django-postgresql.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-example", "annotations": { @@ -58,7 +58,7 @@ }, { "kind": "Route", - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "metadata": { "name": "${NAME}" }, @@ -72,7 +72,7 @@ }, { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -82,7 +82,7 @@ }, { "kind": "BuildConfig", - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -142,7 +142,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -289,7 +289,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${DATABASE_SERVICE_NAME}", "annotations": { @@ -421,15 +421,15 @@ { "name": "PYTHON_VERSION", "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 }, { "name": "POSTGRESQL_VERSION", "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 }, { diff --git a/openshift/templates/django.json b/openshift/templates/django.json index f2a971aa..72c4a3d4 100644 --- a/openshift/templates/django.json +++ b/openshift/templates/django.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-example", "annotations": { @@ -55,7 +55,7 @@ }, { "kind": "Route", - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "metadata": { "name": "${NAME}" }, @@ -69,7 +69,7 @@ }, { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -79,7 +79,7 @@ }, { "kind": "BuildConfig", - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -139,7 +139,7 @@ }, { "kind": "DeploymentConfig", - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "metadata": { "name": "${NAME}", "annotations": { @@ -251,8 +251,8 @@ { "name": "PYTHON_VERSION", "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 }, {