Replace K8S service catalog by SAP BTP service operator

SAP · May 20, 2022 · a27e042 · a27e042
1 parent 2ca467f
commit a27e042
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 261 deletions.
diff --git a/charts/base-cloud/charts/base-crds-0.1.0.tgz b/charts/base-cloud/charts/base-crds-0.1.0.tgz
diff --git a/charts/base-cloud/templates/app-management.yaml b/charts/base-cloud/templates/app-management.yaml
@@ -26,7 +26,7 @@ spec:
           registry={{ .Values.registry }},\
           public_registry={{ .Values.public_registry }},\
           deploy_environment={{ .Values.deploy_environment }},\
-          k8s_service_catalog={{ .Values.k8s_service_catalog }},\
+          sap_btp_service_operator={{ .Values.sap_btp_service_operator }},\
           use_istio=true,\
           certificate_authority.crt={{ .Values.certificate_authority.crt }},\
           images.http_relay_client={{ .Values.images.http_relay_client }},\

diff --git a/charts/base-cloud/values.yaml b/charts/base-cloud/values.yaml
@@ -4,7 +4,7 @@ deploy_environment: "choose one of those GCP/Azure/AWS depending on kyma.cluster
 registry: "ghcr.io/sap/cloud-robotics"
 public_registry: "true"
 
-k8s_service_catalog: "false"
+sap_btp_service_operator: "false"
 
 default_gateway: kyma-system/kyma-gateway
 tenant_specific_gateways: "false"

