Skip to content

OKD-379: Fix missing namespace in database template image triggers #701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pskrbasu wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
Open

OKD-379: Fix missing namespace in database template image triggers #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
"metadata": {
"annotations": {
"description": "Defines how to deploy the database",
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"mysql:${MYSQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -540,4 +540,4 @@
"app": "cakephp-mysql-example",
"template": "cakephp-mysql-example"
}
}
}
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
"metadata": {
"annotations": {
"description": "Defines how to deploy the database",
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"mysql:${MYSQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -620,4 +620,4 @@
"app": "cakephp-mysql-persistent",
"template": "cakephp-mysql-persistent"
}
}
}
8 changes: 8 additions & 0 deletions assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@
"metadata": {
"annotations": {
"description": "Defines how to deploy the database",
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\",\"namespace\":\"${NAMESPACE}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -477,6 +478,13 @@
"displayName": "Custom CPAN Mirror URL",
"description": "The custom CPAN mirror URL"
},
{
"name": "MYSQL_VERSION",
"displayName": "Version of MySQL Image",
"description": "Version of MySQL image to be used (8.0-el8, 8.0-el9, or latest).",
"value": "8.0-el8",
"required": true
},
{
"name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
"displayName": "MySQL authentication plugin",
Expand Down
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
"metadata": {
"annotations": {
"description": "Defines how to deploy the database",
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"mysql:${MYSQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -524,4 +524,4 @@
"app": "dancer-mysql-persistent",
"template": "dancer-mysql-persistent"
}
}
}
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"kind": "Deployment",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"mariadb:${MARIADB_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -246,4 +246,4 @@
"app.openshift.io/runtime": "mariadb",
"template": "mariadb-ephemeral-template"
}
}
}
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"kind": "Deployment",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mariadb:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"mariadb:${MARIADB_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -270,4 +270,4 @@
"app.openshift.io/runtime": "mariadb",
"template": "mariadb-persistent-template"
}
}
}
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"kind": "Deployment",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"mysql:${MYSQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -264,4 +264,4 @@
"app.openshift.io/runtime": "mysql-database",
"template": "mysql-ephemeral-template"
}
}
}
5 changes: 2 additions & 3 deletions assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"kind": "Service",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MARIADB_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.openshift.io/expose-uri": "mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\"mysql\")].port}"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -80,7 +79,7 @@
"kind": "Deployment",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mysql:${MYSQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"mysql:${MYSQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -271,4 +270,4 @@
"app.openshift.io/runtime": "mysql-database",
"template": "mysql-persistent-template"
}
}
}
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"kind": "Deployment",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"postgresql:${POSTGRESQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -239,4 +239,4 @@
"labels": {
"template": "postgresql-ephemeral-template"
}
}
}
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"kind": "Deployment",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"postgresql:${POSTGRESQL_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -263,4 +263,4 @@
"labels": {
"template": "postgresql-persistent-template"
}
}
}
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"kind": "Deployment",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"redis:${REDIS_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -202,4 +202,4 @@
"labels": {
"template": "redis-ephemeral-template"
}
}
}
4 changes: 2 additions & 2 deletions assets/operator/okd-x86_64/redis/templates/redis-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"kind": "Deployment",
"metadata": {
"annotations": {
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"redis:${REDIS_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"image.openshift.io/triggers": "[{\"from\": {\"kind\": \"ImageStreamTag\", \"name\": \"redis:${REDIS_VERSION}\", \"namespace\": \"${NAMESPACE}\"}, \"fieldPath\": \"spec.template.spec.containers[0].image\"}]",
"template.alpha.openshift.io/wait-for-ready": "true"
},
"name": "${DATABASE_SERVICE_NAME}"
Expand Down Expand Up @@ -226,4 +226,4 @@
"labels": {
"template": "redis-persistent-template"
}
}
}