Skip to content

Commit 0c9cee5

Browse files
authored
feat: add terminal-controller-manager to OCM component (#55)
* feat: add terminal-controller-manager to platform-mesh OCM component Add github.com/platform-mesh/terminal-controller-manager as a new component reference in the aggregated platform-mesh OCM component, including version fetching, change detection, and build parameters in the CI workflow. Signed-off-by: Bastian Echterhölter <bastian.echterhoelter@sap.com> On-behalf-of: @SAP <bastian.echterhoelter@sap.com> * fix: correct init-agent env var key in release notes formatter The tp_map in format-notes.sh referenced INIT_AGENT_VERSION, but the workflow uses INIT_AGENT_CHART_VERSION. This mismatch caused init-agent to be missing from third-party component release notes. Signed-off-by: Bastian Echterhölter <bastian.echterhoelter@sap.com> On-behalf-of: @SAP <bastian.echterhoelter@sap.com> --------- Signed-off-by: Bastian Echterhölter <bastian.echterhoelter@sap.com>
1 parent 1b1e3ec commit 0c9cee5

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.github/workflows/ocm.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ jobs:
139139
echo IAM_SERVICE_VERSION=$(./ocm get componentversions --latest github.com/platform-mesh/iam-service --repo ghcr.io/platform-mesh -o json | jq -r '.items[0].component.version') >> $GITHUB_ENV
140140
echo IAM_UI_VERSION=$(./ocm get componentversions --latest github.com/platform-mesh/iam-ui --repo ghcr.io/platform-mesh -o json | jq -r '.items[0].component.version') >> $GITHUB_ENV
141141
echo MARKETPLACE_UI_VERSION=$(./ocm get componentversions --latest github.com/platform-mesh/marketplace-ui --repo ghcr.io/platform-mesh -o json | jq -r '.items[0].component.version') >> $GITHUB_ENV
142+
echo TERMINAL_CONTROLLER_MANAGER_VERSION=$(./ocm get componentversions --latest github.com/platform-mesh/terminal-controller-manager --repo ghcr.io/platform-mesh -o json | jq -r '.items[0].component.version') >> $GITHUB_ENV
142143
# Fetch etcd-druid version from Gardener registry
143144
echo GARDENER_ETCD_DRUID_VERSION=$(./ocm get componentversions --latest github.com/gardener/etcd-druid --repo europe-docker.pkg.dev/gardener-project/releases -o json | jq -r '.items[0].component.version') >> $GITHUB_ENV
144145
# Get current platform-mesh version
@@ -257,6 +258,7 @@ jobs:
257258
CURRENT_IAM_SERVICE=$(yq eval '.component.componentReferences[] | select(.name == "iam-service") | .version' current_pm_component.yaml 2>/dev/null || echo "")
258259
CURRENT_IAM_UI=$(yq eval '.component.componentReferences[] | select(.name == "iam-ui") | .version' current_pm_component.yaml 2>/dev/null || echo "")
259260
CURRENT_MARKETPLACE_UI=$(yq eval '.component.componentReferences[] | select(.name == "marketplace-ui") | .version' current_pm_component.yaml 2>/dev/null || echo "")
261+
CURRENT_TERMINAL_CONTROLLER_MANAGER=$(yq eval '.component.componentReferences[] | select(.name == "terminal-controller-manager") | .version' current_pm_component.yaml 2>/dev/null || echo "")
260262
261263
# Extract third-party dependency versions
262264
CURRENT_ISTIO=$(yq eval '.component.componentReferences[] | select(.name == "istio-base") | .version' current_pm_component.yaml 2>/dev/null || echo "")
@@ -369,6 +371,11 @@ jobs:
369371
NEEDS_UPDATE=true
370372
fi
371373
374+
if [ "$CURRENT_TERMINAL_CONTROLLER_MANAGER" != "${{ env.TERMINAL_CONTROLLER_MANAGER_VERSION }}" ]; then
375+
echo "Terminal controller manager: $CURRENT_TERMINAL_CONTROLLER_MANAGER -> ${{ env.TERMINAL_CONTROLLER_MANAGER_VERSION }}"
376+
NEEDS_UPDATE=true
377+
fi
378+
372379
# Check third-party dependency versions
373380
if [ "$CURRENT_KCP_OPERATOR" != "${{ env.KCP_OPERATOR_CHART_VERSION }}" ]; then
374381
echo "KCP Operator: $CURRENT_KCP_OPERATOR -> ${{ env.KCP_OPERATOR_CHART_VERSION }}"
@@ -461,7 +468,8 @@ jobs:
461468
EXAMPLE_HTTPBIN_OPERATOR_VERSION=${{ env.EXAMPLE_HTTPBIN_OPERATOR_VERSION }} \
462469
IAM_SERVICE_VERSION=${{ env.IAM_SERVICE_VERSION }} \
463470
IAM_UI_VERSION=${{ env.IAM_UI_VERSION }} \
464-
MARKETPLACE_UI_VERSION=${{ env.MARKETPLACE_UI_VERSION }}
471+
MARKETPLACE_UI_VERSION=${{ env.MARKETPLACE_UI_VERSION }} \
472+
TERMINAL_CONTROLLER_MANAGER_VERSION=${{ env.TERMINAL_CONTROLLER_MANAGER_VERSION }}
465473
466474
- name: Transfer to OCM REPO
467475
if: steps.version_check.outputs.needs_update == 'true'

constructor/component-constructor.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@ components:
220220
- name: traefik
221221
componentName: github.com/traefik/traefik
222222
version: {{ .TRAEFIK_VERSION }}
223+
- name: terminal-controller-manager
224+
componentName: github.com/platform-mesh/terminal-controller-manager
225+
version: {{ .TERMINAL_CONTROLLER_MANAGER_VERSION }}
223226
- name: cert-manager
224227
componentName: github.com/cert-manager/cert-manager
225228
version: {{ .CERT_MANAGER_VERSION }}

hack/format-notes.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ EOF
336336
["CERT_MANAGER_VERSION"]="Cert Manager|cert-manager/cert-manager|"
337337
["OPENFGA_VERSION"]="OpenFGA|openfga/helm-charts|openfga-"
338338
["KCP_OPERATOR_VERSION"]="KCP Operator|kcp-dev/helm-charts|kcp-operator-"
339-
["INIT_AGENT_VERSION"]="init-agent|kcp-dev/helm-charts|init-agent-"
339+
["INIT_AGENT_CHART_VERSION"]="init-agent|kcp-dev/helm-charts|init-agent-"
340340
["GARDENER_ETCD_DRUID_SOURCE_REF"]="etcd-druid|gardener/etcd-druid|"
341341
)
342342

0 commit comments

Comments
 (0)