From 94872b25b258ed3a98c96dc279445e61c4dd3484 Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Thu, 19 Dec 2024 23:03:54 +0000 Subject: [PATCH 1/2] fix: Move nkp-pulse repos to a seperate file so we can exclude them --- .exclude-airgapped | 3 +++ common/helm-repositories/kustomization.yaml | 1 + common/helm-repositories/mesosphere-repos.yaml | 11 +---------- common/helm-repositories/nkp-pulse-repos.yaml | 11 +++++++++++ justfile | 1 + 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 common/helm-repositories/nkp-pulse-repos.yaml diff --git a/.exclude-airgapped b/.exclude-airgapped index 8a5b077a9..4074bd08c 100644 --- a/.exclude-airgapped +++ b/.exclude-airgapped @@ -1,3 +1,6 @@ common/helm-repositories/ai-navigator-repos.yaml services/ai-navigator-app services/ai-navigator-cluster-info-agent +common/helm-repositories/nkp-pulse-repos.yaml +services/nkp-pulse-management +services/nkp-pulse-workspace diff --git a/common/helm-repositories/kustomization.yaml b/common/helm-repositories/kustomization.yaml index 6eaf6759e..2d6415c62 100644 --- a/common/helm-repositories/kustomization.yaml +++ b/common/helm-repositories/kustomization.yaml @@ -16,6 +16,7 @@ resources: - kubefed.yaml - kubetunnel.yaml - mesosphere-repos.yaml + - nkp-pulse-repos.yaml - nvidia.yaml - prometheus-community.yaml - reloader.yaml diff --git a/common/helm-repositories/mesosphere-repos.yaml b/common/helm-repositories/mesosphere-repos.yaml index e328f951e..a08405f89 100644 --- a/common/helm-repositories/mesosphere-repos.yaml +++ b/common/helm-repositories/mesosphere-repos.yaml @@ -50,13 +50,4 @@ spec: interval: 10m timeout: 1m url: "${helmMirrorURL:=https://mesosphere.github.io/dkp-insights-charts-attached}" ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: mesosphere.github.io-nkp-pulse-charts - namespace: kommander-flux -spec: - interval: 10m - timeout: 1m - url: "${helmMirrorURL:=https://mesosphere.github.io/nkp-pulse}" + diff --git a/common/helm-repositories/nkp-pulse-repos.yaml b/common/helm-repositories/nkp-pulse-repos.yaml new file mode 100644 index 000000000..3877f4011 --- /dev/null +++ b/common/helm-repositories/nkp-pulse-repos.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: mesosphere.github.io-nkp-pulse-charts + namespace: kommander-flux +spec: + interval: 10m + timeout: 1m + url: "${helmMirrorURL:=https://mesosphere.github.io/nkp-pulse}" + diff --git a/justfile b/justfile index fad2a91e7..a66db0d11 100644 --- a/justfile +++ b/justfile @@ -67,6 +67,7 @@ _cleanup: _prepare-files-for-a-bundle output_dir: rsync --quiet --archive --recursive --files-from={{ include_file }} --exclude-from={{ exclude_file }} {{ justfile_directory() }} {{ output_dir }} yq 'del(.resources[] | select(. == "ai-navigator-repos.yaml"))' --inplace {{ output_dir }}/common/helm-repositories/kustomization.yaml + yq 'del(.resources[] | select(. == "nkp-pulse-repos.yaml"))' --inplace {{ output_dir }}/common/helm-repositories/kustomization.yaml import 'just/test.just' From 75c5b76109c544b1b1d249e443eab8add9980950 Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Thu, 19 Dec 2024 23:23:47 +0000 Subject: [PATCH 2/2] fix: pre-commit fixes --- common/helm-repositories/mesosphere-repos.yaml | 1 - common/helm-repositories/nkp-pulse-repos.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/common/helm-repositories/mesosphere-repos.yaml b/common/helm-repositories/mesosphere-repos.yaml index a08405f89..e7f62761b 100644 --- a/common/helm-repositories/mesosphere-repos.yaml +++ b/common/helm-repositories/mesosphere-repos.yaml @@ -50,4 +50,3 @@ spec: interval: 10m timeout: 1m url: "${helmMirrorURL:=https://mesosphere.github.io/dkp-insights-charts-attached}" - diff --git a/common/helm-repositories/nkp-pulse-repos.yaml b/common/helm-repositories/nkp-pulse-repos.yaml index 3877f4011..7a8302603 100644 --- a/common/helm-repositories/nkp-pulse-repos.yaml +++ b/common/helm-repositories/nkp-pulse-repos.yaml @@ -8,4 +8,3 @@ spec: interval: 10m timeout: 1m url: "${helmMirrorURL:=https://mesosphere.github.io/nkp-pulse}" -