ソースを参照

Run devnet_setup.sh as solana-devnet sidecar

Leo 5 年 前
コミット
c65d221ab3
3 ファイル変更6 行追加27 行削除
  1. 0 12
      devnet/bridge.yaml
  2. 5 12
      devnet/solana-devnet.yaml
  3. 1 3
      solana/devnet_setup.sh

+ 0 - 12
devnet/bridge.yaml

@@ -59,9 +59,6 @@ spec:
             - containerPort: 6060
               name: pprof
               protocol: TCP
-#          volumeMounts:
-#            - name: guardian-data
-#              mountPath: /data
         - name: agent
           image: solana-agent
           command:
@@ -75,12 +72,3 @@ spec:
             - containerPort: 9000
               name: grpc
               protocol: TCP
-#  volumeClaimTemplates:
-#    - metadata:
-#        name: guardian-data
-#      spec:
-#        accessModes: [ "ReadWriteOnce" ]
-#        resources:
-#          requests:
-#            storage: 1Gi
-

+ 5 - 12
devnet/solana-devnet.yaml

@@ -34,7 +34,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 1
       containers:
-        - name: solana-devnet
+        - name: devnet
           image: solana-devnet
           ports:
             - containerPort: 8001
@@ -67,14 +67,7 @@ spec:
             - containerPort: 9900
               name: faucet
               protocol: TCP
-#          volumeMounts:
-#            - name: solana-devnet-data
-#              mountPath: /data
-#  volumeClaimTemplates:
-#    - metadata:
-#        name: solana-devnet-data
-#      spec:
-#        accessModes: [ "ReadWriteOnce" ]
-#        resources:
-#          requests:
-#            storage: 1Gi
+        - name: setup
+          image: solana-agent
+          command:
+            - /usr/src/solana/devnet_setup.sh

+ 1 - 3
solana/devnet_setup.sh

@@ -2,8 +2,6 @@
 # This script configures the devnet for test transfers with hardcoded addresses.
 set -x
 
-# TODO: run as solana devnet sidecar
-
 # Configure CLI (works the same as upstream Solana CLI)
 mkdir -p ~/.config/solana/cli
 cat <<EOF > ~/.config/solana/cli/config.yml
@@ -29,7 +27,7 @@ retry cli airdrop solana-devnet:9900
 
 # Create the bridge contract at a known address
 # OK to fail on subsequent attempts (already created).
-cli create-bridge "$bridge_address" "$initial_guardian"
+retry cli create-bridge "$bridge_address" "$initial_guardian"
 
 # Create a new SPL token (at a random address)
 token=$(cli create-token | grep 'Creating token' | awk '{ print $3 }')