From 69335c55134029fe5e2c8af223942aa60ce4aa7e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 22 Nov 2021 18:47:49 -0500 Subject: [PATCH 1/2] Use groupified apiVersion Non-groupified objects were deprecated in OCP 4.7. --- .../templates/django-postgresql-persistent.json | 12 ++++++------ openshift/templates/django-postgresql.json | 12 ++++++------ openshift/templates/django.json | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/openshift/templates/django-postgresql-persistent.json b/openshift/templates/django-postgresql-persistent.json index 4c217c4c..3280b2d4 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": { diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json index 944f3fb1..9aa96cd6 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": { diff --git a/openshift/templates/django.json b/openshift/templates/django.json index 8f5b26e3..af562294 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": { From 0d053208affa330d4460e9bd795d3f18db8036a6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 22 Nov 2021 18:49:21 -0500 Subject: [PATCH 2/2] Update templates to Python 3.9 --- openshift/templates/django-postgresql-persistent.json | 4 ++-- openshift/templates/django-postgresql.json | 4 ++-- openshift/templates/django.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openshift/templates/django-postgresql-persistent.json b/openshift/templates/django-postgresql-persistent.json index 3280b2d4..dd0b7937 100644 --- a/openshift/templates/django-postgresql-persistent.json +++ b/openshift/templates/django-postgresql-persistent.json @@ -440,8 +440,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json index 9aa96cd6..bebd990e 100644 --- a/openshift/templates/django-postgresql.json +++ b/openshift/templates/django-postgresql.json @@ -421,8 +421,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/openshift/templates/django.json b/openshift/templates/django.json index af562294..160d150e 100644 --- a/openshift/templates/django.json +++ b/openshift/templates/django.json @@ -251,8 +251,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, {