Merge pull request #2431 from renuka-fernando/100-beta-ready

Prepare for 1.0.0-beta release
wso2 · Nov 22, 2021 · dbfbd50 · dbfbd50
2 parents 4a9d6cc + 3dcc4d9
commit dbfbd50
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 29 deletions.
diff --git a/integration/test-integration/src/test/resources/dockerCompose/backend-service-tls.yaml b/integration/test-integration/src/test/resources/dockerCompose/backend-service-tls.yaml
@@ -1,6 +1,6 @@
       - "5006:5006"
   mockBackend:
-    image: wso2/choreo-connect-mock-backend:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-mock-backend:1.0.0-beta
     command: java -cp "lib/*" org.wso2.choreo.connect.mockbackend.MockServices -tls-enabled -interceptor-svc-enabled
     ports:
       - "2370:2370"

diff --git a/...st-integration/src/test/resources/dockerCompose/backend-service-with-tls-and-network.yaml b/...st-integration/src/test/resources/dockerCompose/backend-service-with-tls-and-network.yaml
@@ -1,6 +1,6 @@
       - "5006:5006"
   mockBackend:
-    image: wso2/choreo-connect-mock-backend:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-mock-backend:1.0.0-beta
     command: java -cp "lib/*" org.wso2.choreo.connect.mockbackend.MockServices -tls-enabled
     ports:
       - "2383:2383"

diff --git a/integration/test-integration/src/test/resources/dockerCompose/backend-service.yaml b/integration/test-integration/src/test/resources/dockerCompose/backend-service.yaml
@@ -1,6 +1,6 @@
       - "5006:5006"
   mockBackend:
-    image: wso2/choreo-connect-mock-backend:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-mock-backend:1.0.0-beta
     ports:
       - "2383:2383"
       - "2399:2399"

diff --git a/...est-integration/src/test/resources/dockerCompose/cc-in-common-network-docker-compose.yaml b/...est-integration/src/test/resources/dockerCompose/cc-in-common-network-docker-compose.yaml
@@ -7,7 +7,7 @@ networks:
       name: apim_and_cc
 services:
   router:
-    image: wso2/choreo-connect-router:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:1.0.0-beta
     logging:
       options:
         max-size: "20m"
@@ -34,7 +34,7 @@ services:
     networks:
       - cc_internal
   adapter:
-    image: wso2/choreo-connect-adapter:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:1.0.0-beta
     logging:
       options:
         max-size: "20m"
@@ -55,7 +55,7 @@ services:
       - cc_internal
       - apim_and_cc
   enforcer:
-    image: wso2/choreo-connect-enforcer:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:1.0.0-beta
     logging:
       options:
         max-size: "20m"

diff --git a/release-note.html b/release-note.html
@@ -23,28 +23,22 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <meta content="text/html; charset=iso-8859-1" http-equiv="content-type"/>
-    <title>Choreo Connect v1.0.0-Alpha - 2nd November 2021</title>
+    <title>Choreo Connect v1.0.0-Beta - 22th November 2021</title>
 </head>
 <body>
 <div id="main-content">
     <div>
-        <h1>What's new in 1.0.0-Alpha</h1>
-        <p>This is the alpha release of the Choreo Connect 1.0.0.</p>
-        <h2>Features</h2>
-        <ul>
-            <li>Deploy APIs from the file system</li>
-            <li>Support circuit breakers</li>
-            <li>Support retry and timeout for upstream endpoints</li>
-            <li><a href="https://github.com/wso2/product-microgateway/milestone/58?closed=1">List of completed tasks</a>
-            </li>
-        </ul>
+        <h1>What's new in 1.0.0-Beta</h1>
+        <p>This is the beta release of the Choreo Connect 1.0.0.</p>
         <h2>Improvements and Bug fixes</h2>
         <ul>
+            <li><a href="https://github.com/wso2/product-microgateway/milestone/59?closed=1">List of completed tasks</a>
+            </li>
             <li>
