Merge pull request #574 from nataliasitko/apirule-update

Update commerce mock APIRule

Author: nataliasitko

commerce-mock-lite/README.md

@@ -1,8 +1,8 @@
 # Light Commerce Mock
 
-The light commerce mock emulates SAP Commerce Cloud on base of a reduced event and API catalog. It uses the **varkes-api-server** to connect to `SAP Business Technology Platform, Kyma Runtime` and register the bundled commerce APIs, which are also mocked using the **varkes-openapi-mock**. For the list of mocked APIs, see [`varkes_config.json`](varkes_config.json).
+The light commerce mock emulates SAP Commerce Cloud on base of a reduced event and API catalog. It uses the **varkes-api-server** to connect to SAP BTP, Kyma runtime and register the bundled commerce APIs, which are also mocked using the **varkes-openapi-mock**. For the list of mocked APIs, see [`varkes_config.json`](varkes_config.json).
 
-## Run locally using Docker
+## Run Commerce Mock Locally Using Docker
 
 To run the mock locally, run:
 
@@ -14,7 +14,7 @@ docker run -d \
   ghcr.io/sap-samples/xf-application-mocks/commerce-mock-lite:latest
 ```
 
-### Access the mock locally
+### Access Commerce Mock Locally
 
 * For the API to pair the mock, see `http://localhost:10000/console`
 * For mocked APIs, see:
@@ -24,40 +24,53 @@ docker run -d \
   * `http://localhost:10000/couponwebservices/console`
   * `http://localhost:10000/warehousingwebservices/console`
 
-## Run mock using `SAP Business Technology Platform, Kyma Runtime`
+## Run Commerce Mock Using SAP BTP, Kyma Runtime
 
 To run the mock using `SAP Business Technology Platform, Kyma Runtime` as a runtime environment, perform the following steps:
 
-1. Set up the Namespace:
+1. Set up the namespace:
 
 ```bash
 kubectl create namespace mocks
+kubectl label namespace mocks istio-injection=enabled --overwrite
 ```
 
 2. Deploy the mock:
 
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/SAP/xf-application-mocks/main/commerce-mock-lite/deployment/k8s.yaml -n mocks
-kubectl apply -f https://raw.githubusercontent.com/SAP/xf-application-mocks/main/commerce-mock-lite/deployment/kyma.yaml -n mocks
+kubectl apply -f https://raw.githubusercontent.com/SAP-samples/kyma-runtime-samples/main/commerce-mock-lite/deployment/k8s.yaml -n mocks
+kubectl apply -f https://raw.githubusercontent.com/SAP-samples/kyma-runtime-samples/main/commerce-mock-lite/deployment/kyma.yaml -n mocks
 ```
 
 These commands expose the API of the mock via an `APIRule` resource and makes it accessible at `https://commerce-lite.{yourDomain}`.
 
-## Run mock on Kubernetes
+## Run Commerce Mock on Kubernetes
 
-1. Set up the Namespace:
+1. Add the Istio and API Gateway modules:
+
+```bash
+kubectl create ns kyma-system
+kubectl label namespace kyma-system istio-injection=enabled --overwrite
+kubectl apply -f https://github.com/kyma-project/istio/releases/latest/download/istio-manager.yaml
+kubectl apply -f https://github.com/kyma-project/istio/releases/latest/download/istio-default-cr.yaml
+kubectl apply -f https://github.com/kyma-project/api-gateway/releases/latest/download/api-gateway-manager.yaml
+kubectl apply -f https://github.com/kyma-project/api-gateway/releases/latest/download/apigateway-default-cr.yaml
+```
+
+2. Set up the namespace:
 
 ```bash
 kubectl create namespace mocks
+kubectl label namespace mocks istio-injection=enabled --overwrite
 ```
 
 2. Deploy the mock:
 
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/SAP/xf-application-mocks/main/commerce-mock-lite/deployment/k8s.yaml -n mocks
+kubectl apply -f https://raw.githubusercontent.com/SAP-samples/kyma-runtime-samples/main/commerce-mock-lite/deployment/k8s.yaml -n mocks
 ```
 
-This command deploys a `Service` of a ClusterIP type. You need to expose it manually using any Ingress type.
+This command deploys a Service of a `ClusterIP` type. You need to expose it manually using any Ingress type.
 
 ## Development
 

commerce-mock-lite/deployment/kyma.yaml

@@ -1,17 +1,17 @@
-apiVersion: gateway.kyma-project.io/v1alpha1
+apiVersion: gateway.kyma-project.io/v2
 kind: APIRule
 metadata:
   labels:
     app: commerce-mock-lite
   name: commerce-mock-lite
 spec:
-  gateway: kyma-gateway.kyma-system.svc.cluster.local
+  hosts:
+    - commerce-lite
   service:
     name: commerce-mock-lite
     port: 10000
-    host: commerce-lite
+  gateway: kyma-system/kyma-gateway
   rules:
-    - path: /.*
+    - path: /*
       methods: ["GET","POST","PUT","DELETE","HEAD"]
-      accessStrategies:
-        - handler: allow
+      noAuth: true

commerce-mock/README.md

@@ -1,8 +1,8 @@
 # Commerce Mock
 
-The commerce mock emulates SAP Commerce Cloud. It uses the **varkes-api-server** to connect to `SAP Business Technology Platform, Kyma Runtime` and register the bundled commerce APIs, which are also mocked using the **varkes-openapi-mock**. For the list of mocked APIs, see [`varkes_config.json`](varkes_config.json).
+The commerce mock emulates SAP Commerce Cloud. It uses the **varkes-api-server** to connect to SAP BTP, Kyma runtime and register the bundled commerce APIs, which are also mocked using the **varkes-openapi-mock**. For the list of mocked APIs, see [`varkes_config.json`](varkes_config.json).
 
-## Run locally using Docker
+## Run Commerce Mock Locally Using Docker
 
 To run the mock locally, run:
 
@@ -14,7 +14,7 @@ docker run -d \
   ghcr.io/sap-samples/xf-application-mocks/commerce-mock:latest
 ```
 
