Skip to content

Commit 1b6ff5b

Browse files
paulparkinsonpaulparkinson
authored
rename atpaqadmin to admin-helidon (#21)
* k8s vs vault secret option * k8s vs vault secret option * k8s vs vault secret option * k8s vs vault secret option * k8s vs vault secret option for js and python * k8s vs vault secret option * change atpaqadmin to admin * change atpaqadmin to admin
1 parent b7a392a commit 1b6ff5b

File tree

29 files changed

+110
-96
lines changed

29 files changed

+110
-96
lines changed

‎grabdish/atpaqadmin/atpaqadmin-deployment.yaml‎ renamed to ‎grabdish/admin-helidon/admin-helidon-deployment.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
apiVersion: apps/v1
55
kind: Deployment
66
metadata:
7-
name: atpaqadmin
7+
name: admin-helidon
88
spec:
99
replicas: 1
1010
selector:
1111
matchLabels:
12-
app: atpaqadmin
12+
app: admin
1313
template:
1414
metadata:
1515
labels:
16-
app: atpaqadmin
16+
app: admin
1717
version: helidon
1818
spec:
1919
initContainers:
@@ -42,8 +42,8 @@ spec:
4242
- name: creds-inventory
4343
mountPath: /creds-inventory
4444
containers:
45-
- name: helidonatp
46-
image: %DOCKER_REGISTRY%/helidonatp:0.1
45+
- name: admin-helidon
46+
image: %DOCKER_REGISTRY%/admin-helidon:0.1
4747
imagePullPolicy: Always
4848
env:
4949
- name: oracle.ucp.jdbc.PoolDataSource.orderpdb.URL

‎grabdish/atpaqadmin/atpaqadmin-service.yaml‎ renamed to ‎grabdish/admin-helidon/admin-helidon-service.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
apiVersion: v1
55
kind: Service
66
metadata:
7-
name: atpaqadmin
7+
name: admin
88
labels:
9-
app: atpaqadmin
9+
app: admin
1010
spec:
1111
type: NodePort
1212
ports:
1313
- port: 8080
1414
name: http
1515
selector:
16-
app: atpaqadmin
16+
app: admin

‎grabdish/atpaqadmin/build.sh‎ renamed to ‎grabdish/admin-helidon/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
SCRIPT_DIR=$(dirname $0)
66

7-
IMAGE_NAME=helidonatp
7+
IMAGE_NAME=admin-helidon
88
IMAGE_VERSION=0.1
99

1010
if [ -z "DOCKER_REGISTRY" ]; then

‎grabdish/admin-helidon/deploy.sh‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
# Copyright (c) 2021 Oracle and/or its affiliates.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
5+
SCRIPT_DIR=$(dirname $0)
6+
7+
echo create admin-helidon deployment and service...
8+
export CURRENTTIME=$( date '+%F_%H:%M:%S' )
9+
echo CURRENTTIME is $CURRENTTIME ...this will be appended to generated deployment yaml
10+
11+
cp admin-helidon-deployment.yaml admin-helidon-deployment-$CURRENTTIME.yaml
12+
13+
sed -i "s|%DOCKER_REGISTRY%|${DOCKER_REGISTRY}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
14+
sed -i "s|%ORDER_PDB_NAME%|${ORDER_PDB_NAME}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
15+
sed -i "s|%INVENTORY_PDB_NAME%|${INVENTORY_PDB_NAME}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
16+
sed -i "s|%OCI_REGION%|${OCI_REGION}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
17+
sed -i "s|%VAULT_SECRET_OCID%|${VAULT_SECRET_OCID}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
18+
19+
echo conducting setup required to create dblinks in OCI....
20+
./setupForDBLinksInCloud.sh
21+
22+
echo attempting to deploy admin-helidon-deployment-${CURRENTTIME}.yaml
23+
24+
if [ -z "$1" ]; then
25+
kubectl apply -f $SCRIPT_DIR/admin-helidon-deployment-${CURRENTTIME}.yaml -n msdataworkshop
26+
else
27+
kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/admin-helidon-deployment-${CURRENTTIME}.yaml) -n msdataworkshop
28+
fi
29+
30+
kubectl apply -f $SCRIPT_DIR/admin-helidon-service.yaml -n msdataworkshop
31+

‎grabdish/atpaqadmin/pom.xml‎ renamed to ‎grabdish/admin-helidon/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212

1313
<modelVersion>4.0.0</modelVersion>
14-
<artifactId>helidonatp</artifactId>
14+
<artifactId>admin-helidon</artifactId>
1515
<version>0.0.1-SNAPSHOT</version>
16-
<name>helidonatp</name>
16+
<name>admin-helidon</name>
1717
<description>ATP OSB UCP Helidon Microprofile Microservices Demo</description>
1818

