Skip to content

Commit

Permalink
add version and naming chnges
Browse files Browse the repository at this point in the history
  • Loading branch information
tharindu1st committed Dec 13, 2022
1 parent 93ccbdc commit 1ace969
Show file tree
Hide file tree
Showing 17 changed files with 44 additions and 59 deletions.
2 changes: 1 addition & 1 deletion admin/admin-domain-service/ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "wso2"
name = "admin_service"
version = "0.1.0-SNAPSHOT"
version = "0.0.1-SNAPSHOT"
distribution = "2201.2.0"

[build-options]
Expand Down
2 changes: 1 addition & 1 deletion admin/admin-domain-service/ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ modules = [
[[package]]
org = "wso2"
name = "admin_service"
version = "0.1.0-SNAPSHOT"
version = "0.0.1-SNAPSHOT"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "http"},
Expand Down
4 changes: 2 additions & 2 deletions admin/admin-domain-service/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=org.wso2.apk
version=0.1.0-SNAPSHOT
docker_image_name = admin-service
version=0.0.1-SNAPSHOT
docker_image_name = admin-domain-service
jar_name = admin_service.jar
dist_name = admin
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "wso2"
name = "backoffice_service"
version = "0.1.0"
version = "0.0.1-SNAPSHOT"
distribution = "2201.2.0"

[build-options]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ modules = [
[[package]]
org = "wso2"
name = "backoffice_service"
version = "0.1.0"
version = "0.0.1-SNAPSHOT"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "http"},
Expand Down
4 changes: 2 additions & 2 deletions backoffice/backoffice-domain-service/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
group=org.wso2.apk
version=0.1.0-SNAPSHOT
docker_image_name = backoffice_service
version=0.0.1-SNAPSHOT
docker_image_name = backoffice-domain-service
jar_name = backoffice_service.jar
dist_name = backoffice

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "wso2"
name = "backoffice_internal_service"
version = "0.1.0"
version = "0.0.1-SNAPSHOT"
distribution = "2201.2.2"

[build-options]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,14 @@ org = "ballerina"
name = "lang.object"
version = "0.0.0"

[[package]]
org = "ballerina"
name = "lang.regexp"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "lang.runtime"
Expand All @@ -174,7 +182,8 @@ org = "ballerina"
name = "lang.string"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.regexp"}
]

[[package]]
Expand Down Expand Up @@ -316,7 +325,7 @@ modules = [
[[package]]
org = "wso2"
name = "backoffice_internal_service"
version = "0.1.0"
version = "0.0.1-SNAPSHOT"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "http"},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
group=org.wso2.apk
version=0.1.0-SNAPSHOT
docker_image_name = backoffice_internal_service
version=0.0.1-SNAPSHOT
docker_image_name = backoffice-internal-domain-service
jar_name = backoffice_internal_service.jar
dist_name = backoffice_internal

Expand Down
44 changes: 10 additions & 34 deletions build-apk.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,44 +1,20 @@
#This is a sample script to build APK. When you build project please run this script in project root level.
#All relative paths etc designed from root directory. Users can customize this as per demand. Ex: If you wish to
#build and run runtime domain service then can build it alone and do deployment.
declare -i x=0;
git pull
current_dir=$PWD;
#Component build sample. You can build any component with this
cd apkbase;gradle build;
cd common-java-libs;gradle build;
cd $current_dir;
cd common-go-libs/;gradle build;
cd apkBase;gradle build;
cd $current_dir;
cd backoffice/backoffice-domain-service;gradle build;
cd $current_dir;
cd backoffice/backoffice-internal-domain-service;gradle build;
cd $current_dir;
cd runtime/runtime-domain-service;gradle build;
cd $current_dir;
cd helm-charts;
#Undeploy already deployed setup and deploy again
kubectl get pods -n apk
helm uninstall apk-test -n apk
#If you are use minikube implementation then you need to load images with below command.
minikube image load backoffice_service:0.1.0-SNAPSHOT
#minikube image load adapter:0.0.1-SNAPSHOT
#minikube image load management-server:0.0.1-SNAPSHOT
minikube image load runtime-api:0.0.1-SNAPSHOT
#minikube image load devportal_service:0.1.0-SNAPSHOT
#minikube image load admin-service:0.1.0-SNAPSHOT
minikube image load apkbase:0.0.1-SNAPSHOT
#Waiting for deployment to terminate.
while test $x -eq 0; do
getpods_output=$(kubectl get pods -n apk 2>&1)
if [[ $getpods_output == *"No resources found in apk namespace."* ]]; then
x=1;
echo "Deployment terminated successfully..........."
else
echo "Terminating Cluster..............."
sleep 5
fi
done
#Helm install APK with all components
helm dependency build
helm install apk-test -n apk .
#List pods created for deployment.
kubectl get pods -n apk
cd admin/admin-domain-service;gradle build;
cd $current_dir;
cd devportal/devportal-domain-service;gradle build;
cd $current_dir;
cd adapter;gradle build;
cd $current_dir;
cd management-server;gradle build;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "wso2"
name = "devportal_service"
version = "0.1.0"
version = "0.0.1-SNAPSHOT"
distribution = "2201.2.0"

