Skip to content

Commit c0db5d8

Browse files
author
Jim Minter
committed
update packaged templates
1 parent b93a5d5 commit c0db5d8

30 files changed

+307
-302
lines changed

‎examples/db-templates/mariadb-ephemeral-template.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@
6363
"kind": "DeploymentConfig",
6464
"apiVersion": "v1",
6565
"metadata": {
66-
"name": "${DATABASE_SERVICE_NAME}"
66+
"name": "${DATABASE_SERVICE_NAME}",
67+
"annotations": {
68+
"template.alpha.openshift.io/wait-for-ready": "true"
69+
}
6770
},
6871
"spec": {
6972
"strategy": {

‎examples/db-templates/mariadb-persistent-template.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@
8080
"kind": "DeploymentConfig",
8181
"apiVersion": "v1",
8282
"metadata": {
83-
"name": "${DATABASE_SERVICE_NAME}"
83+
"name": "${DATABASE_SERVICE_NAME}",
84+
"annotations": {
85+
"template.alpha.openshift.io/wait-for-ready": "true"
86+
}
8487
},
8588
"spec": {
8689
"strategy": {

‎examples/db-templates/mongodb-ephemeral-template.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"apiVersion": "v1",
44
"metadata": {
55
"name": "mongodb-ephemeral",
6-
"creationTimestamp": null,
76
"annotations": {
87
"openshift.io/display-name": "MongoDB (Ephemeral)",
98
"description": "MongoDB database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
@@ -44,7 +43,6 @@
4443
"apiVersion": "v1",
4544
"metadata": {
4645
"name": "${DATABASE_SERVICE_NAME}",
47-
"creationTimestamp": null,
4846
"annotations": {
4947
"template.openshift.io/expose-uri": "mongodb://{.spec.clusterIP}:{.spec.ports[?(.name==\"mongo\")].port}"
5048
}
@@ -74,7 +72,9 @@
7472
"apiVersion": "v1",
7573
"metadata": {
7674
"name": "${DATABASE_SERVICE_NAME}",
77-
"creationTimestamp": null
75+
"annotations": {
76+
"template.alpha.openshift.io/wait-for-ready": "true"
77+
}
7878
},
7979
"spec": {
8080
"strategy": {
@@ -106,7 +106,6 @@
106106
},
107107
"template": {
108108
"metadata": {
109-
"creationTimestamp": null,
110109
"labels": {
111110
"name": "${DATABASE_SERVICE_NAME}"
112111
}

‎examples/db-templates/mongodb-persistent-template.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"apiVersion": "v1",
44
"metadata": {
55
"name": "mongodb-persistent",
6-
"creationTimestamp": null,
76
"annotations": {
87
"openshift.io/display-name": "MongoDB (Persistent)",
98
"description": "MongoDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.",
@@ -44,7 +43,6 @@
4443
"apiVersion": "v1",
4544
"metadata": {
4645
"name": "${DATABASE_SERVICE_NAME}",
47-
"creationTimestamp": null,
4846
"annotations": {
4947
"template.openshift.io/expose-uri": "mongodb://{.spec.clusterIP}:{.spec.ports[?(.name==\"mongo\")].port}"
5048
}
@@ -91,7 +89,9 @@
9189
"apiVersion": "v1",
9290
"metadata": {
9391
"name": "${DATABASE_SERVICE_NAME}",
94-
"creationTimestamp": null
92+
"annotations": {
93+
"template.alpha.openshift.io/wait-for-ready": "true"
94+
}
9595
},
9696
"spec": {
9797
"strategy": {
@@ -123,7 +123,6 @@
123123
},
124124
"template": {
125125
"metadata": {
126-
"creationTimestamp": null,
127126
"labels": {
128127
"name": "${DATABASE_SERVICE_NAME}"
129128
}

‎examples/db-templates/mysql-ephemeral-template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"apiVersion": "v1",
4444
"metadata": {
4545
"name": "${DATABASE_SERVICE_NAME}",
46-
"creationTimestamp": null,
4746
"annotations": {
4847
"template.openshift.io/expose-uri": "mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\"mysql\")].port}"
4948
}
@@ -73,7 +72,9 @@
7372
"apiVersion": "v1",
7473
"metadata": {
7574
"name": "${DATABASE_SERVICE_NAME}",
76-
"creationTimestamp": null
75+
"annotations": {
76+
"template.alpha.openshift.io/wait-for-ready": "true"
77+
}
7778
},
7879
"spec": {
7980
"strategy": {
@@ -105,7 +106,6 @@
105106
},
106107
"template": {
107108
"metadata": {
108-
"creationTimestamp": null,
109109
"labels": {
110110
"name": "${DATABASE_SERVICE_NAME}"
111111
}

‎examples/db-templates/mysql-persistent-template.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@
8080
"kind": "DeploymentConfig",
8181
"apiVersion": "v1",
8282
"metadata": {
83-
"name": "${DATABASE_SERVICE_NAME}"
83+
"name": "${DATABASE_SERVICE_NAME}",
84+
"annotations": {
85+
"template.alpha.openshift.io/wait-for-ready": "true"
86+
}
8487
},
8588
"spec": {
8689
"strategy": {

‎examples/db-templates/postgresql-ephemeral-template.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"apiVersion": "v1",
44
"metadata": {
55
"name": "postgresql-ephemeral",
6-
"creationTimestamp": null,
76
"annotations": {
87
"openshift.io/display-name": "PostgreSQL (Ephemeral)",
98
"description": "PostgreSQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
@@ -42,7 +41,6 @@
4241
"apiVersion": "v1",
4342
"metadata": {
4443
"name": "${DATABASE_SERVICE_NAME}",
45-
"creationTimestamp": null,
4644
"annotations": {
4745
"template.openshift.io/expose-uri": "postgres://{.spec.clusterIP}:{.spec.ports[?(.name==\"postgresql\")].port}"
4846
}
@@ -72,7 +70,9 @@
7270
"apiVersion": "v1",
7371
"metadata": {
7472
"name": "${DATABASE_SERVICE_NAME}",
75-
"creationTimestamp": null
73+
"annotations": {
74+
"template.alpha.openshift.io/wait-for-ready": "true"
75+
}
7676
},
7777
"spec": {
7878
"strategy": {
@@ -104,7 +104,6 @@
104104
},
105105
"template": {
106106
"metadata": {
107-
"creationTimestamp": null,
108107
"labels": {
109108
"name": "${DATABASE_SERVICE_NAME}"
110109
}

‎examples/db-templates/postgresql-persistent-template.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"apiVersion": "v1",
44
"metadata": {
55
"name": "postgresql-persistent",
6-
"creationTimestamp": null,
76
"annotations": {
87
"openshift.io/display-name": "PostgreSQL (Persistent)",
98
"description": "PostgreSQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.",
@@ -42,7 +41,6 @@
4241
"apiVersion": "v1",
4342
"metadata": {
4443
"name": "${DATABASE_SERVICE_NAME}",
45-
"creationTimestamp": null,
4644
"annotations": {
4745
"template.openshift.io/expose-uri": "postgres://{.spec.clusterIP}:{.spec.ports[?(.name==\"postgresql\")].port}"
4846
}
@@ -89,7 +87,9 @@
8987
"apiVersion": "v1",
9088
"metadata": {
9189
"name": "${DATABASE_SERVICE_NAME}",
92-
"creationTimestamp": null
90+
"annotations": {
91+
"template.alpha.openshift.io/wait-for-ready": "true"
92+
}
9393
},
9494
"spec": {
9595
"strategy": {
@@ -121,7 +121,6 @@
121121
},
122122
"template": {
123123
"metadata": {
124-
"creationTimestamp": null,
125124
"labels": {
126125
"name": "${DATABASE_SERVICE_NAME}"
127126
}

‎examples/db-templates/redis-ephemeral-template.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"apiVersion": "v1",
44
"metadata": {
55
"name": "redis-ephemeral",
6-
"creationTimestamp": null,
76
"annotations": {
87
"openshift.io/display-name": "Redis (Ephemeral)",
98
"description": "Redis in-memory data structure store, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
@@ -38,7 +37,6 @@
3837
"apiVersion": "v1",
3938
"metadata": {
4039
"name": "${DATABASE_SERVICE_NAME}",
41-
"creationTimestamp": null,
4240
"annotations": {
4341
"template.openshift.io/expose-uri": "redis://{.spec.clusterIP}:{.spec.ports[?(.name==\"redis\")].port}"
4442
}
@@ -68,7 +66,9 @@
6866
"apiVersion": "v1",
6967
"metadata": {
7068
"name": "${DATABASE_SERVICE_NAME}",
71-
"creationTimestamp": null
69+
"annotations": {
70+
"template.alpha.openshift.io/wait-for-ready": "true"
71+
}
7272
},
7373
"spec": {
7474
"strategy": {
@@ -100,7 +100,6 @@
100100
},
101101
"template": {
102102
"metadata": {
103-
"creationTimestamp": null,
104103
"labels": {
105104
"name": "${DATABASE_SERVICE_NAME}"
106105
}

‎examples/db-templates/redis-persistent-template.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"apiVersion": "v1",
44
"metadata": {
55
"name": "redis-persistent",
6-
"creationTimestamp": null,
76
"annotations": {
87
"openshift.io/display-name": "Redis (Persistent)",
98
"description": "Redis in-memory data structure store, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.",
@@ -38,7 +37,6 @@
3837
"apiVersion": "v1",
3938
"metadata": {
4039
"name": "${DATABASE_SERVICE_NAME}",
41-
"creationTimestamp": null,
4240
"annotations": {
4341
"template.openshift.io/expose-uri": "redis://{.spec.clusterIP}:{.spec.ports[?(.name==\"redis\")].port}"
4442
}
@@ -85,7 +83,9 @@
8583
"apiVersion": "v1",
8684
"metadata": {
8785
"name": "${DATABASE_SERVICE_NAME}",
88-
"creationTimestamp": null
86+
"annotations": {
87+
"template.alpha.openshift.io/wait-for-ready": "true"
88+
}
8989
},
9090
"spec": {
9191
"strategy": {
@@ -117,7 +117,6 @@
117117
},
118118
"template": {
119119
"metadata": {
120-
"creationTimestamp": null,
121120
"labels": {
122121
"name": "${DATABASE_SERVICE_NAME}"
123122
}

‎examples/jenkins/jenkins-ephemeral-template.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"apiVersion": "v1",
44
"metadata": {
55
"name": "jenkins-ephemeral",
6-
"creationTimestamp": null,
76
"annotations": {
87
"openshift.io/display-name": "Jenkins (Ephemeral)",
98
"description": "Jenkins service, without persistent storage.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing.",
@@ -22,7 +21,6 @@
2221
"apiVersion": "v1",
2322
"metadata": {
2423
"name": "${JENKINS_SERVICE_NAME}",
25-
"creationTimestamp": null,
2624
"annotations": {
2725
"template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}"
2826
}
@@ -43,7 +41,9 @@
4341
"apiVersion": "v1",
4442
"metadata": {
4543
"name": "${JENKINS_SERVICE_NAME}",
46-
"creationTimestamp": null
44+
"annotations": {
45+
"template.alpha.openshift.io/wait-for-ready": "true"
46+
}
4747
},
4848
"spec": {
4949
"strategy": {
@@ -75,7 +75,6 @@
7575
},
7676
"template": {
7777
"metadata": {
78-
"creationTimestamp": null,
7978
"labels": {
8079
"name": "${JENKINS_SERVICE_NAME}"
8180
}
@@ -221,8 +220,7 @@
221220
"annotations": {
222221
"service.alpha.openshift.io/dependencies": "[{\"name\": \"${JNLP_SERVICE_NAME}\", \"namespace\": \"\", \"kind\": \"Service\"}]",
223222
"service.openshift.io/infrastructure": "true"
224-
},
225-
"creationTimestamp": null
223+
}
226224
},
227225
"spec": {
228226
"ports": [

‎examples/jenkins/jenkins-persistent-template.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"apiVersion": "v1",
44
"metadata": {
55
"name": "jenkins-persistent",
6-
"creationTimestamp": null,
76
"annotations": {
87
"openshift.io/display-name": "Jenkins (Persistent)",
98
"description": "Jenkins service, with persistent storage.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.",
@@ -22,7 +21,6 @@
2221
"apiVersion": "v1",
2322
"metadata": {
2423
"name": "${JENKINS_SERVICE_NAME}",
25-
"creationTimestamp": null,
2624
"annotations": {
2725
"template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}"
2826
}
@@ -60,7 +58,9 @@
6058
"apiVersion": "v1",
6159
"metadata": {
6260
"name": "${JENKINS_SERVICE_NAME}",
63-
"creationTimestamp": null
61+
"annotations": {
62+
"template.alpha.openshift.io/wait-for-ready": "true"
63+
}
6464
},
6565
"spec": {
6666
"strategy": {
@@ -92,7 +92,6 @@
9292
},
9393
"template": {
9494
"metadata": {
95-
"creationTimestamp": null,
9695
"labels": {
9796
"name": "${JENKINS_SERVICE_NAME}"
9897
}
@@ -238,8 +237,7 @@
238237
"annotations": {
239238
"service.alpha.openshift.io/dependencies": "[{\"name\": \"${JNLP_SERVICE_NAME}\", \"namespace\": \"\", \"kind\": \"Service\"}]",
240239
"service.openshift.io/infrastructure": "true"
241-
},
242-
"creationTimestamp": null
240+
}
243241
},
244242
"spec": {
245243
"ports": [

‎examples/quickstarts/cakephp-mysql-persistent.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@
8989
"metadata": {
9090
"name": "${NAME}",
9191
"annotations": {
92-
"description": "Defines how to build the application"
92+
"description": "Defines how to build the application",
93+
"template.alpha.openshift.io/wait-for-ready": "true"
9394
}
9495
},
9596
"spec": {
@@ -148,7 +149,8 @@
148149
"metadata": {
149150
"name": "${NAME}",
150151
"annotations": {
151-
"description": "Defines how to deploy the application server"
152+
"description": "Defines how to deploy the application server",
153+
"template.alpha.openshift.io/wait-for-ready": "true"
152154
}
153155
},
154156
"spec": {

0 commit comments

Comments
 (0)