From 8c99da3739adc89ecec72c95a351f840067db2c4 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 12:45:56 +0200 Subject: [PATCH 01/16] chore(ui-summit-2024): finished docker build --- ui/summit-2024/.dockerignore | 2 ++ ui/summit-2024/Dockerfile | 20 +++++++--------- .../etc/nginx/conf.d/default.conf | 12 ++++++++++ .../docker-assets/etc/nginx/conf.d/gzip.conf | 24 +++++++++++++++++++ ui/summit-2024/docker-assets/nginx.conf | 10 ++++++++ 5 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 ui/summit-2024/docker-assets/etc/nginx/conf.d/default.conf create mode 100644 ui/summit-2024/docker-assets/etc/nginx/conf.d/gzip.conf create mode 100644 ui/summit-2024/docker-assets/nginx.conf diff --git a/ui/summit-2024/.dockerignore b/ui/summit-2024/.dockerignore index 3c3629e64..c8f2611d0 100644 --- a/ui/summit-2024/.dockerignore +++ b/ui/summit-2024/.dockerignore @@ -1 +1,3 @@ node_modules +Dockerfile +.dockerignore diff --git a/ui/summit-2024/Dockerfile b/ui/summit-2024/Dockerfile index d6d7eba53..e943eb40b 100644 --- a/ui/summit-2024/Dockerfile +++ b/ui/summit-2024/Dockerfile @@ -12,16 +12,14 @@ RUN npm run build # Bundle static assets with nginx FROM nginx:alpine as production +EXPOSE 80 WORKDIR /app -# Copy built assets from builder -#COPY --from=builder /app/build /usr/share/nginx/html -## Add your nginx.conf -#COPY docker-assets/nginx.conf /etc/nginx/conf.d/default.conf -#COPY docker-assets/bin/entrypoint.sh /app/entrypoint.sh -#COPY env.global.tmp.js /app/env.global.tmp.js -#COPY package.json /app/ -## Expose port -#EXPOSE 80 -## Start nginx -#CMD ["sh", "/app/entrypoint.sh"] \ No newline at end of file +COPY --from=build /app/dist /usr/share/nginx/html + +RUN rm -rf /etc/nginx/conf.d +COPY docker-assets/etc/nginx/conf.d /etc/nginx/conf.d +COPY docker-assets/bin/entrypoint.sh /app/entrypoint.sh +COPY package.json /app/ + +CMD ["sh", "/app/entrypoint.sh"] diff --git a/ui/summit-2024/docker-assets/etc/nginx/conf.d/default.conf b/ui/summit-2024/docker-assets/etc/nginx/conf.d/default.conf new file mode 100644 index 000000000..93cba3df8 --- /dev/null +++ b/ui/summit-2024/docker-assets/etc/nginx/conf.d/default.conf @@ -0,0 +1,12 @@ +server { + listen 80; + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} diff --git a/ui/summit-2024/docker-assets/etc/nginx/conf.d/gzip.conf b/ui/summit-2024/docker-assets/etc/nginx/conf.d/gzip.conf new file mode 100644 index 000000000..ad0542d33 --- /dev/null +++ b/ui/summit-2024/docker-assets/etc/nginx/conf.d/gzip.conf @@ -0,0 +1,24 @@ +gzip on; +gzip_http_version 1.0; +gzip_comp_level 5; # 1-9 +gzip_min_length 256; +gzip_proxied any; +gzip_vary on; + +# MIME-types +gzip_types + application/atom+xml + application/javascript + application/json + application/rss+xml + application/vnd.ms-fontobject + application/x-font-ttf + application/x-web-app-manifest+json + application/xhtml+xml + application/xml + font/opentype + image/svg+xml + image/x-icon + text/css + text/plain + text/x-component; \ No newline at end of file diff --git a/ui/summit-2024/docker-assets/nginx.conf b/ui/summit-2024/docker-assets/nginx.conf new file mode 100644 index 000000000..4b59f5924 --- /dev/null +++ b/ui/summit-2024/docker-assets/nginx.conf @@ -0,0 +1,10 @@ +server { + listen 80; + + location / { + root /usr/share/nginx/html/; + include /etc/nginx/mime.types; + try_files $uri $uri/ /index.html; + } + +} From c3014e7136adcca1273d1ea7d5878fda2ce40082 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 12:53:11 +0200 Subject: [PATCH 02/16] chore(ui-summit-2024/docker): added missing entrypoint.sh due to root .gitignore --- ui/summit-2024/docker-assets/bin/entrypoint.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 ui/summit-2024/docker-assets/bin/entrypoint.sh diff --git a/ui/summit-2024/docker-assets/bin/entrypoint.sh b/ui/summit-2024/docker-assets/bin/entrypoint.sh new file mode 100755 index 000000000..ef91d0a49 --- /dev/null +++ b/ui/summit-2024/docker-assets/bin/entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +ENV_FILE_PATH=/usr/share/nginx/html/envfile.js +export VITE_VERSION=$(grep -m 1 "version" package.json | awk '{print $2}' | sed 's/[",]//g') + +echo "window._env_ = {" > $ENV_FILE_PATH +for var in $(env | grep ^VITE_); do + echo " \"${var%%=*}\": \"${var#*=}\"," >> $ENV_FILE_PATH +done +echo "};" >> $ENV_FILE_PATH + +exec nginx -g "daemon off;" $@ From 5b92dd0c656bc4d42f93a325eab7ee0f33af538d Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 13:04:56 +0200 Subject: [PATCH 03/16] chore(helm): update summit-2024 ui helm chart --- deploy/cf-cardano-summit-2024-ui/Chart.yaml | 2 +- .../templates/deployment.yaml | 66 ++++++++++--------- .../templates/ingress.yaml | 4 +- .../templates/service.yaml | 6 +- deploy/cf-cardano-summit-2024-ui/values.yaml | 6 +- 5 files changed, 44 insertions(+), 40 deletions(-) diff --git a/deploy/cf-cardano-summit-2024-ui/Chart.yaml b/deploy/cf-cardano-summit-2024-ui/Chart.yaml index f1c739e50..191a4f229 100644 --- a/deploy/cf-cardano-summit-2024-ui/Chart.yaml +++ b/deploy/cf-cardano-summit-2024-ui/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: summit-2023-ui +name: summit-2024-ui description: A Helm chart for Kubernetes type: application version: 0.0.1 diff --git a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml index 39811d214..773017225 100644 --- a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml +++ b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml @@ -1,18 +1,18 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "summit-2023-ui.fullname" . }} + name: {{ include "summit-2024-ui.fullname" . }} labels: - {{- include "summit-2023-ui.labels" . | nindent 4 }} + {{- include "summit-2024-ui.labels" . | nindent 4 }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - {{- include "summit-2023-ui.selectorLabels" . | nindent 6 }} + {{- include "summit-2024-ui.selectorLabels" . | nindent 6 }} template: metadata: labels: - {{- include "summit-2023-ui.selectorLabels" . | nindent 8 }} + {{- include "summit-2024-ui.selectorLabels" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: @@ -23,34 +23,38 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: - - name: REACT_APP_VERSION - value: {{ .Values.image.tag | default .Chart.AppVersion | quote }} - - name: REACT_APP_FRONTEND_URL - value: {{ .Values.frontendUrl }} - - name: REACT_APP_VOTING_APP_SERVER_URL - value: {{ .Values.votingAppServerUrl }} - - name: REACT_APP_VOTING_LEDGER_FOLLOWER_APP_SERVER_URL - value: {{ .Values.votingLedgerFollowerAppServerUrl }} - - name: REACT_APP_VOTING_VERIFICATION_APP_SERVER_URL - value: {{ .Values.votingVerificationAppServerUrl }} - - name: REACT_APP_USER_VERIFICATION_SERVER_URL - value: {{ .Values.userVerificationServerUrl }} - - name: REACT_APP_TARGET_NETWORK - value: {{ .Values.targetNetwork }} - - name: REACT_APP_EVENT_ID - value: {{ .Values.eventId }} - - name: REACT_APP_SUPPORTED_WALLETS + - name: VITE_VOTING_APP_SERVER_URL + value: {{ .Values.votingAppServerUrl | default "http://localhost:9091" }} + - name: VITE_VOTING_LEDGER_FOLLOWER_APP_SERVER_URL + value: {{ .Values.votingLedgerFollowerAppServerUrl | default "http://localhost:9090" }} + - name: VITE_VOTING_VERIFICATION_APP_SERVER_URL + value: {{ .Values.votingVerificationAppServerUrl | default "http://localhost:9092" }} + - name: VITE_USER_VERIFICATION_SERVER_URL + value: {{ .Values.userVerificationServerUrl | default "http://localhost:9093" }} + - name: VITE_DISCORD_SUPPORT_CHANNEL_URL + value: {{ .Values.discordSupportChannelUrl | default "https://discord.gg/example" }} + - name: VITE_DISCORD_CHANNEL_URL + value: {{ .Values.discordChannelUrl | default "https://discord.gg/example" }} + - name: VITE_DISCORD_BOT_URL + value: {{ .Values.discordBotUrl | default "https://discord.com/channels/example" }} + - name: VITE_MATOMO_BASE_URL + value: {{ .Values.matomoBaseUrl | default "https://example.com" }} + - name: VITE_TARGET_NETWORK + value: {{ .Values.targetNetwork | default "PREPROD" }} + - name: VITE_EVENT_ID + value: {{ .Values.eventId | default "CF_SUMMIT_2024_8BCC" }} + - name: VITE_SUPPORTED_WALLETS value: {{ .Values.supportedWallets | default "flint,eternl,nami,typhoncip30,yoroi,nufi,gerowallet,lace" }} - - name: REACT_APP_DISCORD_CHANNEL_URL - value: {{ .Values.discordChannelUrl }} - - name: REACT_APP_DISCORD_BOT_URL - value: {{ .Values.discordBotUrl }} - - name: REACT_APP_DISCORD_SUPPORT_CHANNEL_URL - value: {{ .Values.discordSupportChannelUrl }} - - name: REACT_APP_SHOW_WINNERS - value: {{ .Values.showWinners | quote }} - - name: REACT_APP_SHOW_HYDRA_TALLY - value: {{ .Values.showHydraTally | quote }} + - name: VITE_SHOW_WINNERS + value: {{ .Values.showWinners | default "false" }} + - name: VITE_SHOW_HYDRA_TALLY + value: {{ .Values.showHydraTally | default "false" }} + - name: VITE_USING_FIXTURES + value: {{ .Values.usingFixtures | default "false" }} + - name: VITE_COMMIT_HASH + value: {{ .Values.image.tag | default "latest" }} + - name: VITE_WEB_URL + value: {{ .Values.webUrl | default "http://localhost:3000" }} ports: - name: http containerPort: {{ .Values.service.port }} diff --git a/deploy/cf-cardano-summit-2024-ui/templates/ingress.yaml b/deploy/cf-cardano-summit-2024-ui/templates/ingress.yaml index 887fc2a02..d1e61373f 100644 --- a/deploy/cf-cardano-summit-2024-ui/templates/ingress.yaml +++ b/deploy/cf-cardano-summit-2024-ui/templates/ingress.yaml @@ -1,12 +1,12 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "summit-2023-ui.fullname" . -}} +{{- $fullName := include "summit-2024-ui.fullname" . -}} {{- $svcPort := .Values.service.port -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "summit-2023-ui.labels" . | nindent 4 }} + {{- include "summit-2024-ui.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/deploy/cf-cardano-summit-2024-ui/templates/service.yaml b/deploy/cf-cardano-summit-2024-ui/templates/service.yaml index c4648a544..300963999 100644 --- a/deploy/cf-cardano-summit-2024-ui/templates/service.yaml +++ b/deploy/cf-cardano-summit-2024-ui/templates/service.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "summit-2023-ui.fullname" . }} + name: {{ include "summit-2024-ui.fullname" . }} labels: - {{- include "summit-2023-ui.labels" . | nindent 4 }} + {{- include "summit-2024-ui.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: http selector: - {{- include "summit-2023-ui.selectorLabels" . | nindent 4 }} + {{- include "summit-2024-ui.selectorLabels" . | nindent 4 }} diff --git a/deploy/cf-cardano-summit-2024-ui/values.yaml b/deploy/cf-cardano-summit-2024-ui/values.yaml index 238318a50..44731cac3 100644 --- a/deploy/cf-cardano-summit-2024-ui/values.yaml +++ b/deploy/cf-cardano-summit-2024-ui/values.yaml @@ -1,8 +1,8 @@ replicaCount: 1 image: - repository: pro.registry.gitlab.metadata.dev.cf-deployments.org/base-infrastructure/docker-registry/summit-2023-ui - tag: "0.0.1" + repository: pro.registry.gitlab.metadata.dev.cf-deployments.org/base-infrastructure/docker-registry/cf-ui-summit-2024 + tag: "latest" pullPolicy: Always imagePullSecrets: [] @@ -12,7 +12,7 @@ fullnameOverride: "" service: type: ClusterIP - port: 8080 + port: 80 ingress: enabled: true From 1d9dd0e59d8a8f2ca08106050a90ab06968e6dca Mon Sep 17 00:00:00 2001 From: J Caso Date: Tue, 6 Aug 2024 13:11:09 +0200 Subject: [PATCH 04/16] feat: add login modal --- ui/summit-2024/src/common/api/voteService.ts | 25 +++-- .../src/components/Header/Header.tsx | 2 + .../src/components/LoginModal/LoginModal.tsx | 100 ++++++++++++++++++ .../VerifyWalletModal/VerifyWalletModal.tsx | 4 +- .../src/pages/Categories/Categories.tsx | 26 ++--- 5 files changed, 124 insertions(+), 33 deletions(-) create mode 100644 ui/summit-2024/src/components/LoginModal/LoginModal.tsx diff --git a/ui/summit-2024/src/common/api/voteService.ts b/ui/summit-2024/src/common/api/voteService.ts index e74ae31e1..2bbb8ead3 100644 --- a/ui/summit-2024/src/common/api/voteService.ts +++ b/ui/summit-2024/src/common/api/voteService.ts @@ -57,19 +57,22 @@ export const buildCanonicalVoteInputJson = ({ }); }; -const submitVoteWithDigitalSignature = async (jsonRequest: SignedWeb3Request, walletType: string) => { +const submitVoteWithDigitalSignature = async ( + jsonRequest: SignedWeb3Request, + walletType: string, +) => { return await doRequest( - HttpMethods.POST, - CAST_VOTE_URL, - DEFAULT_CONTENT_TYPE_HEADERS, - JSON.stringify({ - ...jsonRequest, - walletType - }), - undefined, - true, + HttpMethods.POST, + CAST_VOTE_URL, + DEFAULT_CONTENT_TYPE_HEADERS, + JSON.stringify({ + ...jsonRequest, + walletType, + }), + undefined, + true, ); -} +}; const getSlotNumber = async () => { return await doRequest( diff --git a/ui/summit-2024/src/components/Header/Header.tsx b/ui/summit-2024/src/components/Header/Header.tsx index da0427a26..a9589d4a6 100644 --- a/ui/summit-2024/src/components/Header/Header.tsx +++ b/ui/summit-2024/src/components/Header/Header.tsx @@ -18,6 +18,7 @@ import { RightMenu } from "./RightMenu/RightMenu"; import theme from "../../common/styles/theme"; import { useAppDispatch } from "../../store/hooks"; import { resetUser } from "../../store/reducers/userCache"; +import {LoginModal} from "../LoginModal/LoginModal"; const Header = () => { const dispatch = useAppDispatch(); @@ -267,6 +268,7 @@ const Header = () => { setShowConnectWalletModal(open ? open : false) } /> + { + const isMobile = useIsPortrait(); + const [isOpen, setIsOpen] = useState(false); + const [isLogging, setIsLogging] = useState(false); + + useEffect(() => { + const openLoginModal = () => { + setIsOpen(true); + }; + const closeVerifyWalletModal = () => { + setIsOpen(false); + }; + eventBus.subscribe(EventName.OpenLoginModal, openLoginModal); + eventBus.subscribe( + EventName.CloseLoginModal, + closeVerifyWalletModal, + ); + + return () => { + eventBus.unsubscribe( + EventName.OpenLoginModal, + openLoginModal, + ); + eventBus.unsubscribe( + EventName.CloseLoginModal, + closeVerifyWalletModal, + ); + }; + }, []); + + const handleLogin = () => { + setIsLogging(true); + }; + const handleCloseModal= () => { + setIsOpen(false); + setIsLogging(false); + }; + + return ( + <> + handleCloseModal()} + width={isMobile ? "100%" : "450px"} + > + + + Login in order to see your vote receipts + + handleLogin()} + colorVariant="primary" + sx={{ + minWidth: "256px", + mt: "50px", + mb: "20px", + }} + disabled={isLogging} + > + Login + + + + + ); +}; + +export { LoginModal }; diff --git a/ui/summit-2024/src/components/VerifyWalletModal/VerifyWalletModal.tsx b/ui/summit-2024/src/components/VerifyWalletModal/VerifyWalletModal.tsx index 2e7060634..c2683ace2 100644 --- a/ui/summit-2024/src/components/VerifyWalletModal/VerifyWalletModal.tsx +++ b/ui/summit-2024/src/components/VerifyWalletModal/VerifyWalletModal.tsx @@ -213,8 +213,8 @@ const VerifyWalletModal = () => { ); if ("error" in verifyDiscordResult && verifyDiscordResult.error) { - console.log("verifyDiscordResult"); - console.log(verifyDiscordResult); + console.log("verifyDiscordResult"); + console.log(verifyDiscordResult); eventBus.publish( "showToast", verifyDiscordResult.message || "Error while verifying", diff --git a/ui/summit-2024/src/pages/Categories/Categories.tsx b/ui/summit-2024/src/pages/Categories/Categories.tsx index ca150bf36..ba8b5864a 100644 --- a/ui/summit-2024/src/pages/Categories/Categories.tsx +++ b/ui/summit-2024/src/pages/Categories/Categories.tsx @@ -144,8 +144,6 @@ const Categories: React.FC = ({ embedded }) => { }; const submitVote = async () => { - - console.log("submitVote"); if (eventCache?.finished) { eventBus.publish(EventName.ShowToast, "The event already ended", "error"); return; @@ -154,11 +152,6 @@ const Categories: React.FC = ({ embedded }) => { const categoryId = categoryToRender?.id; const proposalId = nomineeToVote?.id; - console.log("categoryId"); - console.log(categoryId); - console.log("proposalId"); - console.log(proposalId); - if (!categoryId || !proposalId) { eventBus.publish(EventName.ShowToast, "Nominee not selected", "error"); return; @@ -167,8 +160,6 @@ const Categories: React.FC = ({ embedded }) => { try { // @ts-ignore const absoluteSlot = (await getSlotNumber())?.absoluteSlot; - console.log("absoluteSlot"); - console.log(absoluteSlot); const canonicalVoteInput = buildCanonicalVoteInputJson({ voteId: uuidv4(), categoryId: categoryId, @@ -178,9 +169,6 @@ const Categories: React.FC = ({ embedded }) => { slotNumber: absoluteSlot.toString(), }); - console.log("canonicalVoteInput"); - console.log(canonicalVoteInput); - const requestVoteResult = await signWithWallet( canonicalVoteInput, connectedWallet.address, @@ -196,29 +184,26 @@ const Categories: React.FC = ({ embedded }) => { return; } - console.log("requestVoteResult"); - console.log(requestVoteResult); - const submitVoteResult = await submitVoteWithDigitalSignature( // @ts-ignore requestVoteResult.result, - resolveWalletType(connectedWallet.address) + resolveWalletType(connectedWallet.address), ); - console.log("submitVoteResult"); - console.log(submitVoteResult); // @ts-ignore if (submitVoteResult.error && submitVoteResult.message) { eventBus.publish( EventName.ShowToast, - // @ts-ignore - submitVoteResult.message || "Error while voting", + // @ts-ignore + submitVoteResult.message || "Error while voting", ToastType.Error, ); return; } eventBus.publish(EventName.ShowToast, "Vote submitted successfully"); + console.log("session"); + console.log(session); if (session && !tokenIsExpired(session?.expiresAt)) { // @ts-ignore getVoteReceipt(categoryId, session?.accessToken) @@ -254,6 +239,7 @@ const Categories: React.FC = ({ embedded }) => { } }); } else { + console.log("open login modal"); eventBus.publish( EventName.OpenLoginModal, "Login to see your vote receipt.", From 36abe5469c8da7c30a08b67a7a7fa96064fc18d8 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 13:12:40 +0200 Subject: [PATCH 05/16] fix(helm/ui-summit-2024): fix typhoon key in supported wallets --- deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml index 773017225..100009d25 100644 --- a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml +++ b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml @@ -44,7 +44,7 @@ spec: - name: VITE_EVENT_ID value: {{ .Values.eventId | default "CF_SUMMIT_2024_8BCC" }} - name: VITE_SUPPORTED_WALLETS - value: {{ .Values.supportedWallets | default "flint,eternl,nami,typhoncip30,yoroi,nufi,gerowallet,lace" }} + value: {{ .Values.supportedWallets | default "flint,eternl,nami,typhon,yoroi,nufi,gerowallet,lace" }} - name: VITE_SHOW_WINNERS value: {{ .Values.showWinners | default "false" }} - name: VITE_SHOW_HYDRA_TALLY From 422b54ae82054bc4fa8c508a69d0ca572993c9b4 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 13:21:28 +0200 Subject: [PATCH 06/16] fix(helm/ui-summit-2024): fix helpers --- .../templates/_helpers.tpl | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy/cf-cardano-summit-2024-ui/templates/_helpers.tpl b/deploy/cf-cardano-summit-2024-ui/templates/_helpers.tpl index 25b1abc05..06d9ae3ec 100644 --- a/deploy/cf-cardano-summit-2024-ui/templates/_helpers.tpl +++ b/deploy/cf-cardano-summit-2024-ui/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "summit-2023-ui.name" -}} +{{- define "summit-2024-ui.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -10,7 +10,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "summit-2023-ui.fullname" -}} +{{- define "summit-2024-ui.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "summit-2023-ui.chart" -}} +{{- define "summit-2024-ui.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "summit-2023-ui.labels" -}} -helm.sh/chart: {{ include "summit-2023-ui.chart" . }} -{{ include "summit-2023-ui.selectorLabels" . }} +{{- define "summit-2024-ui.labels" -}} +helm.sh/chart: {{ include "summit-2024-ui.chart" . }} +{{ include "summit-2024-ui.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "summit-2023-ui.selectorLabels" -}} -app.kubernetes.io/name: {{ include "summit-2023-ui.name" . }} +{{- define "summit-2024-ui.selectorLabels" -}} +app.kubernetes.io/name: {{ include "summit-2024-ui.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "summit-2023-ui.serviceAccountName" -}} +{{- define "summit-2024-ui.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "summit-2023-ui.fullname" .) .Values.serviceAccount.name }} +{{- default (include "summit-2024-ui.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} From 5f34dd8b234c99ada76f4553c996b2aaf5be7218 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 14:41:33 +0200 Subject: [PATCH 07/16] fix(helm/ui-summit-2024): sanitize booleans --- deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml | 6 +++--- deploy/cf-cardano-summit-2024-ui/values.yaml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml index 100009d25..c21f18ece 100644 --- a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml +++ b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml @@ -46,11 +46,11 @@ spec: - name: VITE_SUPPORTED_WALLETS value: {{ .Values.supportedWallets | default "flint,eternl,nami,typhon,yoroi,nufi,gerowallet,lace" }} - name: VITE_SHOW_WINNERS - value: {{ .Values.showWinners | default "false" }} + value: {{ .Values.showWinners | default "false" | quote }} - name: VITE_SHOW_HYDRA_TALLY - value: {{ .Values.showHydraTally | default "false" }} + value: {{ .Values.showHydraTally | default "false" | quote }} - name: VITE_USING_FIXTURES - value: {{ .Values.usingFixtures | default "false" }} + value: {{ .Values.usingFixtures | default "false" | quote }} - name: VITE_COMMIT_HASH value: {{ .Values.image.tag | default "latest" }} - name: VITE_WEB_URL diff --git a/deploy/cf-cardano-summit-2024-ui/values.yaml b/deploy/cf-cardano-summit-2024-ui/values.yaml index 44731cac3..1e739fbc7 100644 --- a/deploy/cf-cardano-summit-2024-ui/values.yaml +++ b/deploy/cf-cardano-summit-2024-ui/values.yaml @@ -31,3 +31,4 @@ nodeSelector: {} showWinners: "false" showHydraTally: "false" +usingFixtures: "false" From 19a4ea6a70168872e43f467374262f30374d1e0d Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 14:48:54 +0200 Subject: [PATCH 08/16] fix(helm/ui-summit-2024): change default webUrl --- deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml index c21f18ece..1c96ef1af 100644 --- a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml +++ b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml @@ -54,7 +54,7 @@ spec: - name: VITE_COMMIT_HASH value: {{ .Values.image.tag | default "latest" }} - name: VITE_WEB_URL - value: {{ .Values.webUrl | default "http://localhost:3000" }} + value: {{ .Values.webUrl | default "https://{{ .Values.domain }}" }} ports: - name: http containerPort: {{ .Values.service.port }} From 1ad03c77397eb3be50eb295980c3f02c615bc224 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 15:00:06 +0200 Subject: [PATCH 09/16] chore(stg): change the way default webUrl is handled --- deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml | 6 +++++- deploy/cf-cardano-summit-2024-ui/values.yaml | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml index 1c96ef1af..c042ff964 100644 --- a/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml +++ b/deploy/cf-cardano-summit-2024-ui/templates/deployment.yaml @@ -54,7 +54,11 @@ spec: - name: VITE_COMMIT_HASH value: {{ .Values.image.tag | default "latest" }} - name: VITE_WEB_URL - value: {{ .Values.webUrl | default "https://{{ .Values.domain }}" }} + {{ if .Values.webUrl }} + value: {{ .Values.webUrl }} + {{ else }} + value: "https://{{ .Values.domain }}" + {{ end }} ports: - name: http containerPort: {{ .Values.service.port }} diff --git a/deploy/cf-cardano-summit-2024-ui/values.yaml b/deploy/cf-cardano-summit-2024-ui/values.yaml index 1e739fbc7..84ed20cbe 100644 --- a/deploy/cf-cardano-summit-2024-ui/values.yaml +++ b/deploy/cf-cardano-summit-2024-ui/values.yaml @@ -9,7 +9,6 @@ imagePullSecrets: [] nameOverride: "" fullnameOverride: "" - service: type: ClusterIP port: 80 From 920fb7d61df1aa39ff89c112fa5e85498c825f54 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 19:46:19 +0200 Subject: [PATCH 10/16] chore(helm/keri-ballot-verifier): added initial chart --- deploy/cf-keri-ballot-verifier/.helmignore | 23 ++++++ deploy/cf-keri-ballot-verifier/Chart.yaml | 6 ++ .../templates/_helpers.tpl | 62 ++++++++++++++++ .../templates/ingress.yaml | 44 ++++++++++++ .../templates/service.yaml | 19 +++++ .../templates/statefulset.yaml | 70 +++++++++++++++++++ deploy/cf-keri-ballot-verifier/values.yaml | 30 ++++++++ 7 files changed, 254 insertions(+) create mode 100644 deploy/cf-keri-ballot-verifier/.helmignore create mode 100644 deploy/cf-keri-ballot-verifier/Chart.yaml create mode 100644 deploy/cf-keri-ballot-verifier/templates/_helpers.tpl create mode 100644 deploy/cf-keri-ballot-verifier/templates/ingress.yaml create mode 100644 deploy/cf-keri-ballot-verifier/templates/service.yaml create mode 100644 deploy/cf-keri-ballot-verifier/templates/statefulset.yaml create mode 100644 deploy/cf-keri-ballot-verifier/values.yaml diff --git a/deploy/cf-keri-ballot-verifier/.helmignore b/deploy/cf-keri-ballot-verifier/.helmignore new file mode 100644 index 000000000..0e8a0eb36 --- /dev/null +++ b/deploy/cf-keri-ballot-verifier/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/deploy/cf-keri-ballot-verifier/Chart.yaml b/deploy/cf-keri-ballot-verifier/Chart.yaml new file mode 100644 index 000000000..e0a6f5021 --- /dev/null +++ b/deploy/cf-keri-ballot-verifier/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: keri-ballot-verifier +description: A Helm chart for Kubernetes +type: application +version: 0.0.1 +appVersion: 0.0.1 diff --git a/deploy/cf-keri-ballot-verifier/templates/_helpers.tpl b/deploy/cf-keri-ballot-verifier/templates/_helpers.tpl new file mode 100644 index 000000000..02c46b86e --- /dev/null +++ b/deploy/cf-keri-ballot-verifier/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "keri-ballot-verifier.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "keri-ballot-verifier.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "keri-ballot-verifier.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "keri-ballot-verifier.labels" -}} +helm.sh/chart: {{ include "keri-ballot-verifier.chart" . }} +{{ include "keri-ballot-verifier.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "keri-ballot-verifier.selectorLabels" -}} +app.kubernetes.io/name: {{ include "keri-ballot-verifier.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "keri-ballot-verifier.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "keri-ballot-verifier.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/deploy/cf-keri-ballot-verifier/templates/ingress.yaml b/deploy/cf-keri-ballot-verifier/templates/ingress.yaml new file mode 100644 index 000000000..d1e61373f --- /dev/null +++ b/deploy/cf-keri-ballot-verifier/templates/ingress.yaml @@ -0,0 +1,44 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "summit-2024-ui.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "summit-2024-ui.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + rules: + - host: "{{ .Values.domain }}" + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- range $domain := .Values.ingress.additionalDomains }} + - host: {{ $domain }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- end }} + tls: + - hosts: + - "{{ .Values.domain }}" +{{ with .Values.ingress.additionalDomains }} + {{- toYaml . | nindent 8 }} +{{ end }} +{{ end }} diff --git a/deploy/cf-keri-ballot-verifier/templates/service.yaml b/deploy/cf-keri-ballot-verifier/templates/service.yaml new file mode 100644 index 000000000..c7c71a5cb --- /dev/null +++ b/deploy/cf-keri-ballot-verifier/templates/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "keri-ballot-verifier.fullname" . }} + labels: + {{- include "keri-ballot-verifier.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port | default "5666"}} + targetPort: public + protocol: TCP + name: http + - port: {{ .Values.service.adminPort | default "5667"}} + targetPort: admin + protocol: TCP + name: http + selector: + {{- include "keri-ballot-verifier.selectorLabels" . | nindent 4 }} diff --git a/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml b/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml new file mode 100644 index 000000000..818e2b0cb --- /dev/null +++ b/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml @@ -0,0 +1,70 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "keri-ballot-verifier.fullname" . }} + labels: + {{- include "keri-ballot-verifier.labels" . | nindent 4 }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + {{- include "keri-ballot-verifier.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + {{- include "keri-ballot-verifier.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: VERIFIER_URL + value: {{ .Values.url }} + - name: VERIFIER_PORT + value: {{ .Values.service.port | default "5666" | quote }} + - name: VERIFIER_ADMIN_PORT + value: {{ .Values.service.port | default "5667" | quote }} + - name: VERIFIER_CONFIG_DIR + value: {{ .Values.configDir | default "/usr/local/var/keri" }} + - name: VERIFIER_STORE_DIR + value: $(VERIFIER_CONFIG_DIR)/store + ports: + - name: public + containerPort: {{ .Values.service.port }} + protocol: TCP + - name: admin + containerPort: {{ .Values.service.adminPort }} + protocol: TCP +# livenessProbe: +# httpGet: +# path: / +# port: http +# readinessProbe: +# httpGet: +# path: / +# port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + + volumeMounts: + - mountPath: /usr/local/var/keri + name: data + volumes: + - name: data + persistentVolumeClaim: + claimName: keri-ballot-verifier-data + + volumeClaimTemplates: + - metadata: + name: keri-ballot-verifier-data + spec: + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: {{ .volumeSize | default "1Gi" }} + diff --git a/deploy/cf-keri-ballot-verifier/values.yaml b/deploy/cf-keri-ballot-verifier/values.yaml new file mode 100644 index 000000000..380e938fe --- /dev/null +++ b/deploy/cf-keri-ballot-verifier/values.yaml @@ -0,0 +1,30 @@ +replicaCount: 1 + +image: + repository: pro.registry.gitlab.metadata.dev.cf-deployments.org/base-infrastructure/docker-registry/cf-keri-ballot-verifier + tag: "latest" + pullPolicy: Always + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +service: + type: ClusterIP + port: 5666 + adminPort: 5667 + +ingress: + enabled: true + additionalDomains: [] +# - beta.explorer.cardano.org + +resources: {} + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +nodeSelector: {} From a41fa758ecfa619e01bdc5122485c6372e6dd559 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 19:52:04 +0200 Subject: [PATCH 11/16] chore(helm/keri-ballot-verifier): fixed ingress --- deploy/cf-keri-ballot-verifier/templates/ingress.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/cf-keri-ballot-verifier/templates/ingress.yaml b/deploy/cf-keri-ballot-verifier/templates/ingress.yaml index d1e61373f..94bf3b8d0 100644 --- a/deploy/cf-keri-ballot-verifier/templates/ingress.yaml +++ b/deploy/cf-keri-ballot-verifier/templates/ingress.yaml @@ -1,12 +1,12 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "summit-2024-ui.fullname" . -}} +{{- $fullName := include "keri-ballot-verifier.fullname" . -}} {{- $svcPort := .Values.service.port -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "summit-2024-ui.labels" . | nindent 4 }} + {{- include "keri-ballot-verifier.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} From c847f9e8508e73674bfe911e3601543931be120d Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 19:53:36 +0200 Subject: [PATCH 12/16] chore(helm/keri-ballot-verifier): fixed pvc --- deploy/cf-keri-ballot-verifier/templates/statefulset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml b/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml index 818e2b0cb..b9ab63886 100644 --- a/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml +++ b/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml @@ -53,9 +53,9 @@ spec: volumeMounts: - mountPath: /usr/local/var/keri - name: data + name: keri-ballot-verifier-data volumes: - - name: data + - name: keri-ballot-verifier-data persistentVolumeClaim: claimName: keri-ballot-verifier-data From 4fd867bf587040d65a715d4d26d195f270f73883 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 19:54:26 +0200 Subject: [PATCH 13/16] chore(helm/keri-ballot-verifier): fixed service --- deploy/cf-keri-ballot-verifier/templates/service.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/cf-keri-ballot-verifier/templates/service.yaml b/deploy/cf-keri-ballot-verifier/templates/service.yaml index c7c71a5cb..55db92ace 100644 --- a/deploy/cf-keri-ballot-verifier/templates/service.yaml +++ b/deploy/cf-keri-ballot-verifier/templates/service.yaml @@ -10,10 +10,10 @@ spec: - port: {{ .Values.service.port | default "5666"}} targetPort: public protocol: TCP - name: http + name: public - port: {{ .Values.service.adminPort | default "5667"}} targetPort: admin protocol: TCP - name: http + name: admin selector: {{- include "keri-ballot-verifier.selectorLabels" . | nindent 4 }} From 1f2040d1933f78b5f7bcd7f512a091c7baba76fa Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 20:23:48 +0200 Subject: [PATCH 14/16] chore(helm/cf-keri-ballot-verifier): fixed adminPort --- deploy/cf-keri-ballot-verifier/templates/statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml b/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml index b9ab63886..9ed3b3008 100644 --- a/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml +++ b/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml @@ -28,7 +28,7 @@ spec: - name: VERIFIER_PORT value: {{ .Values.service.port | default "5666" | quote }} - name: VERIFIER_ADMIN_PORT - value: {{ .Values.service.port | default "5667" | quote }} + value: {{ .Values.service.adminPort | default "5667" | quote }} - name: VERIFIER_CONFIG_DIR value: {{ .Values.configDir | default "/usr/local/var/keri" }} - name: VERIFIER_STORE_DIR From ee09e59ca412af3fffc4f759a14356af6fffb17d Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 20:29:20 +0200 Subject: [PATCH 15/16] chore(helm/cf-keri-ballot-verifier): fixed templated url --- deploy/cf-keri-ballot-verifier/templates/statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml b/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml index 9ed3b3008..1b0e060ac 100644 --- a/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml +++ b/deploy/cf-keri-ballot-verifier/templates/statefulset.yaml @@ -24,7 +24,7 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} env: - name: VERIFIER_URL - value: {{ .Values.url }} + value: {{ tpl .Values.url . | default "http://localhost:5666" }} - name: VERIFIER_PORT value: {{ .Values.service.port | default "5666" | quote }} - name: VERIFIER_ADMIN_PORT From 0cb73eab3ab3ed97d7d392a4c57a72e7d2c23249 Mon Sep 17 00:00:00 2001 From: "Roberto C. Morano" Date: Tue, 6 Aug 2024 21:41:34 +0200 Subject: [PATCH 16/16] chore(helm/cf-keri-ballot-verifier): fixed ingress --- deploy/cf-keri-ballot-verifier/templates/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/cf-keri-ballot-verifier/templates/ingress.yaml b/deploy/cf-keri-ballot-verifier/templates/ingress.yaml index 94bf3b8d0..c6c70c6e2 100644 --- a/deploy/cf-keri-ballot-verifier/templates/ingress.yaml +++ b/deploy/cf-keri-ballot-verifier/templates/ingress.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: rules: - - host: "{{ .Values.domain }}" + - host: "keri-ballot-verifier.{{ .Values.domain }}" http: paths: - path: /