diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f3c5fb146..04bb18f835 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,8 +77,6 @@ This release contains a number of fixes and improvements: - Cannot deploy application from folder upload [\#3188](https://github.com/cloudfoundry-incubator/stratos/pull/3188) - Fix issue where only first 100 services were shown in service marketplace [\#3161](https://github.com/cloudfoundry-incubator/stratos/pull/3161) - Fix marketplace provisioning for asynchronous services [\#3086](https://github.com/cloudfoundry-incubator/stratos/pull/3086) -- Fix K8S Services not using correct label to select them [\#129](https://github.com/SUSE/stratos/pull/129) -- Fix issue with large files being sent into request URL [\#90](https://github.com/SUSE/stratos/pull/90) **Improvements:** - App Deploy: Add Public GitLab Repository support [\#3239](https://github.com/cloudfoundry-incubator/stratos/pull/3239) @@ -108,9 +106,6 @@ This release contains a number of fixes and improvements: - Add user has roles filter to users tables [\#3258](https://github.com/cloudfoundry-incubator/stratos/pull/3258) - Deploy App: Add notification toast [\#3242](https://github.com/cloudfoundry-incubator/stratos/pull/3242) - Update app instance cell data when scaling up [\#3133](https://github.com/cloudfoundry-incubator/stratos/pull/3133) -- Use product branding in place of Stratos [\#126](https://github.com/SUSE/stratos/pull/126) -- Show error on Kubernetes pages and Kubernetes endpoint page [\#96](https://github.com/SUSE/stratos/pull/96) -- Add validation when connecting Kubernetes endpoints [\#94](https://github.com/SUSE/stratos/pull/94) ## 2.2.0 @@ -375,7 +370,7 @@ This is the first release candidate of Version 2 of Stratos. The main focus of this release are bug fixes for release. **Improvements:** -- Add ingress example and docs for kubernetes deloyment [\#2510](https://github.com/cloudfoundry-incubator/stratos/pull/2510) +- Add ingress example and docs for kubernetes deployment [\#2510](https://github.com/cloudfoundry-incubator/stratos/pull/2510) **Fixed bugs:** - Fix for app count being stuck after adding an app in org card [\#2511](https://github.com/cloudfoundry-incubator/stratos/pull/2511) diff --git a/docs/connecting-k8s.md b/docs/connecting-k8s.md deleted file mode 100644 index b43d225c60..0000000000 --- a/docs/connecting-k8s.md +++ /dev/null @@ -1,79 +0,0 @@ -# Connecting Different Kinds of Kubernetes Clusters - -Currently the Stratos Kubernetes plugin supports the following four types of clusters: - -1. CAASP (OIDC) -2. AWS EKS (AWS IAM auth) -2. Azure AKS -4. Certificate based Kubernetes authentication - -The following details, how to find the endpoint URL required to register the cluster in Stratos and what credentials are required to connect. - -## CAASP (OIDC) -To connect a CAASP cluster to Stratos, download a `kubeconfig` from Velum. - -1. To find the endpoint URL, inspect the file. The `server` property details the endpoint URL - -``` -apiVersion: v1 -kind: Config -clusters: -- name: caasp - cluster: - server: https://kube-api-x1.devenv.caasp.suse.net:6443 <---Endpoint URL - certificate-authority-data: 1c1MFpYSnVZV3dnUTBFd0hoY05NVGd4TURBMU1USXhNalU1V2hjTk1qZ3hNREF5TVRJeE1qVTVXakNCb1RFTApNQWtHQTFVRUJoTUNSRVV4RURBT0JnTlZCQWdNQjBKaGRtRnlhV0V4RWpBUUJnTlZCQWNNQ1U1MWNtVnRZbVZ5Clp6RWJNQmtHQTFVRUNnd1NVMVZUUlNCQmRYUnZaMl... -``` -2. Specify the Endpoint URL when adding the endpoint to Stratos. -3. To connect to Kubernetes, select the `CAASP (OIDC)` option, and upload the `kubeconfig` file downloaded from Velum. - -## Amazon EKS -The following details are required to connect to an EKS system: -- EKS Cluster endpoint URL. (To register the endpoint). - - This can be located in the generated configuration. See the following example. -To Connect the following details are required: -- Cluster Name (See the following example) -- AWS Access Key -- AWS Secret Key - -### EKS Endpoint URL And Cluster Name -You can locate the EKS cluster endpoint URL and the cluster name, by inspecting the generated cluster configuration in your local `kubeconfig`. - -``` -10:20 $ cat ~/.kube/config -- cluster: - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa...QXR2N3dOQkt3eFhsYgpxZm5HRUs0WHRmSWNIcjJHSjhZOXdIa0lPRm0rR3Nvak1PaG1pK05wbER2YjVJc3BmMmxxbXdLd3RmRT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= - server: https://40BCD34B7E297903DA2EAF19B6164521.sk1.us-east-1.eks.amazonaws.com - name: arn:aws:eks:us-east-1:138384977974:cluster/BRSSCF - -``` -The endpoint URL is specified in the `server` property (i.e. `https://40BCD34B7E297903DA2EAF19B6164521.sk1.us-east-1.eks.amazonaws.com`), while the cluster name is the last part of the `name` property (i.e `BRSSCF`). - -## Azure AKS -To connect an AKS kubernetes instance, the following is required: -1. AKS Endpoint URL, which can be found from the AKS console or the generated kubernetes configuration. -2. To connect to the cluster, provide the `kubeconfig` file. - -## Certificate based authentication (Minikube) - -Minikube by default uses TLS certificates for authentication. To find the Minikube endpoint URL, locate the `minikube` entry in your local `kubeconfig` file. In the following example, the `minikube` endpoint URL is `https://192.168.99.100:8443`. - -``` -- cluster: - certificate-authority: /home/user/.minikube/ca.crt - server: https://192.168.99.100:8443 - name: minikube -``` - -To connect to the cluster, locate the relevant entry in the `users` section in your kubernetes config file. - -``` -users: -- name: minikube - user: - client-certificate: /home/user/.minikube/client.crt - client-key: /home/user/.minikube/client.key - -``` -The two files specified under `client-certificate` and `client-key` are required to connect to the cluster. -Select the `Kubernetes Cert Auth` option in the connect dialog and select the two files to connect. \ No newline at end of file diff --git a/docs/suse/deploy.md b/docs/suse/deploy.md deleted file mode 100644 index 2e9026f4c8..0000000000 --- a/docs/suse/deploy.md +++ /dev/null @@ -1,175 +0,0 @@ -# Deploying Stratos - -The following instructions cover how to: - -- Deploy Stratos -- Connect Kubernetes to Stratos to enable Kubernetes views in Stratos -- Deploy Stratos Metrics -- Connect Stratos Metrics to Stratos to enable Metrics views in Stratos - -These instructions assume that you are deploying the SUSE Cloud Application Platform and that you have deployed UAA/SCF using a `scf-config-values` configuration file. - -## Install Stratos with Helm - -> NOTE: Full details on deploying Stratos to Kubernetes are available [here](https://github.com/SUSE/stratos/tree/v2-master/deploy/kubernetes) - -> NOTE: These instructions assume that you have added the SUSE Helm Repository with the name 'suse' - -To deploy Stratos, use the same `scf-config-values.yaml` file that you used to deploy SCF/UAA. - -Ensure you have a Storage Class configured and that is set to be the default - see [here](https://github.com/SUSE/stratos/tree/v2-master/deploy/kubernetes#specifying-a-custom-storage-class) for more information. - -Install with: - -``` -helm install suse/console \ - --name susecf-console \ - --namespace stratos \ - --values scf-config-values.yaml -``` - -Wait until all pods are in the Ready state. - -You can locate the IP and Port that Stratos is running on with: - -``` -kubectl get service stratos-ui-ext --namespace=stratos -``` - -This will give output similar to: - -``` -NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE -stratos-ui-ext NodePort 172.24.239.140 10.17.3.1 80:30862/TCP,8443:32129/TCP 1h -``` - -> NOTE: When you log in to Stratos, your SUSE Cloud Foundry dpeloyment should already be registered and connected to Stratos. - -## Connecting Kubernetes to Stratos - -Stratos can show information from your Kubernetes environment. - -To enable this, you must register and connect your Kubernetes environment with Stratos. - -In the Stratos UI, go to `Endpoints` in the left-hand side navigation and click on the `+` icon in the top-right on the view - you should be shown the `Register new Endpoint` view. - -1. Select `Kubernetes` from the `Endpoint Type` dropdown -1. Enter a memorable name for yor environment in the `Name` field -1. Enter the URL of the API server for your Kubernetes environment -1. Check the `Skip SSL validation for the endpoint` if using self-signed certificates -1. Click `Finish` - -The view will refresh to show the new endpoint in the disconnected state. - -Next you will need to connect to this endpoint. - -1. In the table of endpoints, click the three-dot menu icon alongside the endpoint that you added above -1. Click on 'Connect' in the dropdown menu -1. Select the appropriate authentication type and provide the necessary values (see below for more information) -1. Click `Connect` - -Once connected, you should see a `Kubernetes` menu item in the left-hand side navigation - click on this to view the Kubernetes metadata. - -### Connecting to Kubernetes - -When connecting to Kubernetes you need to provide authentication information in order to connect - the `Auth Type` and information required depends on the Kubernetes platform that you are using: - -- For CaaSP, use the Auth Type `CAASP (OIDC)` and provide a valid `kubeconfig` file for your environment - -- For Amazon EKS use the Auth Type `AWS IAM (EKS)` and provide the name of your EKS cluster and your AWS Access Key ID and Secret Access Key - -- For Azure AKS use the Auth Type `Azure AKS` and provide a valid `kubeconfig` file for your environment - -- For Minikube use the Auth Type `Kubernetes Cert Auth` and provide the Certificate and Certificate Key files - - -> NOTE: For more details - see [here](https://github.com/SUSE/stratos/blob/v2-master/docs/connecting-k8s.md). - -## Deploying Metrics - -Stratos can show metrics data from Prometheus for both Cloud Foundry and Kubernetes. - -In order to do this, you need to deploy the `stratos-metrics` Helm chart - this deploys Prometheus with the necessary exporters that collect data from Cloud Foundry and Kubernetes. It also wraps Prometheus with an nginx server to provide authentication. - -As with deploying Stratos, you should deploy the metrics Helm chart using the same `scf-config-values.yaml` file that was used for deploying SCF and UAA. - -Create a new yaml file named `stratos-metrics-values.yaml`, with the following contents: - -``` -kubernetes: - authEndpoint: $KUBE_SERVER_ADDRESS -prometheus: - kubeStateMetrics: - enabled: true -nginx: - username: $USERNAME - password: $PASSWORD -``` - -Where: - -- `$KUBE_SERVER_ADDRESS` is the same URL that you used when registering your Kubernetes environment with Stratos (the Kubernetes API Server URL). -- `$USERNAME` should be chosen by you as the username that you will use when connecting to Stratos Metrics -- `$PASSWORD` should be chosen by you as the password that you will use when connecting to Stratos Metrics - -> Note: If you omit the `nginx` section in this file, the default username and password will be `metrics` and `s3cr3t`. - -Install Metrics with: - -``` -helm install suse/metrics \ - --name susecf-metrics \ - --namespace metrics \ - --values scf-config-values.yaml \ - --values stratos-metrics-values.yaml \ -``` - -Wait until all pods are in the Ready state. - -You can locate the IP and Port that Stratos Metrics is running on with: - -``` -kubectl get service susecf-metrics-metrics-nginx --namespace=metrics -``` - -This will give output similar to: - -``` -NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE -susecf-metrics-metrics-nginx NodePort 172.24.218.219 10.17.3.1 443:31173/TCP 13s -``` - -> Note: If you are using a private container registry, you will need to provide your registry details and credentials in a configuration file - see [here](https://github.com/SUSE/stratos-metrics/blob/master/README.md#deploying-metrics-from-a-private-image-repository) for more details. - -## Connecting Stratos Metrics to Stratos - -When Stratos Metrics is connected to Stratos, additional views are enabled that show metrics metadata that has been ingested into the Stratos Metrics Prometheus server. - -To enable this, you must register and connect your Stratos Metrics instance with Stratos. - -In the Stratos UI, go to `Endpoints` in the left-hand side navigation and click on the `+` icon in the top-right on the view - you should be shown the `Register new Endpoint` view. - -1. Select `Metrics` from the `Endpoint Type` dropdown -1. Enter a memorable name for yor environment in the `Name` field -1. Enter the URL of your Metrics endpoint -1. Check the `Skip SSL validation for the endpoint` if using self-signed certificates -1. Click `Finish` - -The view will refresh to show the new endpoint in the disconnected state. - -Next you will need to connect to this endpoint. - -1. In the table of endpoints, click the three-dot menu icon alongside the endpoint that you added above -1. Click on 'Connect' in the dropdown menu -1. Enter the username and password for your Stratos Metrics instance -1. Click `Connect` - -Once connected, you should see that the name of your Metrices endpoint is a hyperlink and clicking on it should show basic metadata about the Stratos Metrics endpoint. - -Metrics data and views should now be available in the UI, for example: - -- On the `Instances` tab for an Application, the table should show an additional `Cell` column to indicate which Diego Cell the instance is running on. This should be clickable to navigate to a Cell view showing Cell information and metrics - -- On the view for an Application there should be a new `Metrics` tab that shows Application metrics - -- On the Kubernetes views, views such as the `Node` view should show an additional `Metrics` tab with metric information diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod index 307eff428c..760b392765 100644 --- a/src/jetstream/go.mod +++ b/src/jetstream/go.mod @@ -16,8 +16,6 @@ require ( github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect github.com/cloudfoundry-community/go-cfenv v1.17.0 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular v0.0.0-00010101000000-000000000000 github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-00010101000000-000000000000 github.com/cloudfoundry/bosh-cli v5.4.0+incompatible // indirect github.com/cloudfoundry/bosh-utils v0.0.0-20190206192830-9a0affed2bf1 // indirect @@ -25,11 +23,13 @@ require ( github.com/cloudfoundry/noaa v2.1.0+incompatible github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 github.com/cppforlife/go-patch v0.2.0 // indirect + github.com/cyphar/filepath-securejoin v0.2.2 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/domodwyer/mailyak v3.1.1+incompatible github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect github.com/fatih/color v1.7.0 // indirect github.com/go-sql-driver/mysql v1.4.1 + github.com/gogo/protobuf v1.2.1 // indirect github.com/golang/snappy v0.0.1 // indirect github.com/google/go-querystring v1.0.0 // indirect github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect @@ -42,7 +42,9 @@ require ( github.com/jtolds/gls v4.20.0+incompatible // indirect github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 + github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 // indirect github.com/labstack/echo v3.3.10+incompatible + github.com/lib/pq v1.1.0 // indirect github.com/lunixbochs/vtclean v1.0.0 // indirect github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f // indirect github.com/mattn/go-runewidth v0.0.4 // indirect @@ -52,6 +54,7 @@ require ( github.com/nwaples/rardecode v1.0.0 // indirect github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f github.com/pierrec/lz4 v2.0.5+incompatible // indirect + github.com/pkg/errors v0.8.1 // indirect github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.3.0 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect @@ -59,6 +62,7 @@ require ( github.com/ulikunitz/xz v0.5.6 // indirect github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + github.com/ziutek/mymysql v1.5.4 // indirect golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 // indirect google.golang.org/appengine v1.5.0 // indirect @@ -69,27 +73,12 @@ require ( replace github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ./repository/interfaces -replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes => ./plugins/kubernetes - -replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular => ./plugins/monocular - replace ( github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.1 - github.com/helm/monocular/chartrepo => ./plugins/monocular/chart-repo - github.com/helm/monocular/chartsvc => ./plugins/monocular/chartsvc - github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2 github.com/sergi/go-diff => github.com/sergi/go-diff v1.0.0 github.com/smartystreets/goconvey => github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd github.com/spf13/cobra => github.com/spf13/cobra v0.0.3 gopkg.in/DATA-DOG/go-sqlmock.v1 => github.com/DATA-DOG/go-sqlmock v1.1.3 - k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca - k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible - k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 - k8s.io/kubernetes => k8s.io/kubernetes v1.13.3 ) diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum index 7dbcab2689..0a3bbbe9aa 100644 --- a/src/jetstream/go.sum +++ b/src/jetstream/go.sum @@ -142,8 +142,6 @@ github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:Fecb github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec= -github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE= github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA= github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs= github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38= @@ -171,8 +169,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGi github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k= github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c= -github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE= -github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU= github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA= github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c= github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg= @@ -326,28 +322,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE= -k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 h1:BMfPZfi3CkPd9e9Qbm+/AFgE6qXWQcbzUvC91LR3m7w= -k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= -k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 h1:UYfHH+KEF88OTg+GojQUwFTNxbxwmoktLwutUzR0GPg= -k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apiserver v0.0.0-20190221215341-5838f549963b h1:yFFYCR/UVj6hsYX6yRbY3CJ3917NF7tn0hwcdUil1aI= -k8s.io/apiserver v0.0.0-20190221215341-5838f549963b/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= -k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca h1:UbXBTjFC1Yy5SDU8TPLVay3znB6yrlCo7Yq/q1VdESQ= -k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM= -k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible h1:xkYgpj1zwmLkSh7QASe/GUMTyjPI3hwHy7k/RcQSp2A= -k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w= -k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= -k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c= -k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s= -k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E= -k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4= -k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ= diff --git a/src/jetstream/load_plugins.go b/src/jetstream/load_plugins.go index 80a9bd12d0..04d173bf4e 100644 --- a/src/jetstream/load_plugins.go +++ b/src/jetstream/load_plugins.go @@ -6,9 +6,7 @@ import ( "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundry" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundryhosting" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/demo" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/metrics" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userfavorites" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinfo" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinvite" @@ -34,8 +32,6 @@ func (pp *portalProxy) loadPlugins() { {"userinfo", userinfo.Init}, // userinvite depends on cloudfoundry & cloudfoundryhosting {"userinvite", userinvite.Init}, - {"kubernetes", kubernetes.Init}, - {"monocular", monocular.Init}, {"userfavorites", userfavorites.Init}, {"demo", demo.Init}, } {