diff --git a/charts/base-robot/charts/base-crds-0.1.0.tgz b/charts/base-robot/charts/base-crds-0.1.0.tgz
diff --git a/charts/log-settings-override-cloud/.helmignore b/charts/log-settings-override-cloud/.helmignore
diff --git a/charts/log-settings-override-cloud/Chart.yaml b/charts/log-settings-override-cloud/Chart.yaml
diff --git a/charts/log-settings-override-cloud/templates/fluent-bit-overrides.yaml b/charts/log-settings-override-cloud/templates/fluent-bit-overrides.yaml
diff --git a/charts/log-settings-override-cloud/templates/istio-mesh-overrides.yaml b/charts/log-settings-override-cloud/templates/istio-mesh-overrides.yaml
diff --git a/charts/log-settings-override-cloud/values.yaml b/charts/log-settings-override-cloud/values.yaml
diff --git a/charts/platform-apps/subcharts-packaged/k8s-relay-cloud-0.1.0.tgz b/charts/platform-apps/subcharts-packaged/k8s-relay-cloud-0.1.0.tgz
diff --git a/charts/platform-apps/subcharts-packaged/k8s-relay-robot-0.1.0.tgz b/charts/platform-apps/subcharts-packaged/k8s-relay-robot-0.1.0.tgz
diff --git a/charts/platform-apps/subcharts-packaged/prometheus-cloud-0.1.0.tgz b/charts/platform-apps/subcharts-packaged/prometheus-cloud-0.1.0.tgz
diff --git a/charts/platform-apps/subcharts-packaged/prometheus-robot-0.1.0.tgz b/charts/platform-apps/subcharts-packaged/prometheus-robot-0.1.0.tgz
diff --git a/charts/platform-apps/subcharts/k8s-relay-cloud/templates/app-router-config.yaml b/charts/platform-apps/subcharts/k8s-relay-cloud/templates/app-router-config.yaml
@@ -1,4 +1,4 @@
-{{ if eq .Values.k8s_service_catalog "true" }}
+{{ if eq .Values.sap_btp_service_operator "true" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/platform-apps/subcharts/k8s-relay-cloud/templates/app-router.yaml b/charts/platform-apps/subcharts/k8s-relay-cloud/templates/app-router.yaml
@@ -1,13 +1,11 @@
-{{ if eq .Values.k8s_service_catalog "true" }}
-apiVersion: servicecatalog.k8s.io/v1beta1
+{{ if eq .Values.sap_btp_service_operator "true" }}
+apiVersion: services.cloud.sap.com/v1alpha1
 kind: ServiceInstance
 metadata:
   name: xsuaa-kubernetes-relay
 spec:
-  clusterServiceClassExternalName: xsuaa
-  clusterServiceClassRef:
-    name: xsuaa
-  clusterServicePlanExternalName: application
+  serviceOfferingName: xsuaa
+  servicePlanName: application
   parameters:
     oauth2-configuration:
       redirect-uris:
@@ -27,15 +25,15 @@ spec:
       name: $XSAPPNAME.Edit
     xsappname: kubernetes-relay-{{ .Values.tenant }}
 ---
-apiVersion: servicecatalog.k8s.io/v1beta1
+apiVersion: services.cloud.sap.com/v1alpha1
 kind: ServiceBinding
 metadata:
   name: xsuaa-app-auth-proxy-bind
   labels:
     app: app-auth-proxy
 spec:
-  instanceRef:
-    name: kubernetes-relay-{{ .Values.tenant }}
+  secretName: xsuaa-app-auth-proxy-bind
+  serviceInstanceName: kubernetes-relay-{{ .Values.tenant }}
 ---
 apiVersion: servicecatalog.kyma-project.io/v1alpha1
 kind: ServiceBindingUsage

diff --git a/charts/platform-apps/subcharts/k8s-relay-cloud/templates/virtual-service.yaml b/charts/platform-apps/subcharts/k8s-relay-cloud/templates/virtual-service.yaml
@@ -17,7 +17,7 @@ subjects:
 - kind: ServiceAccount
   name: k8s-relay
   namespace: {{ .Release.Namespace }}
-{{ if eq .Values.k8s_service_catalog "true" }}
+{{ if eq .Values.sap_btp_service_operator "true" }}
 ---
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService

diff --git a/charts/platform-apps/subcharts/k8s-relay-cloud/values.yaml b/charts/platform-apps/subcharts/k8s-relay-cloud/values.yaml
@@ -1,7 +1,7 @@
 domain: "...ondemand.com"
 deploy_environment: "choose one of those GCP/Azure/AWS depending on kyma.cluster"
 registry: "ghcr.io/sap/cloud-robotics"
-k8s_service_catalog: "false"
+sap_btp_service_operator: "false"
 tenant_gateway: kyma-system/kyma-gateway
 
 images:

diff --git a/charts/platform-apps/subcharts/prometheus-cloud/templates/app-router-config.yaml b/charts/platform-apps/subcharts/prometheus-cloud/templates/app-router-config.yaml
@@ -1,4 +1,4 @@
-{{ if eq .Values.k8s_service_catalog "true" }}
+{{ if eq .Values.sap_btp_service_operator "true" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/platform-apps/subcharts/prometheus-cloud/templates/app-router.yaml b/charts/platform-apps/subcharts/prometheus-cloud/templates/app-router.yaml
@@ -1,13 +1,11 @@
-{{ if eq .Values.k8s_service_catalog "true" }}
-apiVersion: servicecatalog.k8s.io/v1beta1
+{{ if eq .Values.sap_btp_service_operator "true" }}
+apiVersion: services.cloud.sap.com/v1alpha1
 kind: ServiceInstance
 metadata:
   name: xsuaa-prometheus-{{ .Values.tenant }}
 spec:
-  clusterServiceClassExternalName: xsuaa
-  clusterServiceClassRef:
-    name: xsuaa
-  clusterServicePlanExternalName: application
+  serviceOfferingName: xsuaa
+  servicePlanName: application
   parameters:
     oauth2-configuration:
       redirect-uris:
@@ -23,15 +21,15 @@ spec:
       name: $XSAPPNAME.Edit
     xsappname: prometheus-{{ .Values.tenant }}
 ---
-apiVersion: servicecatalog.k8s.io/v1beta1
+apiVersion: services.cloud.sap.com/v1alpha1
 kind: ServiceBinding
 metadata:
   name: xsuaa-app-auth-proxy-bind
   labels:
     app: app-auth-proxy
 spec:
-  instanceRef:
-    name: xsuaa-prometheus-{{ .Values.tenant }}
+  secretName: xsuaa-app-auth-proxy-bind
+  serviceInstanceName: xsuaa-prometheus-{{ .Values.tenant }}
 ---
 apiVersion: servicecatalog.kyma-project.io/v1alpha1
 kind: ServiceBindingUsage

diff --git a/charts/platform-apps/subcharts/prometheus-cloud/templates/prometheus-virtual-service.yaml b/charts/platform-apps/subcharts/prometheus-cloud/templates/prometheus-virtual-service.yaml
@@ -19,7 +19,7 @@ spec:
         port:
           number: 80
         host: prometheus-relay-server
-{{ if eq .Values.k8s_service_catalog "true" }}
+{{ if eq .Values.sap_btp_service_operator "true" }}
   - name: prometheus
     match:
     - uri:

diff --git a/charts/platform-apps/subcharts/prometheus-cloud/values.yaml b/charts/platform-apps/subcharts/prometheus-cloud/values.yaml
@@ -2,7 +2,7 @@ domain: "...ondemand.com"
 deploy_environment: "choose one of those GCP/Azure/AWS depending on kyma.cluster"
 registry: "ghcr.io/sap/cloud-robotics"
 robots: []
-k8s_service_catalog: "false"
+sap_btp_service_operator: "false"
 tenant_gateway: kyma-system/kyma-gateway
 tenant: "default"
 tenant_domain: "tenant.local"

diff --git a/charts/setup-cloud/templates/cloud-logging-instance.yaml b/charts/setup-cloud/templates/cloud-logging-instance.yaml
@@ -1,20 +1,19 @@
 {{ if eq .Values.cloud_logging "true" }}
-apiVersion: servicecatalog.k8s.io/v1beta1
+apiVersion: services.cloud.sap.com/v1alpha1
 kind: ServiceInstance
 metadata:
   name: cloud-logging-core
 spec:
-  clusterServiceClassExternalName: cloud-logging
-  clusterServicePlanExternalName: standard
+  serviceOfferingName: cloud-logging
+  servicePlanName: standard
   parameters: {}
 ---
-apiVersion: servicecatalog.k8s.io/v1beta1
+apiVersion: services.cloud.sap.com/v1alpha1
 kind: ServiceBinding
 metadata:
   name: cloud-logging-core
 spec:
-  instanceRef:
-    name: cloud-logging-core
-  parameters: {}
   secretName: cloud-logging-core
+  serviceInstanceName: cloud-logging-core
+  parameters: {}
 {{ end }}
diff --git a/charts/setup-cloud/templates/cloud-robotics-core-config.yaml b/charts/setup-cloud/templates/cloud-robotics-core-config.yaml
@@ -12,4 +12,4 @@ data:
     stackdriver_logging: "{{ .Values.stackdriver_logging }}"
     default_gateway: "{{ .Values.default_gateway }}"
     k8s_gateway_tls: "{{ .Values.k8s_gateway_tls }}"
-    k8s_service_catalog: "{{ .Values.k8s_service_catalog }}"
+    sap_btp_service_operator: "{{ .Values.sap_btp_service_operator }}"
diff --git a/charts/setup-cloud/values.yaml b/charts/setup-cloud/values.yaml
@@ -7,4 +7,4 @@ cloud_logging: "false"
 stackdriver_logging: "false"
 default_gateway: kyma-system/kyma-gateway
 k8s_gateway_tls: kyma-gateway-certs
-k8s_service_catalog: "false"
+sap_btp_service_operator: "false"
diff --git a/scripts/common.sh b/scripts/common.sh
@@ -85,7 +85,7 @@ function get_cluster_config {
   stackdriver_logging=$(kc get configmap -n $ns $core_config_map -o=go-template --template='{{index .data "stackdriver_logging"}}')
   default_gateway=$(kc get configmap -n $ns $core_config_map -o=go-template --template='{{index .data "default_gateway"}}')
   k8s_gateway_tls=$(kc get configmap -n $ns $core_config_map -o=go-template --template='{{index .data "k8s_gateway_tls"}}')
-  k8s_service_catalog=$(kc get configmap -n $ns $core_config_map -o=go-template --template='{{index .data "k8s_service_catalog"}}')
+  sap_btp_service_operator=$(kc get configmap -n $ns $core_config_map -o=go-template --template='{{index .data "sap_btp_service_operator"}}')
   echo "Cluster config received"
 
   if ! kc get secret -n $ns cluster-authority &>/dev/null; then