-### Access the mock locally
+### Access Commerce Mock Locally
 
 * For mock UI, see `http://localhost:10000`
 * For the API to pair the mock, see `http://localhost:10000/console`
@@ -25,40 +25,54 @@ docker run -d \
   * `http://localhost:10000/couponwebservices/console`
   * `http://localhost:10000/warehousingwebservices/console`
 
-## Run mock using `SAP Business Technology Platform, Kyma Runtime`
+## Run Commerce Mock Using SAP BTP, Kyma Runtime
 
 To run the mock using `SAP Business Technology Platform, Kyma Runtime` as a runtime environment, perform the following steps:
 
 1. Set up the Namespace:
 
 ```bash
 kubectl create namespace mocks
+kubectl label namespace mocks istio-injection=enabled --overwrite
 ```
 
 2. Deploy the mock:
 
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/SAP/xf-application-mocks/main/commerce-mock/deployment/k8s.yaml -n mocks
-kubectl apply -f https://raw.githubusercontent.com/SAP/xf-application-mocks/main/commerce-mock/deployment/kyma.yaml -n mocks
+kubectl apply -f https://raw.githubusercontent.com/SAP-samples/kyma-runtime-samples/main/commerce-mock/deployment/k8s.yaml -n mocks
+kubectl apply -f https://raw.githubusercontent.com/SAP-samples/kyma-runtime-samples/main/commerce-mock/deployment/kyma.yaml -n mocks
 ```
 
 These commands expose the UI and API of the mock via an `APIRule` resource and makes the UI accessible at `https://commerce.{yourDomain}`.
 
-## Run mock on Kubernetes
+## Run Commerce Mock on Kubernetes
 
-1. Set up the Namespace:
+
+1. Add the Istio and API Gateway modules:
+
+```bash
+kubectl create ns kyma-system
+kubectl label namespace kyma-system istio-injection=enabled --overwrite
+kubectl apply -f https://github.com/kyma-project/istio/releases/latest/download/istio-manager.yaml
+kubectl apply -f https://github.com/kyma-project/istio/releases/latest/download/istio-default-cr.yaml
+kubectl apply -f https://github.com/kyma-project/api-gateway/releases/latest/download/api-gateway-manager.yaml
+kubectl apply -f https://github.com/kyma-project/api-gateway/releases/latest/download/apigateway-default-cr.yaml
+```
+
+2. Set up the namespace:
 
 ```bash
 kubectl create namespace mocks
+kubectl label namespace mocks istio-injection=enabled --overwrite
 ```
 
 2. Deploy the mock:
 
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/SAP/xf-application-mocks/main/commerce-mock/deployment/k8s.yaml -n mocks
+kubectl apply -f https://raw.githubusercontent.com/SAP-samples/kyma-runtime-samples/main/commerce-mock/deployment/k8s.yaml -n mocks
 ```
 
-This command deploys a `Service` of a ClusterIP type. You need to expose it manually using any Ingress type.
+This command deploys a Service of a `ClusterIP` type. You need to expose it manually using any Ingress type.
 
 ## Development
 

commerce-mock/deployment/kyma.yaml

@@ -1,17 +1,17 @@
-apiVersion: gateway.kyma-project.io/v1alpha1
+apiVersion: gateway.kyma-project.io/v2
 kind: APIRule
 metadata:
   labels:
     app: commerce-mock
   name: commerce-mock
 spec:
-  gateway: kyma-gateway.kyma-system.svc.cluster.local
+  hosts:
+    - commerce
   service:
     name: commerce-mock
     port: 10000
-    host: commerce
+  gateway: kyma-system/kyma-gateway
   rules:
-    - path: /.*
+    - path: /*
       methods: ["GET","POST","PUT","DELETE","HEAD"]
-      accessStrategies:
-        - handler: allow
+      noAuth: true