From 691580f694f265517d8d5832685919a6ab4a44b4 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 17 Jan 2025 00:50:24 +0100 Subject: [PATCH] Fix minor issues in oka-generate: add version, add wait true in ks, simplifiy namespace manifest Change-Id: I556ef40c96eac4154fdd1f4bf9ae1a153f0a5e24 Signed-off-by: garciadeblas --- osmclient/templates/oka/manifest-helmrelease.j2 | 1 + osmclient/templates/oka/template-kustomization.j2 | 1 + osmclient/templates/oka/template-namespace.j2 | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/osmclient/templates/oka/manifest-helmrelease.j2 b/osmclient/templates/oka/manifest-helmrelease.j2 index 075b816..00b56c9 100644 --- a/osmclient/templates/oka/manifest-helmrelease.j2 +++ b/osmclient/templates/oka/manifest-helmrelease.j2 @@ -24,6 +24,7 @@ spec: chart: spec: chart: {{ helm_chart }} + {% if version %}version: '{{ version }}'{% endif %} reconcileStrategy: ChartVersion sourceRef: kind: HelmRepository diff --git a/osmclient/templates/oka/template-kustomization.j2 b/osmclient/templates/oka/template-kustomization.j2 index 1cca017..ac967dd 100644 --- a/osmclient/templates/oka/template-kustomization.j2 +++ b/osmclient/templates/oka/template-kustomization.j2 @@ -24,6 +24,7 @@ spec: interval: 1h0m0s path: {{ manifest_folder }} prune: true + wait: true sourceRef: kind: GitRepository name: sw-catalogs diff --git a/osmclient/templates/oka/template-namespace.j2 b/osmclient/templates/oka/template-namespace.j2 index 7293d5c..1fb0650 100644 --- a/osmclient/templates/oka/template-namespace.j2 +++ b/osmclient/templates/oka/template-namespace.j2 @@ -18,8 +18,5 @@ apiVersion: v1 kind: Namespace metadata: - creationTimestamp: null name: {{ namespace }} -spec: {} -status: {} -- 2.25.1