Merge pull request #37 from holaplex/mpw/nfts-treasuries-update

[hub-nfts/hub-treasuries] move solanaEndpoint to secrets
holaplex · Mar 6, 2023 · 7b5e91e · 7b5e91e
2 parents 349875f + f29ddf7
commit 7b5e91e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/charts/hub-nfts/Chart.yaml b/charts/hub-nfts/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/hub-nfts/templates/environment.yaml b/charts/hub-nfts/templates/environment.yaml
@@ -6,7 +6,6 @@ data:
   {{- with .Values.environment }}
   PORT: {{ .port | quote }}
   KAFKA_BROKERS: {{ required "must set kafka brokers" .kafkaBrokers | quote }}
-  SOLANA_ENDPOINT: {{ required "must set solana endpoint" .solanaEndpoint | quote }}
   SOLANA_KEYPAIR_PATH: {{ required "must set key pair path" .solanaKeyPairPath | quote }}
   KAFKA_USERNAME: {{ required "must set kafka username" .kafkaUsername | quote }}
   KAFKA_SSL: {{ required "must set kafka ssl" .kafkaSsl | quote }}

diff --git a/charts/hub-nfts/templates/secrets.yaml b/charts/hub-nfts/templates/secrets.yaml
@@ -11,6 +11,7 @@ data:
   DATABASE_URL: {{ .entries.databaseUrl | b64enc }}
   KAFKA_PASSWORD: {{ .entries.kafkaPassword | b64enc }}
   NFT_STORAGE_AUTH_TOKEN: {{ .entries.nftStorageAuthToken | b64enc }}
+  SOLANA_ENDPOINT: {{ required "must set solana rpc api endpoint" .solanaEndpoint | quote }}
 ---
 apiVersion: v1
 kind: Secret

diff --git a/charts/hub-nfts/values.yaml b/charts/hub-nfts/values.yaml
@@ -78,6 +78,7 @@ secrets:
     databaseUrl: ""
     kafkaPassword: ""
     nftStorageAuthToken: ""
+    solanaEndpoint: "https://api.devnet.solana.com"
     solanaKeyPair: |
       ""
 
@@ -87,6 +88,5 @@ environment:
   kafkaUsername: ""
   kafkaSsl: false
   solanaKeyPairPath: "/app/keypair.json"
-  solanaEndpoint: "https://api.devnet.solana.com"
   nftStorageApiEndpoint: "https://api.nft.storage"
   ipfsEndpoint: "https://ipfs.io/ipfs/"
diff --git a/charts/hub-treasuries/Chart.yaml b/charts/hub-treasuries/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.1
+version: 0.2.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/hub-treasuries/templates/environment.yaml b/charts/hub-treasuries/templates/environment.yaml
@@ -11,6 +11,5 @@ data:
   KAFKA_SSL: {{ default "false" .kafkaSsl | quote }}
   KAFKA_USERNAME: {{ required "must set kafka username" .kafkaUsername | quote }}
   FIREBLOCKS_ENDPOINT: {{ required "must set fireblocks api endpoint" .fireblocksEndpoint | quote }}
-  SOLANA_ENDPOINT: {{ required "must set solana rpc api endpoint" .solanaEndpoint | quote }}
   FIREBLOCKS_SUPPORTED_ASSET_IDS: {{ .fireblocksSupportedAssetIds | quote }}
   {{- end }}
diff --git a/charts/hub-treasuries/templates/secrets.yaml b/charts/hub-treasuries/templates/secrets.yaml
@@ -11,6 +11,7 @@ data:
   FIREBLOCKS_API_KEY:  {{ .entries.fireblocksApiKey | b64enc }}
   DATABASE_URL: {{ .entries.databaseUrl | b64enc }}
   KAFKA_PASSWORD: {{ required "must set kafka password" .entries.kafkaPassword | b64enc }}
+  SOLANA_ENDPOINT: {{ required "must set solana rpc api endpoint" .solanaEndpoint | quote }}
 ---
 apiVersion: v1
 kind: Secret

diff --git a/charts/hub-treasuries/values.yaml b/charts/hub-treasuries/values.yaml
@@ -77,14 +77,14 @@ secrets:
   entries:
     databaseUrl: ""
     kafkaPassword: ""
+    solanaEndpoint: "https://api.devnet.solana.com"
     fireblocksApiKey: ""
     fireblocksPrivateKey: |
       ""
 
 environment:
   logLevel: "info"
   port: 80
-  solanaEndpoint: "https://api.devnet.solana.com"
   fireblocksEndpoint: "https://api.fireblocks.io"
   kafkaBrokers: "hub-eventbus-cluster-0.hub-eventbus-cluster.default.svc.cluster.local.:9093"
   kafkaSsl: false