Skip to content
This repository was archived by the owner on Mar 16, 2024. It is now read-only.

Commit 264244f

Browse files
authored
Merge pull request #2374 from njhale/fix-job-service-names
Remove -job suffix from generated service names
2 parents 6e8c7e4 + efaeb4a commit 264244f

File tree

13 files changed

+15
-20
lines changed

13 files changed

+15
-20
lines changed

pkg/controller/appdefinition/testdata/computeclass/job/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ metadata:
153153
acorn.io/job-name: oneimage
154154
acorn.io/managed: "true"
155155
acorn.io/public-name: app-name.oneimage
156-
name: oneimage-job
156+
name: oneimage
157157
namespace: app-created-namespace
158158
spec:
159159
appName: app-name

pkg/controller/appdefinition/testdata/deployspec/filter-user-labels/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ metadata:
303303
acorn.io/job-name: job-name
304304
acorn.io/managed: "true"
305305
acorn.io/public-name: app-name.job-name
306-
name: job-name-job
306+
name: job-name
307307
namespace: app-created-namespace
308308
spec:
309309
annotations:

pkg/controller/appdefinition/testdata/deployspec/labels/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ metadata:
297297
acorn.io/job-name: job-name
298298
acorn.io/managed: "true"
299299
acorn.io/public-name: app-name.job-name
300-
name: job-name-job
300+
name: job-name
301301
namespace: app-created-namespace
302302
spec:
303303
annotations:

pkg/controller/appdefinition/testdata/deployspec/no-user-labels/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ metadata:
239239
acorn.io/job-name: job-name
240240
acorn.io/managed: "true"
241241
acorn.io/public-name: app-name.job-name
242-
name: job-name-job
242+
name: job-name
243243
namespace: app-created-namespace
244244
spec:
245245
appName: app-name

pkg/controller/appdefinition/testdata/deployspec/pre-stop/job/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ metadata:
134134
acorn.io/job-name: oneimage
135135
acorn.io/managed: "true"
136136
acorn.io/public-name: app-name.oneimage
137-
name: oneimage-job
137+
name: oneimage
138138
namespace: app-created-namespace
139139
spec:
140140
appName: app-name

pkg/controller/appdefinition/testdata/job/basic/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ metadata:
134134
acorn.io/job-name: oneimage
135135
acorn.io/managed: "true"
136136
acorn.io/public-name: app-name.oneimage
137-
name: oneimage-job
137+
name: oneimage
138138
namespace: app-created-namespace
139139
spec:
140140
appName: app-name

pkg/controller/appdefinition/testdata/job/labels/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ metadata:
149149
acorn.io/job-name: job1
150150
acorn.io/managed: "true"
151151
acorn.io/public-name: app-name.job1
152-
name: job1-job
152+
name: job1
153153
namespace: app-created-namespace
154154
spec:
155155
annotations:

pkg/controller/appdefinition/testdata/memory/job/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ metadata:
138138
acorn.io/job-name: oneimage
139139
acorn.io/managed: "true"
140140
acorn.io/public-name: app-name.oneimage
141-
name: oneimage-job
141+
name: oneimage
142142
namespace: app-created-namespace
143143
spec:
144144
appName: app-name

pkg/controller/appdefinition/testdata/permissions/both/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ metadata:
493493
acorn.io/job-name: oneimage
494494
acorn.io/managed: "true"
495495
acorn.io/public-name: app-name.oneimage
496-
name: oneimage-job
496+
name: oneimage
497497
namespace: app-created-namespace
498498
spec:
499499
appName: app-name

pkg/controller/appdefinition/testdata/permissions/bothwithnopermissions/expected.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ metadata:
295295
acorn.io/job-name: oneimage
296296
acorn.io/managed: "true"
297297
acorn.io/public-name: app-name.oneimage
298-
name: oneimage-job
298+
name: oneimage
299299
namespace: app-created-namespace
300300
spec:
301301
appName: app-name

0 commit comments

Comments
 (0)