Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a1a98e9f
Commit
a1a98e9f
authored
Mar 17, 2020
by
Adrien Kohlbecker
Committed by
Fatih Acet
Mar 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade Elastic Stack helm chart to 1.9.0
To support more recent k8s versions
parent
b815e6f6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
3 deletions
+17
-3
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+5
-0
app/assets/javascripts/clusters/stores/clusters_store.js
app/assets/javascripts/clusters/stores/clusters_store.js
+4
-0
app/models/clusters/applications/elastic_stack.rb
app/models/clusters/applications/elastic_stack.rb
+1
-1
changelogs/unreleased/ak-upgrade-es.yml
changelogs/unreleased/ak-upgrade-es.yml
+5
-0
spec/models/clusters/applications/elastic_stack_spec.rb
spec/models/clusters/applications/elastic_stack_spec.rb
+2
-2
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
a1a98e9f
...
@@ -638,8 +638,13 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
...
@@ -638,8 +638,13 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:status-reason=
"applications.elastic_stack.statusReason"
:status-reason=
"applications.elastic_stack.statusReason"
:request-status=
"applications.elastic_stack.requestStatus"
:request-status=
"applications.elastic_stack.requestStatus"
:request-reason=
"applications.elastic_stack.requestReason"
:request-reason=
"applications.elastic_stack.requestReason"
:version=
"applications.elastic_stack.version"
:chart-repo=
"applications.elastic_stack.chartRepo"
:update-available=
"applications.elastic_stack.updateAvailable"
:installed=
"applications.elastic_stack.installed"
:installed=
"applications.elastic_stack.installed"
:install-failed=
"applications.elastic_stack.installFailed"
:install-failed=
"applications.elastic_stack.installFailed"
:update-successful=
"applications.elastic_stack.updateSuccessful"
:update-failed=
"applications.elastic_stack.updateFailed"
:uninstallable=
"applications.elastic_stack.uninstallable"
:uninstallable=
"applications.elastic_stack.uninstallable"
:uninstall-successful=
"applications.elastic_stack.uninstallSuccessful"
:uninstall-successful=
"applications.elastic_stack.uninstallSuccessful"
:uninstall-failed=
"applications.elastic_stack.uninstallFailed"
:uninstall-failed=
"applications.elastic_stack.uninstallFailed"
...
...
app/assets/javascripts/clusters/stores/clusters_store.js
View file @
a1a98e9f
...
@@ -12,6 +12,7 @@ import {
...
@@ -12,6 +12,7 @@ import {
INSTALL_EVENT
,
INSTALL_EVENT
,
UPDATE_EVENT
,
UPDATE_EVENT
,
UNINSTALL_EVENT
,
UNINSTALL_EVENT
,
ELASTIC_STACK
,
}
from
'
../constants
'
;
}
from
'
../constants
'
;
import
transitionApplicationState
from
'
../services/application_state_machine
'
;
import
transitionApplicationState
from
'
../services/application_state_machine
'
;
...
@@ -239,6 +240,9 @@ export default class ClusterStore {
...
@@ -239,6 +240,9 @@ export default class ClusterStore {
}
else
if
(
appId
===
RUNNER
)
{
}
else
if
(
appId
===
RUNNER
)
{
this
.
state
.
applications
.
runner
.
version
=
version
;
this
.
state
.
applications
.
runner
.
version
=
version
;
this
.
state
.
applications
.
runner
.
updateAvailable
=
updateAvailable
;
this
.
state
.
applications
.
runner
.
updateAvailable
=
updateAvailable
;
}
else
if
(
appId
===
ELASTIC_STACK
)
{
this
.
state
.
applications
.
elastic_stack
.
version
=
version
;
this
.
state
.
applications
.
elastic_stack
.
updateAvailable
=
updateAvailable
;
}
}
});
});
}
}
...
...
app/models/clusters/applications/elastic_stack.rb
View file @
a1a98e9f
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
module
Clusters
module
Clusters
module
Applications
module
Applications
class
ElasticStack
<
ApplicationRecord
class
ElasticStack
<
ApplicationRecord
VERSION
=
'1.
8
.0'
VERSION
=
'1.
9
.0'
ELASTICSEARCH_PORT
=
9200
ELASTICSEARCH_PORT
=
9200
...
...
changelogs/unreleased/ak-upgrade-es.yml
0 → 100644
View file @
a1a98e9f
---
title
:
Upgrade Elastic Stack helm chart to 1.9.0
merge_request
:
27011
author
:
type
:
changed
spec/models/clusters/applications/elastic_stack_spec.rb
View file @
a1a98e9f
...
@@ -20,7 +20,7 @@ describe Clusters::Applications::ElasticStack do
...
@@ -20,7 +20,7 @@ describe Clusters::Applications::ElasticStack do
it
'is initialized with elastic stack arguments'
do
it
'is initialized with elastic stack arguments'
do
expect
(
subject
.
name
).
to
eq
(
'elastic-stack'
)
expect
(
subject
.
name
).
to
eq
(
'elastic-stack'
)
expect
(
subject
.
chart
).
to
eq
(
'stable/elastic-stack'
)
expect
(
subject
.
chart
).
to
eq
(
'stable/elastic-stack'
)
expect
(
subject
.
version
).
to
eq
(
'1.
8
.0'
)
expect
(
subject
.
version
).
to
eq
(
'1.
9
.0'
)
expect
(
subject
).
to
be_rbac
expect
(
subject
).
to
be_rbac
expect
(
subject
.
files
).
to
eq
(
elastic_stack
.
files
)
expect
(
subject
.
files
).
to
eq
(
elastic_stack
.
files
)
end
end
...
@@ -37,7 +37,7 @@ describe Clusters::Applications::ElasticStack do
...
@@ -37,7 +37,7 @@ describe Clusters::Applications::ElasticStack do
let
(
:elastic_stack
)
{
create
(
:clusters_applications_elastic_stack
,
:errored
,
version:
'0.0.1'
)
}
let
(
:elastic_stack
)
{
create
(
:clusters_applications_elastic_stack
,
:errored
,
version:
'0.0.1'
)
}
it
'is initialized with the locked version'
do
it
'is initialized with the locked version'
do
expect
(
subject
.
version
).
to
eq
(
'1.
8
.0'
)
expect
(
subject
.
version
).
to
eq
(
'1.
9
.0'
)
end
end
end
end
end
end
...
...
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