chore: verification-api

cardano-foundation · Aug 22, 2023 · 517d257 · 517d257
1 parent 07b529f
commit 517d257
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 60 deletions.
diff --git a/deploy/cf-cardano-ballot-api/values.yaml b/deploy/cf-cardano-ballot-api/values.yaml
@@ -15,16 +15,7 @@ service:
   port: 80
 
 ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
+  enabled: true
 
 resources: {}
   # limits:

diff --git a/deploy/cf-cardano-ballot-verification-api/templates/deployment.yaml b/deploy/cf-cardano-ballot-verification-api/templates/deployment.yaml
@@ -22,6 +22,11 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+#            - name: SPRING_PROFILES_ACTIVE
+#              value: {{ .springProfiles }}
+            - name: CARDANO_NETWORK
+              value: {{ .Values.network | default "preprod" | upper}}
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

diff --git a/deploy/cf-cardano-ballot-verification-api/templates/ingress.yaml b/deploy/cf-cardano-ballot-verification-api/templates/ingress.yaml
@@ -1,18 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "voting-verification-app.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -23,39 +12,18 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
+    - host: "verification-api.{{ .Values.domain }}"
       http:
         paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
+          - path: /
+            pathType: Prefix
             backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}
+  tls:
+    - hosts:
+        - "verification-api.{{ .Values.domain }}"
+{{ end }}
diff --git a/deploy/cf-cardano-ballot-verification-api/values.yaml b/deploy/cf-cardano-ballot-verification-api/values.yaml
@@ -1,7 +1,7 @@
 replicaCount: 1
 
 image:
-  repository: pro.registry.gitlab.metadata.dev.cf-deployments.org/base-infrastructure/docker-registry/cf-explorer-api
+  repository: pro.registry.gitlab.metadata.dev.cf-deployments.org/base-infrastructure/docker-registry/voting-verification-app
   tag: "0.0.1"
   pullPolicy: Always
 
@@ -15,16 +15,7 @@ service:
   port: 80
 
 ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
+  enabled: true
 
 resources: {}
   # limits:

diff --git a/deploy/main-app/templates/103-cf-cardano-ballot-verification-api.yaml b/deploy/main-app/templates/103-cf-cardano-ballot-verification-api.yaml
@@ -0,0 +1,36 @@
+{{ if index .Values "cf-cardano-ballot-verification-api" "enabled" }}
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cf-cardano-ballot-verification-api
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: git@github.com:cardano-foundation/cf-cardano-ballot.git
+    targetRevision: {{ .Values.git.targetRevision | default "HEAD" }}
+    path: deploy/cf-cardano-ballot-verification-api
+    helm:
+      parameters:
+        - name: "domain"
+          value: {{ .Values.domain }}
+        - name: "network"
+          value: {{ .Values.network }}
+      {{- with index .Values "cf-cardano-ballot-verification-api" "values" }}
+      values: |
+{{ toYaml . | indent 8 }}
+      {{- end }}
+
+  syncPolicy:
+    automated:
+      prune: true
+    syncOptions:
+      - CreateNamespace=true
+
+  destination:
+    namespace: cf-cardano-ballot
+    server: {{ .Values.spec.destination.server }}
+{{ end }}
diff --git a/deploy/main-app/values.yaml b/deploy/main-app/values.yaml
@@ -25,6 +25,11 @@ cf-cardano-ballot-api:
   # Whether Resources should be deployed.
   enabled: true
 
+# Ballot Verification API Parameters
+cf-cardano-ballot-verification-api:
+  # Whether Resources should be deployed.
+  enabled: true
+
 grafana-dashboards:
   enabled: true