forked from cloudfoundry/stratos
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from cloudfoundry-incubator/v2-master
Merge in upstream v2-master
- Loading branch information
Showing
17 changed files
with
229 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,11 +15,11 @@ resources: | |
branch: ((stratos-branch)) | ||
private_key: ((github-private-key)) | ||
tag_filter: "2*" | ||
- name: stratos-master | ||
- name: helm-repo | ||
type: git | ||
source: | ||
uri: [email protected]:((github-organization))/((github-repository)) | ||
branch: master | ||
uri: [email protected]:((helm-repo-github-organization))/((helm-repo-github-repository)) | ||
branch: ((helm-repo-branch)) | ||
private_key: ((github-private-key)) | ||
# Docker Images | ||
- name: jetstream-image | ||
|
@@ -126,7 +126,7 @@ jobs: | |
- get: stratos | ||
passed: [build-images] | ||
trigger: true | ||
- get: stratos-master | ||
- get: helm-repo | ||
- get: image-tag | ||
passed: [build-images] | ||
params: | ||
|
@@ -144,6 +144,7 @@ jobs: | |
GIT_PRIVATE_KEY: ((github-private-key)) | ||
DOCKER_ORG: ((artifact-docker-organization)) | ||
DOCKER_REGISTRY: ((artifact-docker-registry)) | ||
HELM_REPO_PATH: ((helm-repo-path)) | ||
- put: helm-chart-tarball | ||
params: | ||
file: helm-chart/*.tgz | ||
|
@@ -166,8 +167,8 @@ jobs: | |
file: stratos/deploy/ci/tasks/dev-releases/update-gh-release.yml | ||
params: | ||
GITHUB_TOKEN: ((github-access-token)) | ||
GITHUB_USER: ((github-organization)) | ||
GITHUB_REPO: ((github-repository)) | ||
GITHUB_USER: ((helm-repo-github-organization)) | ||
GITHUB_REPO: ((helm-repo-github-repository)) | ||
GIT_USER: ((concourse-user)) | ||
GIT_EMAIL: ((concourse-email)) | ||
GIT_PRIVATE_KEY: ((github-private-key)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# Configuring Ingress | ||
|
||
You can make Stratos available via Ingress by following the instructions below. | ||
|
||
Ensure that you have Ingress deployed in your Kubernetes environment. | ||
|
||
To do this using Helm follow the instructions here: https://github.com/nginxinc/kubernetes-ingress/tree/master/helm-chart. | ||
|
||
If you want to use your own certificate, follow the link above for how to do this along with more advanced configuring options. | ||
|
||
Briefly, this involves running: | ||
|
||
``` | ||
git clone [email protected]:nginxinc/kubernetes-ingress.git | ||
cd kubernetes-ingress/helm-chart | ||
helm install --name ingress . | ||
``` | ||
|
||
Wait for the Ingress controller pod to be in the Running state. | ||
|
||
Now, edit the `ingress.xml` in this folder to suit your needs - most likely you will want to change: | ||
|
||
- metadata.namespace to the namespace that you using when deploying Stratos | ||
|
||
- spec.rules.host and spec.tls.hosts to change the host from stratos.127.0.0.1.xip.io to suit your deployment | ||
|
||
Finally, deploy the Ingress configuraation with: | ||
|
||
``` | ||
kubectl apply -f ./ingress.yml | ||
``` | ||
|
||
You should now be able to access Stratos via the URL: | ||
|
||
``` | ||
https://stratos.127.0.0.1.xip.io | ||
``` | ||
|
||
Note if you changed the host in the ingress.yml file, this URL will of course need to be adjusted. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
apiVersion: extensions/v1beta1 | ||
kind: Ingress | ||
metadata: | ||
name: stratos | ||
namespace: stratos | ||
annotations: | ||
nginx.org/ssl-services: "stratos-ui-ext" | ||
nginx.org/websocket-services: "stratos-ui-ext" | ||
spec: | ||
rules: | ||
- host: stratos.127.0.0.1.xip.io | ||
http: | ||
paths: | ||
- path: / | ||
backend: | ||
serviceName: stratos-ui-ext | ||
servicePort: 443 | ||
tls: | ||
- hosts: | ||
- stratos.127.0.0.1.xip.io | ||
secretName: stratos-tls |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.