From d99363e9767c4918e67e890f862f600b97ea2ffc Mon Sep 17 00:00:00 2001 From: Matthew Alan Gray Date: Mon, 29 Jan 2024 08:42:35 -0600 Subject: [PATCH 1/6] Management helm chart fixes --- deploy/helm/management-api/values.yaml | 2 +- deploy/helm/management-ui/templates/_helpers.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/management-api/values.yaml b/deploy/helm/management-api/values.yaml index 285e1f5d8a..3e44ccb70c 100644 --- a/deploy/helm/management-api/values.yaml +++ b/deploy/helm/management-api/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 serviceAccountName: management-api image: - repository: ghcr.io/solliancenet/foundationallm/managemente-api + repository: ghcr.io/solliancenet/foundationallm/management-api pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: latest diff --git a/deploy/helm/management-ui/templates/_helpers.tpl b/deploy/helm/management-ui/templates/_helpers.tpl index 1cf0eeddc4..45f6b97f22 100644 --- a/deploy/helm/management-ui/templates/_helpers.tpl +++ b/deploy/helm/management-ui/templates/_helpers.tpl @@ -11,7 +11,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 "management.fullname" -}} +{{- define "management-ui.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} From db6b09244272f103ec76c2f313b48ee2a2c4c5db Mon Sep 17 00:00:00 2001 From: Matthew Alan Gray Date: Mon, 29 Jan 2024 08:50:44 -0600 Subject: [PATCH 2/6] Correcting service account name --- deploy/helm/management-ui/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/management-ui/values.yaml b/deploy/helm/management-ui/values.yaml index 6a6f9cc884..10fac95722 100644 --- a/deploy/helm/management-ui/values.yaml +++ b/deploy/helm/management-ui/values.yaml @@ -1,9 +1,9 @@ -# Default values for chat-ui. +# Default values for management-ui. # This is a YAML-formatted file. # Declare variables to be passed into your templates. replicaCount: 1 -serviceAccountName: chat-ui +serviceAccountName: management-ui image: repository: ghcr.io/solliancenet/foundationallm/management-ui pullPolicy: Always From 584af1b37c719278635a6c528e880cabd15c6068 Mon Sep 17 00:00:00 2001 From: Matthew Alan Gray Date: Mon, 29 Jan 2024 08:55:03 -0600 Subject: [PATCH 3/6] Correcting error in chat-ui helm chart --- deploy/helm/chat-ui/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/chat-ui/values.yaml b/deploy/helm/chat-ui/values.yaml index 5c29b2034d..c434104bd8 100644 --- a/deploy/helm/chat-ui/values.yaml +++ b/deploy/helm/chat-ui/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 serviceAccountName: chat-ui image: - repository: ghcr.io/solliancenet/foundationallm + repository: ghcr.io/solliancenet/foundationallm/chat-ui pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. tag: latest From ccb6f088e9599cdf389499c7159a77b2449f75b5 Mon Sep 17 00:00:00 2001 From: Matthew Alan Gray Date: Mon, 29 Jan 2024 09:32:18 -0600 Subject: [PATCH 4/6] Updating SemanticKernel API Dockerfile to reference SemanticKernel-obsolete --- src/dotnet/SemanticKernelAPI/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dotnet/SemanticKernelAPI/Dockerfile b/src/dotnet/SemanticKernelAPI/Dockerfile index fddeb7be16..bd568da3bc 100644 --- a/src/dotnet/SemanticKernelAPI/Dockerfile +++ b/src/dotnet/SemanticKernelAPI/Dockerfile @@ -14,8 +14,8 @@ COPY . . RUN dotnet restore "dotnet/Common/Common.csproj" RUN dotnet build "dotnet/Common/Common.csproj" -c Release -o /app/build -RUN dotnet restore "dotnet/SemanticKernel/SemanticKernel.csproj" -RUN dotnet build "dotnet/SemanticKernel/SemanticKernel.csproj" -c Release -o /app/build +RUN dotnet restore "dotnet/SemanticKernel-obsolete/SemanticKernel.csproj" +RUN dotnet build "dotnet/SemanticKernel-obsolete/SemanticKernel.csproj" -c Release -o /app/build RUN dotnet restore "dotnet/SemanticKernelAPI/SemanticKernelAPI.csproj" RUN dotnet build "dotnet/SemanticKernelAPI/SemanticKernelAPI.csproj" -c Release -o /app/build From 074c0524e2717b355c6a8bc30b7400e2542ab79b Mon Sep 17 00:00:00 2001 From: Matthew Alan Gray Date: Mon, 29 Jan 2024 09:35:29 -0600 Subject: [PATCH 5/6] Updating SemanticKernel API Dockerfile to reference SemanticKernel-obsolete --- src/dotnet/SemanticKernelAPI/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dotnet/SemanticKernelAPI/Dockerfile b/src/dotnet/SemanticKernelAPI/Dockerfile index bd568da3bc..6486222484 100644 --- a/src/dotnet/SemanticKernelAPI/Dockerfile +++ b/src/dotnet/SemanticKernelAPI/Dockerfile @@ -14,8 +14,8 @@ COPY . . RUN dotnet restore "dotnet/Common/Common.csproj" RUN dotnet build "dotnet/Common/Common.csproj" -c Release -o /app/build -RUN dotnet restore "dotnet/SemanticKernel-obsolete/SemanticKernel.csproj" -RUN dotnet build "dotnet/SemanticKernel-obsolete/SemanticKernel.csproj" -c Release -o /app/build +RUN dotnet restore "dotnet/SemanticKernel-obsolete/SemanticKernel-obsolete.csproj" +RUN dotnet build "dotnet/SemanticKernel-obsolete/SemanticKernel-obsolete.csproj" -c Release -o /app/build RUN dotnet restore "dotnet/SemanticKernelAPI/SemanticKernelAPI.csproj" RUN dotnet build "dotnet/SemanticKernelAPI/SemanticKernelAPI.csproj" -c Release -o /app/build From cedc619fc892be3b4c7f1376da2f3dbdff1dc186 Mon Sep 17 00:00:00 2001 From: Matthew Alan Gray Date: Mon, 29 Jan 2024 09:41:57 -0600 Subject: [PATCH 6/6] Updating SemanticKernel API Dockerfile to reference SemanticKernel-obsolete --- src/dotnet/SemanticKernelAPI/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/SemanticKernelAPI/Dockerfile b/src/dotnet/SemanticKernelAPI/Dockerfile index 6486222484..ca603f9e66 100644 --- a/src/dotnet/SemanticKernelAPI/Dockerfile +++ b/src/dotnet/SemanticKernelAPI/Dockerfile @@ -22,7 +22,7 @@ RUN dotnet build "dotnet/SemanticKernelAPI/SemanticKernelAPI.csproj" -c Release FROM build AS publish RUN dotnet publish "dotnet/Common/Common.csproj" -c Release -o /app/publish /p:UseAppHost=false -RUN dotnet publish "dotnet/SemanticKernel/SemanticKernel.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "dotnet/SemanticKernel-obsolete/SemanticKernel-obsolete.csproj" -c Release -o /app/publish /p:UseAppHost=false RUN dotnet publish "dotnet/SemanticKernelAPI/SemanticKernelAPI.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final