Skip to content

Commit c8bc155

Browse files
authored
Merge pull request #118 from sherl0cks/label-fix
adding app label and hack dir
2 parents 10d375d + 529ed8b commit c8bc155

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

hack/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Hack Directory
2+
3+
This is a home for helpful utilities for contributors

hack/clean-up-projects.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
if [[ -n $1 ]]; then
4+
echo "param provided to script, deleting pr projects"
5+
oc delete project labs-ci-cd-pr-$1 labs-dev-pr-$1 labs-demo-pr-$1
6+
else
7+
echo "no param provided to script, deleting default projects"
8+
oc delete project labs-ci-cd labs-dev labs-demo
9+
fi

openshift-templates/jenkins/jenkins-persistent-template.yaml

+2-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ objects:
2727
metadata:
2828
annotations:
2929
template.openshift.io/expose-uri: http://{.spec.host}{.spec.path}
30-
creationTimestamp: null
3130
name: ${JENKINS_SERVICE_NAME}
3231
spec:
3332
tls:
@@ -49,8 +48,9 @@ objects:
4948
- apiVersion: v1
5049
kind: DeploymentConfig
5150
metadata:
52-
creationTimestamp: null
5351
name: ${JENKINS_SERVICE_NAME}
52+
labels:
53+
app: ${JENKINS_SERVICE_NAME}
5454
spec:
5555
replicas: 1
5656
selector:
@@ -59,7 +59,6 @@ objects:
5959
type: Recreate
6060
template:
6161
metadata:
62-
creationTimestamp: null
6362
labels:
6463
name: ${JENKINS_SERVICE_NAME}
6564
spec:
@@ -132,7 +131,6 @@ objects:
132131
serviceaccounts.openshift.io/oauth-redirectreference.jenkins: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"${JENKINS_SERVICE_NAME}"}}'
133132
name: ${JENKINS_SERVICE_NAME}
134133
- apiVersion: v1
135-
groupNames: null
136134
kind: RoleBinding
137135
metadata:
138136
name: ${JENKINS_SERVICE_NAME}_edit
@@ -163,7 +161,6 @@ objects:
163161
service.alpha.openshift.io/dependencies: '[{"name": "${JNLP_SERVICE_NAME}",
164162
"namespace": "", "kind": "Service"}]'
165163
service.openshift.io/infrastructure: "true"
166-
creationTimestamp: null
167164
name: ${JENKINS_SERVICE_NAME}
168165
spec:
169166
ports:

0 commit comments

Comments
 (0)