Skip to content

Commit

Permalink
Merge branch 'main' into Shubham/Bump-Traefik-fwd-auth
Browse files Browse the repository at this point in the history
  • Loading branch information
shubham2g authored Dec 20, 2024
2 parents 5f8ce36 + 4a12265 commit 4869721
Show file tree
Hide file tree
Showing 19 changed files with 138 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GIT_OPERATOR_VERSION="v0.13.4"
GIT_OPERATOR_VERSION="v0.13.5"
3 changes: 3 additions & 0 deletions .exclude-airgapped
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions .github/service-labeler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,14 @@ services/nkp-insights-management:
- changed-files:
- any-glob-to-any-file:
- services/nkp-insights-management/**
services/nkp-pulse-management:
- changed-files:
- any-glob-to-any-file:
- services/nkp-pulse-management/**
services/nkp-pulse-workspace:
- changed-files:
- any-glob-to-any-file:
- services/nkp-pulse-workspace/**
services/nvidia-gpu-operator:
- changed-files:
- any-glob-to-any-file:
Expand Down
1 change: 1 addition & 0 deletions common/helm-repositories/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ resources:
- kubefed.yaml
- kubetunnel.yaml
- mesosphere-repos.yaml
- nkp-pulse-repos.yaml
- nvidia.yaml
- prometheus-community.yaml
- reloader.yaml
Expand Down
10 changes: 10 additions & 0 deletions common/helm-repositories/nkp-pulse-repos.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
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}"
1 change: 1 addition & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
12 changes: 10 additions & 2 deletions licenses.d2iq.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ resources:
sources:
- ref: ${image_tag}
url: https://github.com/mesosphere/dkp-insights
- container_image: docker.io/mesosphere/git-operator:v0.13.4
- container_image: docker.io/mesosphere/git-operator:v0.13.5
sources:
- ref: ${image_tag}
url: https://github.com/mesosphere/git-operator
- container_image: docker.io/mesosphere/gitwebserver:v0.13.4
- container_image: docker.io/mesosphere/gitwebserver:v0.13.5
sources:
- ref: ${image_tag}
url: https://github.com/mesosphere/git-operator
Expand Down Expand Up @@ -232,6 +232,14 @@ resources:
sources:
- ref: ${image_tag}
url: https://github.com/mesosphere/kubetunnel
- container_image: docker.io/mesosphere/nkp-pulse-management:v0.0.1-dev.0
sources:
- ref: ${image_tag}
url: https://github.com/mesosphere/nkp-pulse
- container_image: docker.io/mesosphere/nkp-pulse-workspace:v0.0.1-dev.0
sources:
- ref: ${image_tag}
url: https://github.com/mesosphere/nkp-pulse
- container_image: docker.io/mesosphere/traefik-forward-auth:v3.2.1
sources:
- license_path: LICENSE.thomseddon.md
Expand Down
10 changes: 4 additions & 6 deletions services/git-operator/0.1.3/git-operator-manifests/all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,6 @@ data:
server {
server_name _;
listen 9443 ssl default_server;
listen [::]:9443 ssl default_server;
ssl_certificate /etc/nginx/tls/tls.crt;
ssl_certificate_key /etc/nginx/tls/tls.key;
Expand Down Expand Up @@ -714,7 +713,6 @@ data:
server {
server_name _;
listen 8443 ssl default_server;
listen [::]:8443 ssl default_server;
ssl_certificate /etc/nginx/tls/tls.crt;
ssl_certificate_key /etc/nginx/tls/tls.key;
Expand Down Expand Up @@ -875,7 +873,7 @@ spec:
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
- --namespace=${NAMESPACE:=git-operator-system}
image: docker.io/mesosphere/git-operator:v0.13.4
image: docker.io/mesosphere/git-operator:v0.13.5
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -979,7 +977,7 @@ spec:
- env:
- name: GIT_VOLUME_PATH
value: /volumes/git
image: docker.io/mesosphere/gitwebserver:v0.13.4
image: docker.io/mesosphere/gitwebserver:v0.13.5
imagePullPolicy: IfNotPresent
livenessProbe:
initialDelaySeconds: 3
Expand Down Expand Up @@ -1019,7 +1017,7 @@ spec:
- /volumes/admin-tmp/snapshots
- --snapshot-symlink
- /volumes/admin-tmp/active-snapshot
image: docker.io/mesosphere/gitwebserver:v0.13.4
image: docker.io/mesosphere/gitwebserver:v0.13.5
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down Expand Up @@ -1061,7 +1059,7 @@ spec:
env:
- name: ADMIN_REPO_PATH
value: /volumes/admin/admin.git
image: docker.io/mesosphere/gitwebserver:v0.13.4
image: docker.io/mesosphere/gitwebserver:v0.13.5
imagePullPolicy: IfNotPresent
name: init-admin-repo
securityContext:
Expand Down
1 change: 1 addition & 0 deletions services/kommander/0.14.0/defaults/cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ data:
- "dex"
- "dex-k8s-authenticator"
- "nkp-insights-management"
- "nkp-pulse-management"
- "git-operator"
- "karma"
- "kommander"
Expand Down
9 changes: 9 additions & 0 deletions services/nkp-pulse-management/metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
type: internal
scope:
- workspace
licensing:
- Starter
- Pro
- Ultimate
- Essentials
- Enterprise
10 changes: 10 additions & 0 deletions services/nkp-pulse-management/v0.0.1-dev.0/defaults/cm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: nkp-pulse-management-v0.0.1-dev.0-d2iq-defaults
namespace: ${releaseNamespace}
data:
values.yaml: |
workspaceApp:
kind: ClusterApp
name: nkp-pulse-workspace-v0.0.1-dev.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- cm.yaml
23 changes: 23 additions & 0 deletions services/nkp-pulse-management/v0.0.1-dev.0/helmrelease.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: nkp-pulse-management
namespace: ${releaseNamespace}
spec:
chart:
spec:
chart: nkp-pulse-management
sourceRef:
kind: HelmRepository
name: mesosphere.github.io-nkp-pulse-charts
namespace: kommander-flux
version: v0.0.1-dev.0
interval: 15s
releaseName: nkp-pulse-management
targetNamespace: ${releaseNamespace}
upgrade:
remediation:
strategy: uninstall
valuesFrom:
- kind: ConfigMap
name: nkp-pulse-management-v0.0.1-dev.0-d2iq-defaults
4 changes: 4 additions & 0 deletions services/nkp-pulse-management/v0.0.1-dev.0/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helmrelease.yaml
9 changes: 9 additions & 0 deletions services/nkp-pulse-workspace/metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
type: internal
scope:
- workspace
licensing:
- Starter
- Pro
- Ultimate
- Essentials
- Enterprise
7 changes: 7 additions & 0 deletions services/nkp-pulse-workspace/v0.0.1-dev.0/defaults/cm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: nkp-pulse-workspace-v0.0.1-dev.0-d2iq-defaults
namespace: ${releaseNamespace}
data:
values.yaml: ""
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- cm.yaml
23 changes: 23 additions & 0 deletions services/nkp-pulse-workspace/v0.0.1-dev.0/helmrelease.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: nkp-pulse-workspace
namespace: ${releaseNamespace}
spec:
chart:
spec:
chart: nkp-pulse-workspace
sourceRef:
kind: HelmRepository
name: mesosphere.github.io-nkp-pulse-charts
namespace: kommander-flux
version: v0.0.1-dev.0
interval: 15s
releaseName: nkp-pulse-workspace
targetNamespace: ${releaseNamespace}
upgrade:
remediation:
strategy: uninstall
valuesFrom:
- kind: ConfigMap
name: nkp-pulse-workspace-v0.0.1-dev.0-d2iq-defaults
4 changes: 4 additions & 0 deletions services/nkp-pulse-workspace/v0.0.1-dev.0/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helmrelease.yaml

0 comments on commit 4869721

Please sign in to comment.