Skip to content

Commit

Permalink
Change helm to match standard naming and neg annotation (#22)
Browse files Browse the repository at this point in the history
Co-authored-by: Github Actions Runner <[email protected]>
  • Loading branch information
lalet and actions-user authored Apr 27, 2023
1 parent 69a1654 commit 1d512fa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 22 deletions.
2 changes: 1 addition & 1 deletion cicd.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cicd:
version: v0.1.125
version: v0.1.143
9 changes: 2 additions & 7 deletions helm/testnet-faucet/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
apiVersion: v1
apiVersion: v2
description: testnet-faucet
name: testnet-faucet
version: 0.0.1
dependencies:
- name: xpringnginx
version: 0.1.0-feature-XPE874-2
repository: oci://us-central1-docker.pkg.dev/cbdc-helm-repo/ripplex-helm-charts
alias: faucetng
version: 0.0.1
20 changes: 11 additions & 9 deletions helm/testnet-faucet/templates/faucet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ $fullAppName }}-faucet-secret
name: {{ $fullAppName }}-secret
type: Opaque
data:
NODE_ENV: {{ .Values.faucet.nodeEnv | b64enc }}
Expand All @@ -16,39 +16,41 @@ data:
apiVersion: v1
kind: Service
metadata:
name: {{ $fullAppName }}-faucet
name: {{ $fullAppName }}
annotations:
cloud.google.com/neg: '{"exposed_ports": {"443":{"name": "{{ $fullAppName }}-neg"}}}'
spec:
type: ClusterIP
selector:
app: {{ $fullAppName }}-faucet
app: {{ $fullAppName }}
ports:
- protocol: TCP
port: {{ .Values.faucet.port }}
port: 443
targetPort: {{ .Values.faucet.port }}
name: public
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ $fullAppName }}-faucet
name: {{ $fullAppName }}
spec:
replicas: {{ .Values.faucet.replicas }}
selector:
matchLabels:
app: {{ $fullAppName }}-faucet
app: {{ $fullAppName }}
template:
metadata:
annotations:
date: {{ now }}
labels:
app: {{ $fullAppName }}-faucet
app: {{ $fullAppName }}
spec:
containers:
- image: {{ .Values.faucet.image }}
name: {{ $fullAppName }}-faucet
name: {{ $fullAppName }}
envFrom:
- secretRef:
name: {{ $fullAppName }}-faucet-secret
name: {{ $fullAppName }}-secret
imagePullPolicy: Always
ports:
- containerPort: {{ .Values.faucet.port }}
Expand Down
5 changes: 0 additions & 5 deletions helm/testnet-faucet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@ faucet:
fundingAddr: null
fundingSecret: null
xrpAmount: 1000
faucetng:
install: true
releaseImage: gcr.io/xpring-dev-sandbox/xpring_nginx:0.0.3
fullNameOverride: faucetng-sslnginx
replicaCount: 1

0 comments on commit 1d512fa

Please sign in to comment.