Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
fe040059
Commit
fe040059
authored
Dec 15, 2015
by
Piotr Szczesniak
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #18658 from jszczepkowski/rc-bump
Autoscaling e2e tests: bumped resource consumer to version beta2.
parents
8e3b717b
dd62c8e8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
autoscaling_utils.go
test/e2e/autoscaling_utils.go
+1
-1
Makefile
test/images/resource-consumer/Makefile
+1
-1
No files found.
test/e2e/autoscaling_utils.go
View file @
fe040059
...
@@ -38,7 +38,7 @@ const (
...
@@ -38,7 +38,7 @@ const (
timeoutRC
=
120
*
time
.
Second
timeoutRC
=
120
*
time
.
Second
startServiceTimeout
=
time
.
Minute
startServiceTimeout
=
time
.
Minute
startServiceInterval
=
5
*
time
.
Second
startServiceInterval
=
5
*
time
.
Second
resourceConsumerImage
=
"gcr.io/google_containers/resource_consumer:beta"
resourceConsumerImage
=
"gcr.io/google_containers/resource_consumer:beta
2
"
rcIsNil
=
"ERROR: replicationController = nil"
rcIsNil
=
"ERROR: replicationController = nil"
deploymentIsNil
=
"ERROR: deployment = nil"
deploymentIsNil
=
"ERROR: deployment = nil"
invalidKind
=
"ERROR: invalid workload kind for resource consumer"
invalidKind
=
"ERROR: invalid workload kind for resource consumer"
...
...
test/images/resource-consumer/Makefile
View file @
fe040059
TAG
=
beta
TAG
=
beta
2
PREFIX
=
gcr.io/google_containers
PREFIX
=
gcr.io/google_containers
all
:
clean consumer
all
:
clean consumer
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment