Set helm-broker repository baseURL to github pages

Author: piotrmiskiewicz

components/helm-broker/.gitignore

@@ -100,7 +100,6 @@ fabric.properties
 *.iml
 
 /targz
-/reposerver
 /indexbuilder
 /broker
 /vendor

components/helm-broker/Jenkinsfile

@@ -44,12 +44,10 @@ podTemplate(label: label) {
                         stage("build image $application") {
                             dir(env.APP_FOLDER){
                                 sh "cp ./broker deploy/broker/helm-broker"
-                                sh "cp ./reposerver deploy/reposerver/reposerver"
                                 sh "cp ./indexbuilder deploy/tools/indexbuilder"
                                 sh "cp ./targz deploy/tools/targz"
 
                                 sh "docker build -t ${dockerPushRoot}helm-broker:latest deploy/broker --label version=${dockerImageTag} --label component=${application}"
-                                sh "docker build -t ${dockerPushRoot}helm-broker-reposerver:latest deploy/reposerver --label version=${dockerImageTag} --label component=${application}"
                                 sh "docker build -t ${dockerPushRoot}helm-broker-tools:latest deploy/tools --label version=${dockerImageTag} --label component=${application}"
                             }
                         }
@@ -58,15 +56,11 @@ podTemplate(label: label) {
                             sh "docker tag ${dockerPushRoot}helm-broker:latest ${dockerPushRoot}helm-broker:${dockerImageTag}"
                             sh "docker push ${dockerPushRoot}helm-broker:${dockerImageTag}"
 
-                            sh "docker tag ${dockerPushRoot}helm-broker-reposerver:latest ${dockerPushRoot}helm-broker-reposerver:${dockerImageTag}"
-                            sh "docker push ${dockerPushRoot}helm-broker-reposerver:${dockerImageTag}"
-
                             sh "docker tag ${dockerPushRoot}helm-broker-tools:latest ${dockerPushRoot}helm-broker-tools:${dockerImageTag}"
                             sh "docker push ${dockerPushRoot}helm-broker-tools:${dockerImageTag}"
 
                             if (params.GIT_BRANCH == 'master') {
                                 sh "docker push ${dockerPushRoot}helm-broker:latest"
-                                sh "docker push ${dockerPushRoot}helm-broker-reposerver:latest"
                                 sh "docker push ${dockerPushRoot}helm-broker-tools:latest"
                             }
 

components/helm-broker/before-commit.sh

@@ -27,7 +27,7 @@ fi
 ##
 # GO BUILD
 ##
-binaries=("broker" "indexbuilder" "reposerver" "targz")
+binaries=("broker" "indexbuilder" "targz")
 buildEnv=""
 if [ "$1" == "$CI_FLAG" ]; then
 	# build binary statically

components/helm-broker/cmd/reposerver/README.md

@@ -3,6 +3,6 @@ title: Helm Broker
 type: Overview
 ---
 
-The Helm Broker is an implementation of a service broker which runs in the Kyma cluster and deploys Kubernetes native resources using [Helm](https://github.com/kubernetes/helm) and Kyma bundles. A bundle is an abstraction layer over a Helm chart which allows you to represent it as a ClusterServiceClass in the Service Catalog. For example, a bundle can provide plan definitions or binding details. The Helm Broker fetches bundle definitions from an HTTP server. By default, the Helm Broker contains an embedded HTTP server which serves bundles from the Kyma bundles directory.
+The Helm Broker is an implementation of a service broker which runs in the Kyma cluster and deploys Kubernetes native resources using [Helm](https://github.com/kubernetes/helm) and Kyma bundles. A bundle is an abstraction layer over a Helm chart which allows you to represent it as a ClusterServiceClass in the Service Catalog. For example, a bundle can provide plan definitions or binding details. The Helm Broker fetches bundle definitions from an HTTP server. By default, the Helm Broker fetches bundles from the [stable repository](https://kyma-project.github.io/bundles/stable/).
 
 The Helm Broker implements the Service Broker API. For more information about the Service Brokers, see the **Service Brokers overview** document.

components/helm-broker/cmd/reposerver/main.go

@@ -3,20 +3,11 @@ title: Configure Helm Broker
 type: Configuration
 ---
 
-The Helm Broker fetches bundle definitions from an HTTP server defined in the `values.yaml` file. The **config.repository.baseURL** attribute defines the HTTP server URL. By default, the Helm Broker contains an embedded HTTP server which serves bundles from the Kyma `bundles` directory.
-
-
-### Configuring the Helm Broker on the embedded HTTP server
-
-By default, the Helm Broker contains an embedded HTTP server which serves bundles from the `bundles` directory. Deploying Kyma automatically populates the bundles.
-
-To add a yBundle to the Helm Broker, place your yBundle directory in the `bundles` folder.
-> **NOTE:** The name of the yBundle directory in the `bundles` folder must follow this pattern: \{bundle_name}\-\{bundle_version}\.
-
+The Helm Broker fetches bundle definitions from an HTTP server defined in the `values.yaml` file. The **config.repository.baseURL** attribute defines the HTTP server URL.
 
 ### Configuring the Helm Broker externally
 
-Follow these steps to change the configuration and make the Helm Broker fetch bundles from a remote HTTP server:
+Follow these steps to change the configuration and make the Helm Broker fetch bundles from a custom HTTP server:
 
 1. Create a remote bundles repository. Your remote bundle repository must include the following resources:
     - An `index.yaml` file which defines available bundles.
@@ -42,14 +33,9 @@ Follow these steps to change the configuration and make the Helm Broker fetch bu
 
     - A `{bundle_name}-{bundle_version}.tgz` file for each bundle version defined in the `index.yaml` file. The `.tgz` file is an archive of your bundle's directory.
 
-2. In the `values.yaml` located in the `/resources/core/charts/helm-broker/` directory, set the **embeddedRepository.provision** attribute to `false` to disable the embedded server. Provide your server's URL in the **config.repository.baseURL** attribute:
+2. In the `values.yaml` provide your server's URL in the **config.repository.baseURL** attribute:
 
   ```yaml
-embeddedRepository:
-  # Defines whether to provision the embedded bundle repository.
-  # To provision, specify this value to true
-  provision: true
-
   config:
     repository:
       baseURL: "http://custom.bundles-repository"

components/helm-broker/cmd/reposerver/main_test.go

@@ -8,7 +8,7 @@ The Helm Broker workflow starts with the registration process, during which the
 ### Registration process
 
 The registration process in the case of the Helm Broker consists of the following steps:
-1. The Helm Broker fetches yBundles from the Kyma bundles directory, or from the remote HTTP server.
+1. The Helm Broker fetches yBundles from the remote HTTP server.
 2. The Helm Broker registers yBundles as ServiceClasses in the Service Catalog.
 
 ![Helm Broker registration](assets/010-helm-registration.png)

components/helm-broker/deploy/reposerver/Dockerfile

@@ -5,7 +5,7 @@
 <title>010-helm-registration</title>
 <meta charset="utf-8"/>
 </head>
-<body><div class="mxgraph" style="max-width:100%;border:1px solid transparent;" data-mxgraph="{&quot;nav&quot;:true,&quot;resize&quot;:true,&quot;toolbar&quot;:&quot;zoom layers lightbox&quot;,&quot;edit&quot;:&quot;_blank&quot;,&quot;xml&quot;:&quot;&lt;mxfile userAgent=\&quot;Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.170 Safari/537.36\&quot; version=\&quot;8.6.3\&quot; editor=\&quot;www.draw.io\&quot; type=\&quot;device\&quot;&gt;&lt;diagram id=\&quot;4f752313-519d-a896-534b-ee1c11d4aec4\&quot; name=\&quot;Page-1\&quot;&gt;5Vpdc5s4FP01fmwHEMLm0cZpO7Pdmez6YdNHBWSsKba8Qo7t/fUrjATowwlJsSd1kgfDlRDSOedK90qMQLI+fGVou/qTZrgYBV52GIH5KAgCb+yJn8pyrC3xZFIbckay2uS3hgX5D0ujfC7fkQyXWkVOacHJVjemdLPBKddsiDG616staaG/dYtybBkWKSps6z8k4ytp9T2vLfiGSb6Sr55AWfCI0p85o7uNfN8oAMvTX128RqotWb9coYzuOyZwNwIJo5TXV+tDgosKWwVb/dyXM6VNvxne8D4PBPUDT6jYYdXjU7/4UWGxXxGOF1uUVvd7wfcIzFZ8XYg7X1yiclszsCQHLFqdlZzRnzihBWWnBkAM42QaNiUKUDHW2ZIURaemhArM7GHIkT1hxvGhY5LD+orpGnN2FFWUCCewfkRKUEly3/IZTaRt1aGyMSKpobxpusVRXEgo3bACB6xRwasRUzGiLr7RvzuqCj6VJ0+Yigo+3B7aQnGVy99TK4/K8MdxjUTtpNiVHDNVLLr3aD4ibPW7ldmgWcDKdWZ1Ijd0gw3GpAkVJN+I21SQJfoAZhVJRDjTVBasSZZVr5m5pHRylko4c28Y4qEi8KjmFJt5P3AwHwxAPHzZn/QBv+BdljPdRdW/5Uz+ZZ0JjiMNU6FPC1MQOjD1wwFAjS7kTd9wsRaFswpI1tdPfo2+IEymSXJ1+oy5MJzYLuGmzx+AvrFF3984I2UzlzGF9QKzJ5LipEClo3RgJubBHM7jazMRBYYjxbYjxQ4i4AA8TCwe7mnJc4YXf33/kGSMzVntimTEF5rTJG1VTIA4Kmj+4db/SLGoWA1sVpt5bej13+8RUP+OrgKgHlQB4AiqoGsFGcJZ/EvF0zPBRIEd8xvDW1oSTqt+nvGfm5wSI51mGDlodgYKIB6A5vBVK9RNAB4CHfHQtxEfOwAHcAC87WzlTGR2m1CH8HpQXyqHuegMdjMxAYiN5csxr7moHyQksPMfC2i8yabVtmULYIbK1QkB/wVfanbX8IHwB1mruv5RwfcZVncb0eUHiebppi07C25JdyxV26Fy/eWI5Vjtk9UmnGk7qTYDHYRd8YGyMVwgTp70/VcX7PIN95Sc3Ebt9hnxSWTuO9TDkU8FnQ1RoyHgGStgbDRUY2A1JOhDx061bVWhPN9haLwnAt6z/TLrQzkrtSKse9BKsuGgn0rt7PA5laZVWkjS3tpUCvQ/e3Csq9ALYmW4x4yIPlcTRq1VKWlPk3TQW7eRLVu15r0T3UKoJyvNmvRa3Uae3pDA/jK6DQ0depPndRuai240rG5difTwuu1MpD86c+xDK8hGn78gzvG70mZkUfdWbZqrb09tvkEOasH+PeTwToieBAbR5hFYX6IngTEJhf7FiLZzRSOgThsC25i5OYxtTT0Cb+AKvP2+G2ui32Rbngt1X3WS6k2ju45En8mbmppntfeK0wMjb4KOvEkdfGnB8wB5k/NA7Zo0Bx+G5jEwQhH/ijTb6fES83QlTI8qwb3V3BR6+uEcdODu+lBhiNzUcSbEcE7qbwluFfCxcQbXbA50AHftcb4BcHHbfstTr3LtB1Pg7n8=&lt;/diagram&gt;&lt;/mxfile&gt;&quot;}"></div>
+<body><div class="mxgraph" style="max-width:100%;border:1px solid transparent;" data-mxgraph="{&quot;nav&quot;:true,&quot;resize&quot;:true,&quot;toolbar&quot;:&quot;zoom layers lightbox&quot;,&quot;edit&quot;:&quot;_blank&quot;,&quot;xml&quot;:&quot;&lt;mxfile userAgent=\&quot;Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.170 Safari/537.36\&quot; version=\&quot;8.6.3\&quot; editor=\&quot;www.draw.io\&quot; type=\&quot;device\&quot;&gt;&lt;diagram id=\&quot;4f752313-519d-a896-534b-ee1c11d4aec4\&quot; name=\&quot;Page-1\&quot;&gt;5VlNc5s8EP41PrYDCGE42jhvO9N2pq0PbY8KyFhT2aJCju3++gojAUJK4jfBnjaxD0a7iz6eZ1darScg3RzecVSuP7Ec00ng5YcJWEyCwPeDqfypJcdGEgMlKDjJlVEnWJLfWAk9Jd2RHFeGoWCMClKawoxttzgThgxxzvam2YpRc9QSFdgSLDNEbek3kou1XpfndYr3mBRrNXQMleIWZT8LznZbNd4kAKvTp1FvkO5L2VdrlLN9TwRuJiDljInmaXNIMa2x1bA17/13j7adN8dbcc4LQfPCHaI7rGd8mpc4aiz2ayLwskRZ3d5LvidgvhYbKlu+fERV2TCwIgcse51XgrOfOGWU8VMHIIFJOgtbjQZUrnW+IpT2LBVUYG4vQ63sDnOBDz2RWtY7zDZY8KM0UdpQ+5Jywalq7js+IYSNbN2jshUi5UNF23WHo3xQULphBQ5YIyrqFTO5oj6+0a8d04o31SkSZtLAh+WhU8qnQv2eernVgg/HDZLWKd1VAnOtltO7Hb4iZc3YWjygWcIqTGZNIrdsiweMKRGipNjKZibJknMA85okIoNpphQbkuf1MHOXK52CpXachTcO8TA2iW+Dtse8r+Ovz7yWPYd4+Hg8mQt+JLqsYLqJ6q8VTP5lgwlOIwNT6Z8WpiB0YOqHI4AaXSia3mO6kcp5DSQ/N06eR18QprM0vTp9MTToC2M7JNz0+SPQN7Xo+4pzUrV7GddYLzG/IxlOKaoc2pGZWAQLuEiuzUQUDAIpsQMpcRABR+Ahtnj4zCpRcLz88vFVkjEd7mpXJCO50J6maKtzAiQQZcWrO/8jzaJmNbBZbfe1sc9//1KZ31yiRLEjEjkuWUUEq+d5D9MvMnhbuvSZFsG30CbaeaqBZASm7e3UwhVv81l9G62Do95HSfYIlO1VSeLCj9+V2anxo2ZHrlA2D0R8V1zVz53mXlgrtuMZNrIpgXiBhem1ODeuxTb2/cvTAxsjxxQJcmdepl1gqxE+M3KKDZ2uQDOCw3BwJWuWo97q324HHUWe2ZHE1+yoAcHqSJKGjj2zsjaoHphwaPoiBHDgSk2PnWO1mJ7na67TYnxfU+6lvc3v+9rbAPbd7RnONv2rfC0aUPd0X0vMjs71tSe4g975/g13+EuIjofnRew9jeg4GGwqoX8xosPHsomsJbBLGNqKYyc6I+sArqzDPzd7lPMmZXVfjve/yoXeLLrpuegD6URrOUI6AcFgCw/tZCJwlAuDEaqFzqrRNWkOXg3NUzBILfwr0mzXsVZYZGsputXZ/Uu9lEHPrEBBB+7xhe5kjsIHxwVpCuYvFfDpoNAEErvk57obPQFw2ez+sGpOue5fQXDzBw==&lt;/diagram&gt;&lt;/mxfile&gt;&quot;}"></div>
 <script type="text/javascript" src="https://www.draw.io/js/viewer.min.js"></script>
 </body>
 </html>

docs/service-brokers/docs/004-overview-helm-broker.md

@@ -14,7 +14,6 @@ spec:
       namespace: "istio-system"
     - name: "prometheus-operator"
       namespace: "kyma-system"
-    - name: "provision-bundles"
     - name: "dex"
       namespace: "kyma-system"
     - name: "core"

docs/service-brokers/docs/011-configuration-helm-broker.md

@@ -17,5 +17,4 @@ Resources currently include, but are not limited to, the following:
 - Elements which are essential for the installation of `core` components in Kyma, such as certificates, users, and permissions
 - The `core` components required to run the Kyma
 - Examples of the use of specific components
-- The repository of bundles that are exposed in the Service Catalog as Service Classes through the Helm Broker
 - Scripts for the installation of Helm, Istio deployment, as well as scripts for validating Pods, starting Kyma, and testing

docs/service-brokers/docs/021-architecture-helm-broker.md

@@ -6,25 +6,10 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Define template equivalent to "name" template, but used for reposerver deployment/service
-*/}}
-{{- define "reposerver-name" -}}
-{{- $rName := printf "%s-%s" .Chart.Name "reposerver" -}}
-{{- default $rName  .Values.ReposerverNameOverride  | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
 {{- printf "%s-%s" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{/*
-Define template equivalent to "fullname" template, but used for reposerver deployment/service
-*/}}
-{{- define "reposerver-fullname" -}}
-{{- printf "%s-%s-%s" .Release.Name .Chart.Name "reposerver" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

docs/service-brokers/docs/assets/010-helm-registration.html

@@ -82,77 +82,3 @@ spec:
       - name: config-volume
         configMap:
           name: helm-config-map
-
----
-
-{{ if .Values.embeddedRepository.provision  }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: {{ template "reposerver-fullname" . }}
-  labels:
-    app: {{ template "reposerver-name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ template "reposerver-name" . }}
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 0
-  template:
-    metadata:
-      labels:
-        app: {{ template "reposerver-name" . }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-        release: "{{ .Release.Name }}"
-        heritage: "{{ .Release.Service }}"
-    spec:
-      serviceAccountName: {{ template "fullname" . }}
-      containers:
-      - name: {{ .Chart.Name }}
-        image: "{{ .Values.global.containerRegistry.path }}/{{ .Values.global.helm_broker.dir }}helm-broker-reposerver:{{ .Values.global.helm_broker.version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-
-        volumeMounts:
-        - mountPath: /data
-          name: bundle-repository
-
-        ports:
-        - containerPort: 8080
-        # Temporary solution for readiness probe
-        # Ref: https://github.com/istio/istio/issues/2628
-        readinessProbe:
-          exec:
-            command:
-              - curl
-              - localhost:{{ .Values.embeddedRepository.service.internalPort }}/index.yaml
-          failureThreshold: 3
-          initialDelaySeconds: 10
-          periodSeconds: 3
-          successThreshold: 1
-          timeoutSeconds: 2
-        livenessProbe:
-          exec:
-            command:
-              - curl
-              - localhost:{{ .Values.embeddedRepository.service.internalPort }}/index.yaml
-          periodSeconds: 10
-          timeoutSeconds: 2
-          successThreshold: 1
-
-      volumes:
-      - name: tmp-empty-dir
-        emptyDir:
-          medium: "Memory" # mount a tmpfs (RAM-backed filesystem). Default emptyDir volumes are stored on whatever medium is backing the node - that might be disk or SSD or network storage, depending on your environment.
-      - name: config-volume
-        configMap:
-          name: helm-config-map
-      - name: bundle-repository
-        persistentVolumeClaim:
-          claimName: {{ .Values.bundlesStorage.claimName }}
-{{ end }}