diff --git a/README.md b/README.md index b1603d1..3bce1d8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# webMethods API Control Plane +# IBM webMethods API Control Plane APIs are everywhere. API Management is where APIs are. It’s all distributed and heterogeneous. Management and administration becomes harder. API Management technology should blend in into the rest of the infrastructure and be managed from one place. API Control Plane is a single solution for understanding, managing and controlling the entire API Management landscape, whether it's self-hosted, in private clouds, in a public cloud, or a hybrid combination of any of these. Assets in the API Control Plane are organized across: @@ -8,7 +8,7 @@ APIs are everywhere. API Management is where APIs are. It’s all distributed an ![image](/attachments/apicp_dashboard_page.png) -This repository hosts assets documenting how to deploy and run webMethods API Control Plane as a container, articles and tutorials, public API docs and Postman collections. Please see the official documentation for [cloud](https://docs.webmethods.io/apicontrolplane/welcome/home/#gsc.tab=0) or [self-hosted](https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/) for how to use the product and system requirements. +This repository hosts assets documenting how to deploy and run IBM webMethods API Control Plane as a container, articles and tutorials, public API docs and Postman collections. Please see the official documentation for [cloud](https://docs.webmethods.io/apicontrolplane/welcome/home/#gsc.tab=0) or [self-hosted](https://docs.webmethods.io/on-premises/webmethods-api-control-plane) for how to use the product and system requirements. ## Deploying API Control Plane @@ -48,7 +48,7 @@ We also host various articles related to API Control Plane deployment, use, admi 📘 Official Documentation -For the most up-to-date information about the product, see the official documentation for [cloud](https://docs.webmethods.io/apicontrolplane/welcome/home/#gsc.tab=0) or [self-hosted](https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/) +For the most up-to-date information about the product, see the official documentation for [cloud](https://docs.webmethods.io/saas/webmethods-api-control-plane#gsc.tab=0) or [self-hosted](https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html) 💻 Explore the Knowledge Base diff --git a/apis/README.md b/apis/README.md index c85d1f2..a878e02 100644 --- a/apis/README.md +++ b/apis/README.md @@ -1,5 +1,3 @@ API Collections of API Control Plane ============================================== -This folder contains API Control Plane OpenAPI specifications and postman collections. - - +This folder contains API Control Plane OpenAPI specifications and postman collections. \ No newline at end of file diff --git a/apis/openapi-specifications/license-management.yaml b/apis/openapi-specifications/license-management.yaml index e6d99e8..2b349da 100644 --- a/apis/openapi-specifications/license-management.yaml +++ b/apis/openapi-specifications/license-management.yaml @@ -71,7 +71,7 @@ paths: licenseType: TEN serialNumber: 0000037081 licenseKey: admin - customerName: SoftwareAGInternal + customerName: WebmethodsInternal expirationDate: 2024-08-18T23:59:59.218+00:00 licenseQuantity: 1000 freeLicenseQuantity: 1000 @@ -86,7 +86,7 @@ paths: licenseType: TEN serialNumber: 0000037345 licenseKey: admin - customerName: SoftwareAGInternal + customerName: WebmethodsInternal expirationDate: 2024-08-18T23:59:59.218+00:00 licenseQuantity: 1000 freeLicenseQuantity: 1000 @@ -129,7 +129,7 @@ paths: licenseType: TEN serialNumber: 0000037081 licenseKey: admin - customerName: SoftwareAGInternal + customerName: WebmethodsInternal expirationDate: 2024-08-18T23:59:59.218+00:00 licenseQuantity: 1000 freeLicenseQuantity: 1000 @@ -228,7 +228,7 @@ components: customerName: description: Name of the customer. type: string - example: SoftwareAGInternal + example: WebmethodsInternal expirationDate: description: Date of expiry of license. type: string diff --git a/apis/openapi-specifications/runtime-management.yaml b/apis/openapi-specifications/runtime-management.yaml index bf4e94f..d2cc698 100644 --- a/apis/openapi-specifications/runtime-management.yaml +++ b/apis/openapi-specifications/runtime-management.yaml @@ -735,7 +735,7 @@ components: type: string description: The hostname or IP address of the runtime pattern: '((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)(\.(?!$)|$)){4}' - example: softwareag.com + example: ibm.com icon: type: string description: The icon of the runtime. diff --git a/articles/documentation/README.md b/articles/documentation/README.md index 96ba395..b572638 100644 --- a/articles/documentation/README.md +++ b/articles/documentation/README.md @@ -1,3 +1,3 @@ # Product documentation -Please see the official documentation for [cloud](https://docs.webmethods.io/apicontrolplane/welcome/home/#gsc.tab=0) or [self-hosted](https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/) for how to use the product and system requirements. +Please see the official documentation for [cloud](https://docs.webmethods.io/saas/webmethods-api-control-plane) or [self-hosted](https://docs.webmethods.io/on-premises/webmethods-api-control-plane) for how to use the product and system requirements. diff --git a/articles/life-cycle/README.md b/articles/life-cycle/README.md index 9c91099..651826e 100644 --- a/articles/life-cycle/README.md +++ b/articles/life-cycle/README.md @@ -2,7 +2,7 @@ This section serves as a comprehensive guide for understanding the life cycle of API Control Plane. -1. What is webMethods API Control Plane? +1. What is IBM webMethods API Control Plane? API Control Plane is a centralized control and monitoring system that oversees and manages multiple runtimes such as API Gateway, Developer Portal, Microgateway, and other runtimes deployed across multiple regions including cloud and on-premises environments. With API Control Plane, you can achieve comprehensive real-time monitoring, leveraging advanced analytics, and customizable dashboards to gain valuable @@ -71,38 +71,37 @@ This section serves as a comprehensive guide for understanding the life cycle of API Control Plane can be deployed using: - - Docker: For details, see https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fta-deploy_standalone_apicp_docker.html + - Docker: For details, see https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html - - Helm: For details, see https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fta-deploy_standalone_apicp_helm.html + - Helm: For details, see https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2Fta-deploy_standalone_apicp_docker.html

