Disable k8s volumes, hooks, secrets

This commit is contained in:
Vincent Fiduccia 2017-09-20 14:45:31 -07:00
parent e09129173d
commit 06a436b66b
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
9 changed files with 23 additions and 29 deletions

View File

@ -1,8 +1,10 @@
import Ember from 'ember';
export default Ember.Controller.extend({
settings: Ember.inject.service(),
sortBy: 'name',
settings: Ember.inject.service(),
projects: Ember.inject.service(),
sortBy:'name',
headers: [
{

View File

@ -1,24 +1,15 @@
<div class="banner bg-info mb-0 p-0">
<div class="banner-icon" style="width: 68px;"><span class="icon icon-2x icon-notification"></span></div>
<div class="banner-message">
<p>
Experimental: More webhook features will be added in future releases, and the existing capabilities may change.
</p>
</div>
</div>
<section class="header clearfix">
<div class="pull-left">
<h1>{{t 'hookPage.receiver.header'}}</h1>
</div>
<div class="right-buttons">
{{#link-to "authenticated.project.hooks.new-receiver" class="btn btn-sm bg-primary"}}{{t 'hookPage.receiver.buttonText'}}{{/link-to}}
{{#link-to "authenticated.project.hooks.new-receiver" class="btn btn-sm bg-primary" disabled=projects.current.isKubernetes}}{{t 'hookPage.receiver.buttonText'}}{{/link-to}}
</div>
</section>
<section>
<p>{{t 'hookPage.receiver.content' appName=settings.appName}}</p>
<p class="help-block">{{t 'hookPage.receiver.content' appName=settings.appName}}</p>
{{#if model.receivers.length}}
{{#sortable-table
classNames="grid fixed r-mb0 mt-10 sortable-table"
@ -39,6 +30,8 @@
</tr>
{{/if}}
{{/sortable-table}}
{{else if projects.current.isKubernetes}}
<div class="m-40 text-center text-muted">Coming soon for Kubernetes clusters</div>
{{else}}
{{empty-table resource="container" newRoute="authenticated.project.hooks.new-receiver" newTranslationKey="hookPage.receiver.buttonText"}}
{{/if}}

View File

@ -14,8 +14,8 @@
<span class="darken"><i class="icon icon-chevron-down"></i></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a {{action "addVolume"}}>{{t 'formVolumes.add.existing'}}</a></li>
<li><a {{action "addNewVolume"}}>{{t 'formVolumes.add.new'}}</a></li>
<li class="disabled"><a {{!--action "addVolume"--}}>{{t 'formVolumes.add.existing'}} (Coming Soon)</a></li>
<li class="disabled"><a {{!--action "addNewVolume"--}}>{{t 'formVolumes.add.new'}} (Coming Soon)</a></li>
<li><a {{action "addBindMount"}}>{{t 'formVolumes.add.bindMount'}}</a></li>
<li><a {{action "addTmpfs"}}>{{t 'formVolumes.add.tmpfs'}}</a></li>
{{#if isService}}
@ -26,7 +26,7 @@
<li><a {{action "addVolumesFromContainer"}}>{{t 'formVolumes.add.fromContainer'}}</a></li>
{{/if}}
<li class="divider"></li>
<li><a {{action "addCustom"}}>{{t 'formVolumes.add.custom'}}</a></li>
<li class="disabled"><a {{action "addCustom"}}>{{t 'formVolumes.add.custom'}} (Coming Soon)</a></li>
</ul>
</div>

View File

@ -4,7 +4,9 @@
<li>{{#link-to "balancers.index" projects.current.id}}{{t 'nav.containers.balancers'}}{{/link-to}}</li>
<li>{{#link-to "dns.index" projects.current.id}}{{t 'nav.containers.dns'}}{{/link-to}}</li>
<li>{{#link-to "volumes.index" projects.current.id}}{{t 'nav.containers.volumes'}}{{/link-to}}</li>
<li>{{#link-to "k8s" projects.current.id}}{{t 'nav.containers.k8s'}}{{/link-to}}</li>
{{#if projects.current.isKubernetes}}
<li>{{#link-to "k8s" projects.current.id}}{{t 'nav.containers.k8s'}}{{/link-to}}</li>
{{/if}}
</ul>
<div class="right-buttons">

View File

@ -20,6 +20,7 @@ var Project = Resource.extend(PolledResource, {
canAddHost: Ember.computed.notEmpty('cluster.registrationToken.hostCommand'),
canImport: Ember.computed.notEmpty('cluster.registrationToken.clusterCommand'),
isKubernetes: Ember.computed.equal('cluster.orchestration','kubernetes'),
actions: {
edit: function() {

View File

@ -3,6 +3,7 @@ import Ember from 'ember';
export default Ember.Controller.extend({
sortBy: 'name',
prefs: Ember.inject.service(),
projects: Ember.inject.service(),
queryParams: ['sortBy'],

View File

@ -1,19 +1,10 @@
<div class="banner bg-info mb-0 p-0">
<div class="banner-icon" style="width: 68px;"><span class="icon icon-2x icon-notification"></span></div>
<div class="banner-message">
<p>
Experimental: Compose and CLI support coming in a future release.
</p>
</div>
</div>
<section class="header clearfix">
<div class="pull-left">
<h1>{{t 'secretsPage.index.header'}}</h1>
</div>
<div class="right-buttons">
{{#link-to "secrets.new" classNames="btn btn-sm bg-primary"}}{{t 'secretsPage.index.linkTo'}}{{/link-to}}
{{#link-to "secrets.new" classNames="btn btn-sm bg-primary" disabled=projects.current.isKubernetes}}{{t 'secretsPage.index.linkTo'}}{{/link-to}}
</div>
</section>
@ -39,6 +30,8 @@
<tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted pt-20 pb-20">{{t 'secretsPage.index.noData'}}</td></tr>
{{/if}}
{{/sortable-table}}
{{else if projects.current.isKubernetes}}
<div class="m-40 text-center text-muted">Coming soon for Kubernetes clusters</div>
{{else}}
{{empty-table resource="container" newRoute="secrets.new" newTranslationKey="secretsPage.index.linkTo"}}
{{/if}}

View File

@ -9,7 +9,7 @@
.box {
padding: 75px 40px 40px 40px;
min-height: 400px;
min-height: 410px;
position: relative;
}

View File

@ -3,7 +3,7 @@
{{else}}
{{#containers-header simpleMode=simpleMode tags=tags showGroup=false}}
{{#link-to "new-stack" classNames="btn btn-sm bg-default mr-10"}}{{t 'nav.containers.importCompose'}}{{/link-to}}
{{#link-to "volumes.new" projects.current.id class="btn btn-sm bg-primary"}}{{t 'nav.containers.addVolume'}}{{/link-to}}
{{#link-to "volumes.new" projects.current.id class="btn btn-sm bg-primary" disabled=projectController.projects.current.isKubernetes}}{{t 'nav.containers.addVolume'}}{{/link-to}}
{{/containers-header}}
{{#if rows.length}}
@ -39,6 +39,8 @@
{{/if}}
{{/sortable-table}}
</section>
{{else if projectController.projects.current.isKubernetes}}
<div class="m-40 text-center text-muted">Coming soon for Kubernetes clusters</div>
{{else}}
{{empty-table resource="container" newRoute="volumes.new" newTranslationKey="nav.containers.addVolume"}}
{{/if}}