Skip to content

Commit cfe92fa

Browse files
committed
Update templates to API v1
1 parent dc87dd2 commit cfe92fa

File tree

2 files changed

+24
-28
lines changed

2 files changed

+24
-28
lines changed

openshift/templates/django-postgresql.json

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"kind": "Template",
3-
"apiVersion": "v1beta3",
3+
"apiVersion": "v1",
44
"metadata": {
55
"name": "django-quickstart-source-postgresql",
66
"annotations": {
@@ -15,7 +15,7 @@
1515
"objects": [
1616
{
1717
"kind": "Service",
18-
"apiVersion": "v1beta3",
18+
"apiVersion": "v1",
1919
"metadata": {
2020
"name": "${FRONTEND_SERVICE_NAME}",
2121
"annotations": {
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"kind": "Service",
40-
"apiVersion": "v1beta3",
40+
"apiVersion": "v1",
4141
"metadata": {
4242
"name": "${DATABASE_SERVICE_NAME}",
4343
"annotations": {
@@ -59,10 +59,9 @@
5959
},
6060
{
6161
"kind": "Route",
62-
"apiVersion": "v1beta3",
62+
"apiVersion": "v1",
6363
"metadata": {
64-
"name": "${FRONTEND_SERVICE_NAME}-route",
65-
"creationTimestamp": null
64+
"name": "${FRONTEND_SERVICE_NAME}-route"
6665
},
6766
"spec": {
6867
"host" : "${FRONTEND_ROUTE}",
@@ -74,7 +73,7 @@
7473
},
7574
{
7675
"kind": "BuildConfig",
77-
"apiVersion": "v1beta3",
76+
"apiVersion": "v1",
7877
"metadata": {
7978
"name": "django-quickstart-source",
8079
"annotations": {
@@ -106,17 +105,16 @@
106105
},
107106
"triggers": [
108107
{
109-
"type": "imageChange",
110-
"imageChange": {}
108+
"type": "ImageChange"
111109
},
112110
{
113-
"type": "github",
111+
"type": "GitHub",
114112
"github": {
115113
"secret": "secret123"
116114
}
117115
},
118116
{
119-
"type": "generic",
117+
"type": "Generic",
120118
"generic": {
121119
"secret": "secret123"
122120
}
@@ -126,7 +124,7 @@
126124
},
127125
{
128126
"kind": "DeploymentConfig",
129-
"apiVersion": "v1beta3",
127+
"apiVersion": "v1",
130128
"metadata": {
131129
"name": "${FRONTEND_SERVICE_NAME}",
132130
"annotations": {
@@ -213,7 +211,7 @@
213211
},
214212
{
215213
"kind": "DeploymentConfig",
216-
"apiVersion": "v1beta3",
214+
"apiVersion": "v1",
217215
"metadata": {
218216
"name": "${DATABASE_SERVICE_NAME}",
219217
"labels": {
@@ -275,7 +273,7 @@
275273
},
276274
{
277275
"kind": "ImageStream",
278-
"apiVersion": "v1beta3",
276+
"apiVersion": "v1",
279277
"metadata": {
280278
"name": "django-quickstart-source",
281279
"annotations": {
@@ -285,7 +283,7 @@
285283
},
286284
{
287285
"kind": "ImageStream",
288-
"apiVersion": "v1beta3",
286+
"apiVersion": "v1",
289287
"metadata": {
290288
"name": "python-33-centos7",
291289
"annotations": {

openshift/templates/django.json

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"kind": "Template",
3-
"apiVersion": "v1beta3",
3+
"apiVersion": "v1",
44
"metadata": {
55
"name": "django-quickstart-source",
66
"annotations": {
@@ -15,7 +15,7 @@
1515
"objects": [
1616
{
1717
"kind": "Service",
18-
"apiVersion": "v1beta3",
18+
"apiVersion": "v1",
1919
"metadata": {
2020
"name": "${FRONTEND_SERVICE_NAME}",
2121
"annotations": {
@@ -37,10 +37,9 @@
3737
},
3838
{
3939
"kind": "Route",
40-
"apiVersion": "v1beta3",
40+
"apiVersion": "v1",
4141
"metadata": {
42-
"name": "${FRONTEND_SERVICE_NAME}-route",
43-
"creationTimestamp": null
42+
"name": "${FRONTEND_SERVICE_NAME}-route"
4443
},
4544
"spec": {
4645
"host" : "${FRONTEND_ROUTE}",
@@ -49,10 +48,10 @@
4948
"name" : "${FRONTEND_SERVICE_NAME}"
5049
}
5150
}
52-
},
51+
},
5352
{
5453
"kind": "BuildConfig",
55-
"apiVersion": "v1beta3",
54+
"apiVersion": "v1",
5655
"metadata": {
5756
"name": "django-quickstart-source",
5857
"annotations": {
@@ -84,17 +83,16 @@
8483
},
8584
"triggers": [
8685
{
87-
"type": "imageChange",
88-
"imageChange": {}
86+
"type": "ImageChange"
8987
},
9088
{
91-
"type": "github",
89+
"type": "GitHub",
9290
"github": {
9391
"secret": "secret123"
9492
}
9593
},
9694
{
97-
"type": "generic",
95+
"type": "Generic",
9896
"generic": {
9997
"secret": "secret123"
10098
}
@@ -104,7 +102,7 @@
104102
},
105103
{
106104
"kind": "DeploymentConfig",
107-
"apiVersion": "v1beta3",
105+
"apiVersion": "v1",
108106
"metadata": {
109107
"name": "${FRONTEND_SERVICE_NAME}",
110108
"annotations": {
@@ -191,7 +189,7 @@
191189
},
192190
{
193191
"kind": "ImageStream",
194-
"apiVersion": "v1beta3",
192+
"apiVersion": "v1",
195193
"metadata": {
196194
"name": "django-quickstart-source",
197195
"annotations": {

0 commit comments

Comments
 (0)