14. How to connect API Gateway with API Control Plane? - To connect API Control Plane using API Gateway UI, see https://documentation.softwareag.com/webmethods/api_gateway/yai10-15/webhelp/yai-webhelp/#page/yai-webhelp%2Fgtw_configure_gateway.html%23 + To connect API Control Plane using API Gateway, see https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2Fco-connecting-apigw.html - To connect API Control Plane using properties or YAML file, see https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fco-connecting-apigw.html

15. What are the hardware and product configuration guidelines that are required to deploy API Control Plane to run at an optimal scale? - For details, see https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fre-resourcing_guidelines.html + For details, see https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2Fre-resourcing_guidelines.html

16. How to manage data backups/snapshot to ensure data resiliency and disaster recovery? - For details, see https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fco-snapshot_management.html + For details, see https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2Fco-snapshot_management.html

17. Does API Control Plane provide REST endpoints to monitor the health and resource utilization of the microservices and Elastic search? - Yes. For details about how to monitor microservices health and resource utilization, see https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fco-microservices_application_level.html%23 + Yes. For details about how to monitor microservices health and resource utilization, see https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2Fco-microservices_application_level.html - For details about how to monitor Elastic search health and resource utilization, see https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fco-elasticsearch_monitoring.html%23 + For details about how to monitor Elastic search health and resource utilization, see https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2Fco-elasticsearch_monitoring.html

18. List the Prometheus metrics to analyze API Control Plane health. - For details, see https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fco-collect_microservices_metrics.html + For details, see https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2Fco-collect_microservices_metrics.html

19. Is Open telemetry supported for tracing? Yes. To deploy API Control Plane enabling Open Telemetry using Jaeger UI with Docker, perform *step 5* mentioned in - https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fta-deploy_standalone_apicp_docker.html + https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2Fco-collect_microservices_metrics.html

