mount up-config for auth with marketplace

Author: tnthornton

.github/workflows/ci.yaml

@@ -102,7 +102,7 @@ jobs:
       - name: Run Unit Tests
         run: make test
 
-  publish-artifacts:
+  publish-image:
     runs-on: ubuntu-latest
     needs:
       - detect-noop
@@ -156,3 +156,63 @@ jobs:
         env:
           XPKG_ACCESS_ID: ${{ secrets.XPKG_ACCESS_ID }}
           XPKG_TOKEN: ${{ secrets.XPKG_TOKEN }}
+
+  publish-addon:
+    runs-on: ubuntu-latest
+    needs:
+      - detect-noop
+      - unit-tests
+      - lint
+      - publish-image
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install up
+        uses: upbound/action-up@v1
+        with:
+          skip-login: true
+          channel: main
+          version: v0.39.0-384.g0a0c8634
+
+      - name: Login to Upbound Marketplace
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+        with:
+          registry: xpkg.upbound.io/upbound
+          username: ${{ secrets.XPKG_ACCESS_ID }}
+          password: ${{ secrets.XPKG_ACCESS_TOKEN }}
+
+      - name: Build chart
+        run: |
+          make helm.build
+
+      - name: Create working directory
+        run: |
+          mkdir -p tmp-addon-xpkg
+          cd tmp-addon-xpkg
+
+      - name: Build and Publish
+        working-directory: tmp-addon-xpkg
+        if: env.XPKG_ACCESS_ID != ''
+        run: |
+          CHART_VERSION=$(make --no-print-directory -C ../ helm.version)
+          cp ../crossplane.yaml .
+
+          # Build resources
+          mkdir helm
+          mv ../_output/charts/martetplace-mcp-server-${CHART_VERSION}.tgz helm/chart.tgz
+
+          # Build artifact
+          up xpkg build
+
+          # Find artifact
+          XPKG_FILENAME=$(find . -name "*.xpkg" -type f -printf "%f\n")
+          echo $XPKG_FILENAME
+
+          # Publish artifact
+          export ADDON_NAME=addon-$(printf '%s' "$GITHUB_REPOSITORY" | sed 's/.*\///')
+          echo $ADDON_NAME
+
+          up xpkg push xpkg.upbound.io/upbound/$ADDON_NAME:$CHART_VERSION -f $XPKG_FILENAME

cluster/charts/marketplace-mcp-server/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "controlplane-mcp-server.name" -}}
+{{- define "marketplace-mcp-server.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 "controlplane-mcp-server.fullname" -}}
+{{- define "marketplace-mcp-server.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 "controlplane-mcp-server.chart" -}}
+{{- define "marketplace-mcp-server.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "controlplane-mcp-server.labels" -}}
-helm.sh/chart: {{ include "controlplane-mcp-server.chart" . }}
-{{ include "controlplane-mcp-server.selectorLabels" . }}
+{{- define "marketplace-mcp-server.labels" -}}
+helm.sh/chart: {{ include "marketplace-mcp-server.chart" . }}
+{{ include "marketplace-mcp-server.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 "controlplane-mcp-server.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "controlplane-mcp-server.name" . }}
+{{- define "marketplace-mcp-server.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "marketplace-mcp-server.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "controlplane-mcp-server.serviceAccountName" -}}
+{{- define "marketplace-mcp-server.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "controlplane-mcp-server.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "marketplace-mcp-server.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

cluster/charts/marketplace-mcp-server/templates/deploymentruntimeconfig.yaml

@@ -34,4 +34,12 @@ spec:
             args:
             {{- with .Values.extraArgs.controlplaneMcpServer }}
               {{- toYaml . | nindent 12 }}
-            {{- end }}
+            {{- end }}
+            volumeMounts:
+            - mountPath: /mcp/.up/
+              name: up-config
+              readOnly: true
+          volumes:
+          - name: up-config
+            secret:
+              secretName: {{ .Values.upConfig.secretName }}

cluster/charts/marketplace-mcp-server/values.yaml

@@ -15,8 +15,11 @@ extraArgs:
   # packageRuntime:
   # - --debug
   packageRuntime: []
-  # controlplaneMcpServer is the name of the controlplane-mcp-server sidecar.
+  # marketplaceMcpServer is the name of the marketplace-mcp-server sidecar.
   # example
   # marketplaceMcpServer:
   # - --debug
   marketplaceMcpServer: []
+
+upConfig:
+  secretName: up-config