-                <a href="https://github.com/wso2/product-microgateway/issues?q=is%3Aissue+milestone%3A1.0.0-alpha+label%3AType%2FImprovement+is%3Aclosed">Improvements</a>
+                <a href="https://github.com/wso2/product-microgateway/issues?q=is%3Aissue+label%3AType%2FImprovement+is%3Aclosed+milestone%3A1.0.0-beta">Improvements</a>
             </li>
             <li>
-                <a href="https://github.com/wso2/product-microgateway/issues?q=is%3Aissue+milestone%3A1.0.0-alpha+label%3AType%2FBug+is%3Aclosed">Bug
+                <a href="https://github.com/wso2/product-microgateway/issues?q=is%3Aissue+label%3AType%2FBug+is%3Aclosed+milestone%3A1.0.0-beta">Bug
                     fixes</a></li>
         </ul>
         <h2>Known Issues</h2>

diff --git a/remove-containers.sh b/remove-containers.sh
@@ -16,7 +16,7 @@
 # -----------------------------------------------------------------------
 
 # Just to assist developers by removing all the containers.
-micro_gw_version=1.0.0-beta-SNAPSHOT
+micro_gw_version=1.0.0-beta
 
 docker kill "$(docker ps -a | grep wso2/choreo-connect-enforcer:$micro_gw_version | awk '{print $1}')"
 docker rm "$(docker ps -a | grep wso2/choreo-connect-enforcer:$micro_gw_version | awk '{print $1}')"

diff --git a/resources/docker-compose/apim/docker-compose.yaml b/resources/docker-compose/apim/docker-compose.yaml
@@ -14,7 +14,7 @@ services:
     volumes:
       - ./conf/deployment.toml:/home/wso2carbon/wso2am-4.0.0/repository/conf/deployment.toml
   router:
-    image: wso2/choreo-connect-router:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:1.0.0-beta
     logging:
       options:
         max-size: "20m"
@@ -42,7 +42,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/choreo-connect-adapter:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:1.0.0-beta
     logging:
       options:
         max-size: "20m"
@@ -62,7 +62,7 @@ services:
     links:
       - apim
   enforcer:
-    image: wso2/choreo-connect-enforcer:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:1.0.0-beta
     logging:
       options:
         max-size: "20m"

diff --git a/resources/docker-compose/docker-compose.yaml b/resources/docker-compose/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   router:
-    image: wso2/choreo-connect-router:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:1.0.0-beta
     logging:
       options:
         max-size: "20m"
@@ -30,7 +30,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/choreo-connect-adapter:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:1.0.0-beta
     logging:
       options:
         max-size: "20m"
@@ -49,7 +49,7 @@ services:
       - "18000:18000"
       - "9843:9843"
   enforcer:
-    image: wso2/choreo-connect-enforcer:1.0.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:1.0.0-beta
     logging:
       options:
         max-size: "20m"

diff --git a/resources/k8s-artifacts/choreo-connect/adapter-deployment.yaml b/resources/k8s-artifacts/choreo-connect/adapter-deployment.yaml
@@ -45,7 +45,7 @@ spec:
             - mountPath: /home/wso2/conf/log_config.toml
               subPath: log_config.toml
               name: logconfig-toml-vol
-          image: wso2/choreo-connect-adapter:1.0.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-adapter:1.0.0-beta
           imagePullPolicy: IfNotPresent
           env:
             - name: ADAPTER_PRIVATE_KEY_PATH

diff --git a/resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml b/resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml
@@ -46,7 +46,7 @@ spec:
               name: log4j2-vol
             - mountPath: /home/wso2/lib/dropins
               name: dropins-vol
-          image: wso2/choreo-connect-enforcer:1.0.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-enforcer:1.0.0-beta
           imagePullPolicy: IfNotPresent
           env:
             - name: ENFORCER_PRIVATE_KEY_PATH
@@ -112,7 +112,7 @@ spec:
               name: router-keystore-vol
             - mountPath: /home/wso2/security/truststore
               name: router-truststore-vol
-          image: wso2/choreo-connect-router:1.0.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-router:1.0.0-beta
           imagePullPolicy: IfNotPresent
           env:
             - name: ROUTER_ADMIN_HOST