[build-options]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ modules = [
[[package]]
org = "wso2"
name = "devportal_service"
version = "0.1.0"
version = "0.0.1-SNAPSHOT"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "http"},
Expand Down
4 changes: 2 additions & 2 deletions devportal/devportal-domain-service/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=org.wso2.apk
version=0.1.0-SNAPSHOT
docker_image_name = devportal_service
version=0.0.1-SNAPSHOT
docker_image_name = devportal-domain-service
jar_name = devportal_service.jar
dist_name = devportal
2 changes: 1 addition & 1 deletion gateway/enforcer/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
#

group=org.wso2.apk
version=0.1.0-SNAPSHOT
version=0.0.1-SNAPSHOT
docker_image_name=enforcer
1 change: 1 addition & 0 deletions gateway/router/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
group=org.wso2.apk
version=0.0.1-SNAPSHOT
docker_image_name=router
11 changes: 5 additions & 6 deletions helm-charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ wso2:
strategy: Recreate
replicas: 1
imagePullPolicy: IfNotPresent
image: devportal_service:0.1.0-SNAPSHOT
image: devportal-domain-service:0.0.1-SNAPSHOT
ingress:
path: /api/am/devportal
className: ""
Expand Down Expand Up @@ -96,8 +96,7 @@ wso2:
strategy: Recreate
replicas: 1
imagePullPolicy: IfNotPresent
# TODO update image
image: admin-service:0.1.0-SNAPSHOT
image: admin-domain-service:0.0.1-SNAPSHOT
ingress:
path: /api/am/admin
className: ""
Expand Down Expand Up @@ -132,7 +131,7 @@ wso2:
strategy: Recreate
replicas: 1
imagePullPolicy: IfNotPresent
image: backoffice_service:0.1.0-SNAPSHOT
image: backoffice-domain-service:0.0.1-SNAPSHOT
ingress:
path: /api/am/backoffice
className: ""
Expand Down Expand Up @@ -167,7 +166,7 @@ wso2:
strategy: Recreate
replicas: 1
imagePullPolicy: IfNotPresent
image: backoffice_internal_service:0.1.0-SNAPSHOT
image: backoffice-internal-domain-service:0.0.1-SNAPSHOT
ingress:
path: /api/am/backoffice/internal
className: ""
Expand Down Expand Up @@ -263,7 +262,7 @@ wso2:
strategy: Recreate
replicas: 1
imagePullPolicy: IfNotPresent
image: runtime-api:0.0.1-SNAPSHOT
image: runtime-domain-service:0.0.1-SNAPSHOT
ingress:
path: /api/am/runtime
className: ""
Expand Down
2 changes: 1 addition & 1 deletion runtime/runtime-domain-service/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=org.wso2.apk
version=0.0.1-SNAPSHOT
docker_image_name=runtime-api
docker_image_name=runtime-domain-service
dist_name=runtime
jar_name=runtime_domain_service.jar

0 comments on commit 1ace969

Please sign in to comment.