Skip to content

Commit 79ef01c

Browse files
committed
rename dm to carne
1 parent 29975b8 commit 79ef01c

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

frontend/conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ BACKEND_URL_BASE = {
1414
HOME_URL = '/auth';
1515
SAMPLES_URL = '/stack/samples/';
1616
MISC_TOOLS_URL = window.location.protocol + "//" + window.location.host + '/misc-tools/';
17-
DOCKER_REGISTRY_URL = window.location.host + ':5000/';
17+
DOCKER_REGISTRY_URL = window.location.host + ':5000/';

frontend/src/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ CODE_MESSAGE = {
105105
};
106106

107107
NODE_CONN_ERROR_CODE = [11701, 11702, 11703, 11704];
108-
NODE_ENDPOINT_LABEL = "dm.reserved.node.endpoint";
108+
NODE_ENDPOINT_LABEL = "crane.reserved.node.endpoint";
109109

110110
SHOW_ERROR_MESSAGE = [10001];
111111

frontend/src/stack/service-detail/discovery.ctrl.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
var servers = [];
2020
angular.forEach(self.nodes, function (node, index) {
2121
if (node.Spec.Labels != undefined) {
22-
var endpoint = node.Spec.Labels["dm.reserved.node.endpoint"];
22+
var endpoint = node.Spec.Labels["crane.reserved.node.endpoint"];
2323
if (endpoint != undefined) {
2424
servers.push("server " + $filter('ip')(endpoint) + ":" + port.PublishedPort + ";");
2525
}
@@ -46,7 +46,7 @@
4646
var servers = [];
4747
angular.forEach(self.nodes, function (node, index) {
4848
if (node.Spec.Labels != undefined) {
49-
var endpoint = node.Spec.Labels["dm.reserved.node.endpoint"];
49+
var endpoint = node.Spec.Labels["crane.reserved.node.endpoint"];
5050
if (endpoint != undefined) {
5151
servers.push("server " + "app-" + $filter('ip')(endpoint) + '-' + port.PublishedPort +
5252
' ' + $filter('ip')(endpoint) + ":" + port.PublishedPort);

frontend/src/stack/service-detail/discovery.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h2 flex="20">IP:Port</h2>
33
<div flex="80" layout="row" layout-wrap dm-empty-display="serviceDiscoveryCtrl.service.Spec.EndpointSpec.Ports">
44
<ul ng-repeat="port in serviceDiscoveryCtrl.service.Spec.EndpointSpec.Ports">
5-
<li ng-repeat="node in serviceDiscoveryCtrl.nodes"><a data-ng-if='node.Spec.Labels["dm.reserved.node.endpoint"]' ng-href="http://{/node.Spec.Labels['dm.reserved.node.endpoint'] | ip/}:{/port.PublishedPort/}" target='_blank'> {/node.Spec.Labels['dm.reserved.node.endpoint'] | ip/}:{/port.PublishedPort/}</a></li>
5+
<li ng-repeat="node in serviceDiscoveryCtrl.nodes"><a data-ng-if='node.Spec.Labels["crane.reserved.node.endpoint"]' ng-href="http://{/node.Spec.Labels['crane.reserved.node.endpoint'] | ip/}:{/port.PublishedPort/}" target='_blank'> {/node.Spec.Labels['crane.reserved.node.endpoint'] | ip/}:{/port.PublishedPort/}</a></li>
66
</ul>
77
</div>
88
</section>

src/dockerclient/constants.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const (
1616

1717
const (
1818
labelNamespace = "com.docker.stack.namespace"
19-
LabelRegistryAuth = "dm.reserved.registry.auth"
20-
labelNodeEndpoint = "dm.reserved.node.endpoint"
19+
LabelRegistryAuth = "crane.reserved.registry.auth"
20+
labelNodeEndpoint = "crane.reserved.node.endpoint"
2121
)
2222

2323
const (

src/plugins/auth/permission.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
const (
10-
PERMISSION_LABEL_PREFIX = "dm.reserved.permissions"
10+
PERMISSION_LABEL_PREFIX = "crane.reserved.permissions"
1111
)
1212

1313
type Permission struct {

0 commit comments

Comments
 (0)