Skip to content

Commit

Permalink
fix(examples): use different ingress hostnames for vote-helm example
Browse files Browse the repository at this point in the history
This avoids confusion/conflict when trying out both the vote and
vote-helm examples.
  • Loading branch information
edvald committed Mar 6, 2019
1 parent 8b4dd51 commit e4ad813
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/using-garden/using-helm-charts.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ module:
ingress:
enabled: true
paths: [/]
hosts: [result.local.app.garden]
hosts: [result-helm.local.app.garden]
tests:
- name: integ
args: [echo, ok]
Expand Down
4 changes: 2 additions & 2 deletions examples/vote-helm/result-image/views/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ var socket = io.connect({
transports:['polling'],
// path: "/result/views/socket.io",
});
// https://vote.local.app.garden/socket.io/?EIO=3&transport=polling&t=1544105126936-2
// https://vote.local.app.garden/result/views/socket.io/?EIO=3&transport=polling&t=1544104159102-166
// https://vote-helm.local.app.garden/socket.io/?EIO=3&transport=polling&t=1544105126936-2
// https://vote-helm.local.app.garden/result/views/socket.io/?EIO=3&transport=polling&t=1544104159102-166

var bg1 = document.getElementById('background-stats-1');
var bg2 = document.getElementById('background-stats-2');
Expand Down
2 changes: 1 addition & 1 deletion examples/vote-helm/result/garden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module:
ingress:
enabled: true
paths: [/]
hosts: [result.local.app.garden]
hosts: [result-helm.local.app.garden]
tests:
- name: integ
args: [echo, ok]
Expand Down
2 changes: 1 addition & 1 deletion examples/vote-helm/vote-image/vue.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
devServer: {
disableHostCheck: true,
public: 'http://vote.local.app.garden',
public: 'http://vote-helm.local.app.garden',
},
};
2 changes: 1 addition & 1 deletion examples/vote-helm/vote/garden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module:
ingress:
enabled: true
paths: [/]
hosts: [vote.local.app.garden]
hosts: [vote-helm.local.app.garden]
tests:
- name: integ
args: [npm, run, test:integ]
Expand Down
2 changes: 2 additions & 0 deletions garden-service/src/plugins/kubernetes/hot-reload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ async function getLocalRsyncPort(ctx: PluginContext, log: LogEntry, targetDeploy

proc.stdout.on("data", (line) => {
// This is unfortunately the best indication that we have that the connection is up...
log.silly(`[${targetDeployment} port forwarder] ${line}`)

if (line.toString().includes("Forwarding from ")) {
const portForward = { proc, rsyncLocalPort }
registeredPortForwards[targetDeployment] = portForward
Expand Down

0 comments on commit e4ad813

Please sign in to comment.