20. How do I report an incident? @@ -110,5 +109,5 @@ This section serves as a comprehensive guide for understanding the life cycle of ## References -* Official On-prem documentation link: https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fto-landing_page.html -* Official Cloud documentation link: https://docs.webmethods.io/apicontrolplane/welcome/home/#gsc.tab=0 +* Official On-prem documentation link: https://docs.webmethods.io/on-premises/webmethods-api-control-plane +* Official Cloud documentation link: https://docs.webmethods.io/saas/webmethods-api-control-plane diff --git a/deployment/agent/README.md b/deployment/agent/README.md index 9e9b066..a34b1f7 100644 --- a/deployment/agent/README.md +++ b/deployment/agent/README.md @@ -10,5 +10,5 @@ Runtime communicate with API Control Plane with the help of an Agent. Here, we h # Agent SDK We also provide a Java based agent SDK that can be used to develop a Java application that fetches runtime details and metrics -information from any runtime and send to the API Control Plane. A detailed document is available [here](https://documentation.softwareag.com/wco/11.0.0/en/webhelp/wco-webhelp/#page/wco-webhelp%2Fco-agent_sdk.html). +information from any runtime and send to the API Control Plane. A detailed document is available [here](https://docs.webmethods.io/on-premises/webmethods-api-control-plane/11.1.0/webhelp/index.html#page/wco-webhelp%2F_api_cp_webhelp_new.1.138.html). information from any runtime and send to the API Control Plane. It can be downloaded from Download Components section on [Software AG Empower Portal](https://empower.softwareag.com/). diff --git a/deployment/agent/webmethods-api-gateway/.env b/deployment/agent/webmethods-api-gateway/.env index 96f7a46..cfe5c46 100644 --- a/deployment/agent/webmethods-api-gateway/.env +++ b/deployment/agent/webmethods-api-gateway/.env @@ -1,8 +1,8 @@ -GATEWAY_IMAGE=sagcr.azurecr.io/apigateway:10.15.0.11 +GATEWAY_IMAGE=cp.icr.io/api-management/apigateway-lean:11.1.0.0.866 GATEWAY_PORT=5555 -ELASTICSEARCH_IMAGE= "docker.elastic.co/elasticsearch/elasticsearch:8.2.3" +ELASTICSEARCH_IMAGE= "docker.elastic.co/elasticsearch/elasticsearch:8.12.2" RUNTIME_NAME=agent-spectre_MyAgent diff --git a/deployment/docker/.env b/deployment/docker/.env index 0e54a6f..cd2b47f 100644 --- a/deployment/docker/.env +++ b/deployment/docker/.env @@ -6,11 +6,11 @@ ASSETCATALOG_PUBLISH_PORT=8081 ELASTICSEARCH_PUBLISH_PORT=9200 # Images -INGRESS_IMAGE="sagcr.azurecr.io/controlplane-ingress:11.0" -UI_IMAGE="sagcr.azurecr.io/controlplane-ui:11.0" -ENGINE_IMAGE="sagcr.azurecr.io/controlplane-engine:11.0" -ASSETCATALOG_IMAGE="sagcr.azurecr.io/controlplane-assetcatalog:11.0" -ELASTICSEARCH_IMAGE="docker.elastic.co/elasticsearch/elasticsearch:8.1.1" +INGRESS_IMAGE="cp.icr.io/cp/webmethods/api/api-control-plane-ingress:11.1.2" +UI_IMAGE="cp.icr.io/cp/webmethods/api/api-control-plane-ui:11.1.2" +ENGINE_IMAGE="cp.icr.io/cp/webmethods/api/api-control-plane-engine:11.1.2" +ASSETCATALOG_IMAGE="cp.icr.io/cp/webmethods/api/api-control-plane-assetcatalog:11.1.2" +ELASTICSEARCH_IMAGE="docker.elastic.co/elasticsearch/elasticsearch:8.14.3" # Elasticsearch config ELASTICSEARCH_HOST="elasticsearch" @@ -40,6 +40,6 @@ SERVER_SSL_KEY_ALIAS=softwareag SERVER_SSL_KEY_PASSWORD=softwareagkeys SERVER_SSL_KEY_STORE_PASSWORD=softwareag SERVER_SSL_KEY_STORE_TYPE=JKS -SERVER_SSL_KEY_STORE=file:/opt/softwareag/certs/softwareag_not_for_production.jks +SERVER_SSL_KEY_STORE=file:/opt/softwareag/certs/webmethods_not_for_production.jks LICENSE_FILE_NAME=my_cp_license.xml \ No newline at end of file diff --git a/deployment/docker/README.md b/deployment/docker/README.md index 970fe8e..274e92a 100644 --- a/deployment/docker/README.md +++ b/deployment/docker/README.md @@ -16,9 +16,9 @@ The standard deployment of API Control plane contains the following 5 microservi Table of contents 1. [Prerequisite](#Prerequisite) -2. [How to deploy webMethods API Control Plane using docker compose?](#how-to-deploy-webmethods-api-control-plane-using-docker-compose) -3. [How to stop webMethods API Control Plane using docker compose?](#how-to-stop-webmethods-api-control-plane-using-docker-compose) -4. [How to access the newly deployed webMethods API Control Plane?](#how-to-access-the-newly-deployed-webmethods-api-control-plane) +2. [How to deploy IBM webMethods API Control Plane using docker compose?](#how-to-deploy-webmethods-api-control-plane-using-docker-compose) +3. [How to stop IBM webMethods API Control Plane using docker compose?](#how-to-stop-webmethods-api-control-plane-using-docker-compose) +4. [How to access the newly deployed IBM webMethods API Control Plane?](#how-to-access-the-newly-deployed-webmethods-api-control-plane) 5. [Additional deployment flavors](#additional-deployment-flavors) *** @@ -30,29 +30,15 @@ The machine needs following to install the control plane using docker. *** -## How to deploy webMethods API Control Plane using docker compose? +## How to deploy IBM webMethods API Control Plane using docker compose? -1. Clone this repository +1. Refer https://docs.webmethods.io/on-premises/webmethods-api-control-plane/en/11.1.0/webhelp/index.html#page/wco-webhelp%2Fco-deploy_standalone_apicp.html to set up docker environment for IBM container registry. -2. Login to https://containers.softwareag.com/ - -3. Get a Personal Access Token (PAT) - - We published docker images for all API Control Plane microservice to https://containers.softwareag.com/ repository. To pull them or have docker compose pull them for you, you need a Personal Access token (PAT). To get a PAT, go to Userprofile > Settings > Generate password. Store Token Password securely. - -4. Log in to sagcr.azurecr.io docker repository - - Run the following command in your docker environment: - - ```bash - docker login -u [Your git username] -p [Your PAT] sagcr.azurecr.io - ``` - -5. Configure your deployment +2. Configure your deployment The `.env` file in [deployment/docker/.env](deployment/docker/.env) allows for configuring different aspects of API Control Plane deployment. To be able to access API Control Plane after it's deployed, you need to edit this file and provide a value for `NGINX_DOMAIN_NAME` that matches the hostname of the machine you're deploying API Control plane on. Make sure this hostname is accessible to whoever will be connecting to API Control Plane. -6. Execute the deployment scripts +3. Execute the deployment scripts To deploy the API Control Plane with default configuration: @@ -73,7 +59,7 @@ The machine needs following to install the control plane using docker. ```bash [user@somehost docker]$ docker-compose -f control-plane.yaml up -d [+] Running 8/8 - ⠿ Network softwareag-api-management Created 0.2s + ⠿ Network ibm-webmethods-api-management Created 0.2s ⠿ Container elasticsearch Healthy 22.6s ⠿ Container nginx_setup Started 1.5s ⠿ Container control-plane-asset-catalog Healthy 88.6s @@ -83,7 +69,7 @@ The machine needs following to install the control plane using docker. ⠿ Container nginx Started 151.2s ``` -7. Verify it's started +4. Verify it's started It will take a couple of minutes to start. You can monitor that with solutions like Portainer or Docker Dashboard etc. or simply user Docker CLI like this @@ -102,11 +88,11 @@ The machine needs following to install the control plane using docker. nginx Up About a minute (healthy) 0.0.0.0:81->80/tcp, :::81->80/tcp, 0.0.0.0:444->443/tcp, :::444->443/tcp elasticsearch Up About a minute (healthy) 0.0.0.0:9200->9200/tcp, :::9200->9200/tcp, 9300/tcp ``` - +> ###### [Back to Top](#api-control-plane-deployment-with-docker-compose) *** -## How to stop webMethods API Control Plane using docker compose? +## How to stop IBM webMethods API Control Plane using docker compose? To stop and remove the API Control Plane default configuration: @@ -134,13 +120,13 @@ If everything goes well, the output should be similar to this ⠿ Container control-plane-engine Removed 10.3s ⠿ Container control-plane-asset-catalog Removed 10.3s ⠿ Container elasticsearch Removed 2.6s -⠿ Network softwareag-api-management Removed 0.3s +⠿ Network ibm-webmethods-api-management Removed 0.3s ``` ###### [Back to Top](#api-control-plane-deployment-with-docker-compose) *** -## How to access the newly deployed webMethods API Control Plane? +## How to access the newly deployed IBM webMethods API Control Plane? 1. Open your browser and go to `https://[the-host-you-configured]:8080/` 2. You should see the login screen. Log in using Administrator username and the default password. diff --git a/deployment/docker/asset-catalog/asset-catalog.yaml b/deployment/docker/asset-catalog/asset-catalog.yaml index c23cc44..1cbf264 100644 --- a/deployment/docker/asset-catalog/asset-catalog.yaml +++ b/deployment/docker/asset-catalog/asset-catalog.yaml @@ -25,7 +25,7 @@ services: timeout: 10s retries: 5 networks: - - softwareag-api-management + - ibm-webmethods-api-management asset-catalog-debug: <<: *asset-catalog-service env_file: diff --git a/deployment/docker/control-plane-secure-es.yaml b/deployment/docker/control-plane-secure-es.yaml index c206fb3..4dd7501 100644 --- a/deployment/docker/control-plane-secure-es.yaml +++ b/deployment/docker/control-plane-secure-es.yaml @@ -51,6 +51,6 @@ volumes: networks: - softwareag-api-management: - name: softwareag-api-management + ibm-webmethods-api-management: + name: ibm-webmethods-api-management driver: bridge \ No newline at end of file diff --git a/deployment/docker/control-plane.debug.yaml b/deployment/docker/control-plane.debug.yaml index 1eaafc5..3a9f8f7 100644 --- a/deployment/docker/control-plane.debug.yaml +++ b/deployment/docker/control-plane.debug.yaml @@ -44,6 +44,6 @@ volumes: driver: local networks: - softwareag-api-management: - name: softwareag-api-management + ibm-webmethods-api-management: + name: ibm-webmethods-api-management driver: bridge \ No newline at end of file diff --git a/deployment/docker/control-plane.gainsight.yaml b/deployment/docker/control-plane.gainsight.yaml index 22f8e00..a99ffa4 100644 --- a/deployment/docker/control-plane.gainsight.yaml +++ b/deployment/docker/control-plane.gainsight.yaml @@ -40,6 +40,6 @@ volumes: driver: local networks: - softwareag-api-management: - name: softwareag-api-management + ibm-webmethods-api-management: + name: ibm-webmethods-api-management driver: bridge \ No newline at end of file diff --git a/deployment/docker/control-plane.yaml b/deployment/docker/control-plane.yaml index f26a6e5..a2a6006 100644 --- a/deployment/docker/control-plane.yaml +++ b/deployment/docker/control-plane.yaml @@ -44,6 +44,6 @@ volumes: driver: local networks: - softwareag-api-management: - name: softwareag-api-management + ibm-webmethods-api-management: + name: ibm-webmethods-api-management driver: bridge \ No newline at end of file diff --git a/deployment/docker/elasticsearch/elasticsearch-secure.yaml b/deployment/docker/elasticsearch/elasticsearch-secure.yaml index fb92a51..7cf84c3 100644 --- a/deployment/docker/elasticsearch/elasticsearch-secure.yaml +++ b/deployment/docker/elasticsearch/elasticsearch-secure.yaml @@ -13,8 +13,8 @@ services: - ${ELASTICSEARCH_PUBLISH_PORT}:9200 environment: - discovery.type=single-node - - node.name=softwareag - - cluster.name=softwareag + - node.name=webmethods + - cluster.name=webmethods - bootstrap.memory_lock=true - ELASTIC_PASSWORD=${ELASTICSEARCH_PASSWORD} - xpack.security.enabled=true @@ -47,7 +47,7 @@ services: - es-data:/usr/share/elasticsearch/data - es-certs:/usr/share/elasticsearch/config/certs networks: - - softwareag-api-management + - ibm-webmethods-api-management certificates_setup: container_name: elasticsearch-certs-generator @@ -94,4 +94,4 @@ services: timeout: 5s retries: 120 networks: - - softwareag-api-management \ No newline at end of file + - ibm-webmethods-api-management \ No newline at end of file diff --git a/deployment/docker/elasticsearch/elasticsearch.yaml b/deployment/docker/elasticsearch/elasticsearch.yaml index 8bfb42e..37a085b 100644 --- a/deployment/docker/elasticsearch/elasticsearch.yaml +++ b/deployment/docker/elasticsearch/elasticsearch.yaml @@ -18,8 +18,8 @@ services: environment: - xpack.security.enabled=false - discovery.type=single-node - - node.name=softwareag - - cluster.name=softwareag + - node.name=webmethods + - cluster.name=webmethods - bootstrap.memory_lock=true mem_limit: 1073741824 ulimits: @@ -34,4 +34,4 @@ services: volumes: - es-data:/usr/share/elasticsearch/data networks: - - softwareag-api-management + - ibm-webmethods-api-management diff --git a/deployment/docker/engine/engine.yaml b/deployment/docker/engine/engine.yaml index 78063db..fc145c1 100644 --- a/deployment/docker/engine/engine.yaml +++ b/deployment/docker/engine/engine.yaml @@ -25,7 +25,7 @@ services: timeout: 10s retries: 5 networks: - - softwareag-api-management + - ibm-webmethods-api-management engine-debug: <<: *engine-service env_file: diff --git a/deployment/docker/ingress/ingress.yaml b/deployment/docker/ingress/ingress.yaml index e2704f4..aa84f6f 100644 --- a/deployment/docker/ingress/ingress.yaml +++ b/deployment/docker/ingress/ingress.yaml @@ -31,7 +31,7 @@ services: timeout: 10s retries: 5 networks: - - softwareag-api-management + - ibm-webmethods-api-management volumes: - ../../license/${LICENSE_FILE_NAME}:/home/license/${LICENSE_FILE_NAME} diff --git a/deployment/docker/jaeger-tracing/jaeger-tracing.yaml b/deployment/docker/jaeger-tracing/jaeger-tracing.yaml index be22f92..802d7cd 100644 --- a/deployment/docker/jaeger-tracing/jaeger-tracing.yaml +++ b/deployment/docker/jaeger-tracing/jaeger-tracing.yaml @@ -20,4 +20,4 @@ services: timeout: 10s retries: 10 networks: - - softwareag-api-management \ No newline at end of file + - ibm-webmethods-api-management \ No newline at end of file diff --git a/deployment/docker/nginx/nginx.yaml b/deployment/docker/nginx/nginx.yaml index 33e3004..3f7d223 100644 --- a/deployment/docker/nginx/nginx.yaml +++ b/deployment/docker/nginx/nginx.yaml @@ -21,7 +21,7 @@ services: - conf.d:/etc/nginx/conf.d - nginx-certs:/etc/nginx/certs networks: - - softwareag-api-management + - ibm-webmethods-api-management nginx_setup: @@ -69,4 +69,4 @@ services: timeout: 5s retries: 120 networks: - - softwareag-api-management \ No newline at end of file + - ibm-webmethods-api-management \ No newline at end of file diff --git a/deployment/docker/ui/ui.yaml b/deployment/docker/ui/ui.yaml index 01ab116..54cd740 100644 --- a/deployment/docker/ui/ui.yaml +++ b/deployment/docker/ui/ui.yaml @@ -26,7 +26,7 @@ services: timeout: 10s retries: 5 networks: - - softwareag-api-management + - ibm-webmethods-api-management ui-debug: <<: *ui-service env_file: diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index 72bf4e0..3732f2a 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: control-plane-open-telemetry-enabled description: Chart for the Control Plane with open telemetry enabled -version: 0.0.1 \ No newline at end of file +version: 0.0.2 \ No newline at end of file diff --git a/deployment/helm/README.md b/deployment/helm/README.md index 5a592c0..3687fa1 100644 --- a/deployment/helm/README.md +++ b/deployment/helm/README.md @@ -17,9 +17,9 @@ The standard deployment of API Control plane contains the following 5 microservi Table of contents 1. [Prerequisite](#Prerequisite) -2. [How to deploy webMethods API Control Plane using helm?](#how-to-deploy-webmethods-api-control-plane-using-helm) -3. [How to stop webMethods API Control Plane using helm?](#how-to-stop-webmethods-api-control-plane-using-helm) -4. [How to access the newly deployed webMethods API Control Plane?](#how-to-access-the-newly-deployed-webmethods-api-control-plane) +2. [How to deploy IBM webMethods API Control Plane using helm?](#how-to-deploy-webmethods-api-control-plane-using-helm) +3. [How to stop IBM webMethods API Control Plane using helm?](#how-to-stop-webmethods-api-control-plane-using-helm) +4. [How to access the newly deployed IBM webMethods API Control Plane?](#how-to-access-the-newly-deployed-webmethods-api-control-plane) 5. [Additional deployment flavors](#additional-deployment-flavors) *** @@ -33,44 +33,11 @@ The machine needs following to install the control plane through helm. *** -## How to deploy webMethods API Control Plane using helm? +## How to deploy IBM webMethods API Control Plane using helm? -1. Clone this repository -2. Login to https://containers.softwareag.com/ -3. Get a Personal Access Token (PAT) +4. Refer https://docs.webmethods.io/on-premises/webmethods-api-control-plane/en/11.1.0/webhelp/index.html#page/wco-webhelp%2Fco-deploy_standalone_apicp.html to pull control plane images from IBM container registry. - We published docker images for all API Control Plane microservice to https://containers.softwareag.com/ repository. To be able to pull them, you'll need a Personal Access token (PAT). To get a PAT, go to Userprofile > Settings > Generate password. Store Token Password securely. -4. Create a kubernetes namespace for your deployment - - Execute the following command - - ```bash - kubectl create namespace control-plane - ``` - - If everything goes well the output should be similar to - - ```bash - [user@somehost helm]$ kubectl create namespace control-plane - namespace/control-plane created - ``` - -5. Create a kubernetes secret to be able to pull docker images - - Execute the following command - - ```bash - kubectl create secret docker-registry regcred -n control-plane --docker-server=sagcr.azurecr.io --docker-username=[Your git username] --docker-password=[Your PAT] - ``` - - If everything goes well the output should be similar to - - ```bash - [user@somehost helm]$ kubectl create secret docker-registry regcred -n control-plane --docker-server=sagcr.azurecr.io --docker-username=przemekuliok --docker-password=*secret* - secret/regcred created created - ``` - -6. Configure your deployment +5. Configure your deployment The [values.yaml](values.yaml) file allows to configure different aspects of API Control Plane deployment. To be able to access API Control Plane after it's deployed, you need to edit this file and provide a value for `domainName` that matches the hostname of the machine you're deploying API Control plane on. Make sure this hostname is accessible to whoever will be connecting to API Control Plane. @@ -78,7 +45,7 @@ The machine needs following to install the control plane through helm. Default configuration is set up to deploy 2 replicas of API Control Plane containers and 1 replica for others. Edit the values.yaml file to change that as needed. -7. Execute the deployment script +6. Execute the deployment script To deploy the API Control Plane with default configuration: @@ -107,7 +74,7 @@ The machine needs following to install the control plane through helm. TEST SUITE: None ``` -8. Verify it's started +7. Verify it's started It will take a couple of minutes to start. You can monitor that with solutions like Portainer or Docker\Kubernetes Dashboard etc. or simply user Docker\Kubernetes CLI like this @@ -151,7 +118,7 @@ The machine needs following to install the control plane through helm. ###### [Back to Top](#api-control-plane-deployment-with-helm) *** -## How to access the newly deployed webMethods API Control Plane? +## How to access the newly deployed IBM webMethods API Control Plane? 1. Open your browser and go to `https://[the-host-you-configured]/` or `http://[the-host-you-configured]/` (Unsecured) 2. You should see the login screen. Log in using Administrator username and the default password. @@ -160,7 +127,7 @@ The machine needs following to install the control plane through helm. *** -## How to stop webMethods API Control Plane using helm? +## How to stop IBM webMethods API Control Plane using helm? To stop and remove the API Control Plane default configuration: diff --git a/deployment/helm/templates/ingress_configmap.yaml b/deployment/helm/templates/ingress_configmap.yaml index 9e95d03..ba3ceec 100644 --- a/deployment/helm/templates/ingress_configmap.yaml +++ b/deployment/helm/templates/ingress_configmap.yaml @@ -9,7 +9,7 @@ data: SERVER_PORT: "8443" SERVER_SSL_KEY_ALIAS: "softwareag" SERVER_SSL_KEY_PASSWORD: "softwareagkeys" - SERVER_SSL_KEY_STORE: "file:/opt/softwareag/certs/softwareag_not_for_production.jks" + SERVER_SSL_KEY_STORE: "file:/opt/softwareag/certs/webmethods_not_for_production.jks" SERVER_SSL_KEY_STORE_PASSWORD: "softwareag" SERVER_SSL_KEY_STORE_TYPE: "JKS" {{ else }} diff --git a/deployment/helm/templates/ingress_deployment.yaml b/deployment/helm/templates/ingress_deployment.yaml index d216483..28cbbf5 100644 --- a/deployment/helm/templates/ingress_deployment.yaml +++ b/deployment/helm/templates/ingress_deployment.yaml @@ -48,7 +48,7 @@ spec: # should be enabled if the certificate from host system is being mounted # volumeMounts: # - name: hostpath-volume -# mountPath: /opt/softwareag/certs/softwareag_not_for_production.jks +# mountPath: /opt/softwareag/certs/webmethods_not_for_production.jks ports: - containerPort: 8080 name: http @@ -86,7 +86,7 @@ spec: # volumes: # - name: hostpath-volume # hostPath: -# path: /mnt/path/in/your/host/softwareag_test.jks +# path: /mnt/path/in/your/host/webmethods_test.jks # type: File terminationGracePeriodSeconds: 30 imagePullSecrets: diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml index 98b33c7..806ce8f 100644 --- a/deployment/helm/values.yaml +++ b/deployment/helm/values.yaml @@ -3,9 +3,9 @@ applications: # -- Name of the application name: assetcatalog # -- Image name of assetcatalog - imageName: sagcr.azurecr.io/controlplane-assetcatalog + imageName: cp.icr.io/cp/webmethods/api/api-control-plane-assetcatalog # -- Image tag of assetcatalog - imageTag: "11.0" + imageTag: "11.1.2" # -- No. of assetcatalog Replicas replicas: 2 resources: @@ -23,9 +23,9 @@ applications: engine: name: engine # -- Image name of engine - imageName: sagcr.azurecr.io/controlplane-engine + imageName: cp.icr.io/cp/webmethods/api/api-control-plane-engine # -- Image tag of engine - imageTag: "11.0" + imageTag: "11.1.2" # -- No. of engine Replicas replicas: 2 resources: @@ -43,9 +43,9 @@ applications: ingress: name: ingress # -- Image name of ingress - imageName: sagcr.azurecr.io/controlplane-ingress + imageName: cp.icr.io/cp/webmethods/api/api-control-plane-ingress # -- Image tag of ingress - imageTag: "11.0" + imageTag: "11.1.2" # -- No. of ingress Replicas replicas: 2 # -- Tenant ID - The name of the tenant for the deployment @@ -67,9 +67,9 @@ applications: ui: name: ui # -- Image name of ui - imageName: sagcr.azurecr.io/controlplane-ui + imageName: cp.icr.io/cp/webmethods/api/api-control-plane-ui # -- Image tag of ui - imageTag: "11.0" + imageTag: "11.1.2" # -- No. of ui Replicas replicas: 2 resources: @@ -89,7 +89,7 @@ applications: # -- Elasticsearch image name imageName: docker.elastic.co/elasticsearch/elasticsearch # -- Elasticsearch image tag - imageTag: "8.1.1" + imageTag: "8.14.3" # -- Storage size for persistent volume replicas: 1 # -- Cluster master nodes in the format "-0, ..., -(n-1)" where n is replicas. For a single node cluster it will be "-0".