Skip to content
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

Adopt standardized app labels for the basic-nginx app #145

Merged
merged 1 commit into from
Jun 18, 2020
Merged

Adopt standardized app labels for the basic-nginx app #145

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
18 changes: 15 additions & 3 deletions basic-nginx/.openshift/builds/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ objects:
kind: BuildConfig
metadata:
labels:
application: ${APPLICATION_NAME}
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}-build
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
name: "${APPLICATION_NAME}-pipeline"
namespace: "${NAMESPACE}"
spec:
Expand Down Expand Up @@ -46,7 +50,11 @@ objects:
kind: BuildConfig
metadata:
labels:
application: ${APPLICATION_NAME}
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}-build
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
name: ${APPLICATION_NAME}
namespace: "${NAMESPACE}"
spec:
Expand All @@ -70,7 +78,11 @@ objects:
kind: ImageStream
metadata:
labels:
application: ${APPLICATION_NAME}
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}-build
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
name: ${APPLICATION_NAME}
namespace: ${NAMESPACE}
parameters:
Expand Down
38 changes: 31 additions & 7 deletions basic-nginx/.openshift/deployment/template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ objects:
kind: DeploymentConfig
metadata:
labels:
app: ${APPLICATION_NAME}
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
name: ${APPLICATION_NAME}
namespace: ${APPLICATION_NAME}${ENV}
spec:
Expand All @@ -23,7 +27,11 @@ objects:
template:
metadata:
labels:
app: ${APPLICATION_NAME}
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
deploymentConfig: ${APPLICATION_NAME}
name: ${APPLICATION_NAME}
spec:
Expand Down Expand Up @@ -58,7 +66,11 @@ objects:
kind: ImageStream
metadata:
labels:
app: ${APPLICATION_NAME}
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
name: ${APPLICATION_NAME}
namespace: ${APPLICATION_NAME}${ENV}
- apiVersion: route.openshift.io/v1
Expand All @@ -67,7 +79,11 @@ objects:
annotations:
description: Route for application's service.
labels:
app: ${APPLICATION_NAME}
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
name: ${APPLICATION_NAME}
namespace: ${APPLICATION_NAME}${ENV}
spec:
Expand All @@ -80,7 +96,11 @@ objects:
annotations:
description: Service for application.
labels:
app: ${APPLICATION_NAME}
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
name: ${APPLICATION_NAME}
namespace: ${APPLICATION_NAME}${ENV}
spec:
Expand All @@ -97,7 +117,11 @@ objects:
metadata:
creationTimestamp: null
labels:
template: basic-nginx-template
app.kubernetes.io/name: ${APPLICATION_NAME}
app.kubernetes.io/instance: ${APPLICATION_NAME}
app.kubernetes.io/component: api
app.kubernetes.io/part-of: ${APPLICATION_NAME}
app.kubernetes.io/managed-by: applier
name: jenkins_edit
namespace: ${APPLICATION_NAME}${ENV}
groupNames: null
Expand Down Expand Up @@ -129,4 +153,4 @@ parameters:
value: basic-nginx-build
- description: 'Custom hostname for http service route. Leave blank for default hostname,
e.g.: <application-name>-<project>.<default-domain-suffix>'
name: HOSTNAME_HTTP
name: HOSTNAME_HTTP