1919
<parent>

‎grabdish/atpaqadmin/setupForDBLinksInCloud.sh‎ renamed to ‎grabdish/admin-helidon/setupForDBLinksInCloud.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ echo create link to cwallet.sso in objectstorage, save, export, and echo value..
2323
oci os preauth-request create --access-type ObjectRead --bucket-name msdataworkshop --name msdataworkshopwallet --time-expires 2021-12-21 --object-name cwallet.sso | jq --raw-output '.data | .["access-uri"] ' > preauthlink.txt
2424
export cwalletobjecturi=$(cat preauthlink.txt)
2525
export cwalletobjecturi=https://objectstorage.${OCI_REGION}.oraclecloud.com${cwalletobjecturi}
26-
echo updating atpaqadmin-deployment-${CURRENTTIME}.yaml with cwalletobjecturi $cwalletobjecturi
27-
sed -i "s|%cwalletobjecturi%|${cwalletobjecturi}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
26+
echo updating admin-helidon-deployment-${CURRENTTIME}.yaml with cwalletobjecturi $cwalletobjecturi
27+
sed -i "s|%cwalletobjecturi%|${cwalletobjecturi}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
2828

2929

30-
echo cwalletobjecturi is created and added to atpaqadmin-deployment-${CURRENTTIME}.yaml
31-
echo adding other values in atpaqadmin-deployment-${CURRENTTIME}.yaml as parsed from tnsnames.ora s
30+
echo cwalletobjecturi is created and added to admin-helidon-deployment-${CURRENTTIME}.yaml
31+
echo adding other values in admin-helidon-deployment-${CURRENTTIME}.yaml as parsed from tnsnames.ora s
3232

3333
#echo ____________________________________________________
3434
export orderdb_tptnsentry=$(grep -i "^${ORDER_PDB_NAME}_tp " $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/tnsnames.ora)
@@ -115,15 +115,15 @@ echo $inventoryssl_server_cert_dn
115115

116116

117117

118-
echo setting values in atpaqadmin-deployment-${CURRENTTIME}.yaml ...
118+
echo setting values in admin-helidon-deployment-${CURRENTTIME}.yaml ...
119119

120-
sed -i "s|%orderhostname%|${orderhostname}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
121-
sed -i "s|%orderport%|${orderport}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
122-
sed -i "s|%orderservice_name%|${orderservice_name}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
123-
sed -i "s|%orderssl_server_cert_dn%|${orderssl_server_cert_dn}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
120+
sed -i "s|%orderhostname%|${orderhostname}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
121+
sed -i "s|%orderport%|${orderport}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
122+
sed -i "s|%orderservice_name%|${orderservice_name}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
123+
sed -i "s|%orderssl_server_cert_dn%|${orderssl_server_cert_dn}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
124124

125-
sed -i "s|%inventoryhostname%|${inventoryhostname}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
126-
sed -i "s|%inventoryport%|${inventoryport}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
127-
sed -i "s|%inventoryservice_name%|${inventoryservice_name}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
128-
sed -i "s|%inventoryssl_server_cert_dn%|${inventoryssl_server_cert_dn}|g" atpaqadmin-deployment-${CURRENTTIME}.yaml
125+
sed -i "s|%inventoryhostname%|${inventoryhostname}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
126+
sed -i "s|%inventoryport%|${inventoryport}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
127+
sed -i "s|%inventoryservice_name%|${inventoryservice_name}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
128+
sed -i "s|%inventoryssl_server_cert_dn%|${inventoryssl_server_cert_dn}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
129129

‎grabdish/atpaqadmin/src/main/java/oracle/db/microservices/ATPAQAdminApplication.java‎ renamed to ‎grabdish/admin-helidon/src/main/java/oracle/db/microservices/ATPAQAdminApplication.java‎

File renamed without changes.

‎grabdish/atpaqadmin/src/main/java/oracle/db/microservices/ATPAQAdminResource.java‎ renamed to ‎grabdish/admin-helidon/src/main/java/oracle/db/microservices/ATPAQAdminResource.java‎

File renamed without changes.

‎grabdish/atpaqadmin/src/main/java/oracle/db/microservices/OCISDKUtility.java‎ renamed to ‎grabdish/admin-helidon/src/main/java/oracle/db/microservices/OCISDKUtility.java‎

File renamed without changes.

‎grabdish/atpaqadmin/src/main/java/oracle/db/microservices/PropagationSetup.java‎ renamed to ‎grabdish/admin-helidon/src/main/java/oracle/db/microservices/PropagationSetup.java‎

File renamed without changes.

0 commit comments

Comments
 (0)