chore (manifests): Fixes centraldashboard for kustomize 5 (#7451)

This commit is contained in:
Aleksey Karpov 2024-01-27 20:08:15 +03:00 коммит произвёл GitHub
Родитель e719d81fd1
Коммит 0e3c237d43
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
5 изменённых файлов: 103 добавлений и 60 удалений

Просмотреть файл

@ -31,15 +31,15 @@ spec:
protocol: TCP
env:
- name: USERID_HEADER
value: $(CD_USERID_HEADER)
value: CD_USERID_HEADER_PLACEHOLDER
- name: USERID_PREFIX
value: $(CD_USERID_PREFIX)
value: CD_USERID_PREFIX_PLACEHOLDER
- name: PROFILES_KFAM_SERVICE_HOST
value: profiles-kfam.kubeflow
- name: REGISTRATION_FLOW
value: $(CD_REGISTRATION_FLOW)
value: CD_REGISTRATION_FLOW_PLACEHOLDER
- name: DASHBOARD_LINKS_CONFIGMAP
value: $(CD_CONFIGMAP_NAME)
value: CD_CONFIGMAP_NAME_PLACEHOLDER
- name: LOGOUT_URL
value: '/authservice/logout'
- name: POD_NAMESPACE

Просмотреть файл

@ -10,11 +10,6 @@ resources:
- service-account.yaml
- service.yaml
- configmap.yaml
commonLabels:
kustomize.component: centraldashboard
app: centraldashboard
app.kubernetes.io/component: centraldashboard
app.kubernetes.io/name: centraldashboard
images:
- name: docker.io/kubeflownotebookswg/centraldashboard
newName: docker.io/kubeflownotebookswg/centraldashboard
@ -25,46 +20,64 @@ configMapGenerator:
name: centraldashboard-parameters
generatorOptions:
disableNameSuffixHash: true
vars:
- fieldref:
fieldPath: metadata.namespace
name: CD_NAMESPACE
objref:
apiVersion: v1
kind: Service
name: centraldashboard
- fieldref:
fieldPath: data.CD_CLUSTER_DOMAIN
name: CD_CLUSTER_DOMAIN
objref:
apiVersion: v1
kind: ConfigMap
name: centraldashboard-parameters
- fieldref:
labels:
- includeSelectors: true
pairs:
app: centraldashboard
app.kubernetes.io/component: centraldashboard
app.kubernetes.io/name: centraldashboard
kustomize.component: centraldashboard
replacements:
- source:
fieldPath: data.CD_USERID_HEADER
name: CD_USERID_HEADER
objref:
apiVersion: v1
kind: ConfigMap
name: centraldashboard-parameters
- fieldref:
version: v1
targets:
- fieldPaths:
- spec.template.spec.containers.0.env.0.value
select:
group: apps
kind: Deployment
name: centraldashboard
version: v1
- source:
fieldPath: data.CD_USERID_PREFIX
name: CD_USERID_PREFIX
objref:
apiVersion: v1
kind: ConfigMap
name: centraldashboard-parameters
- fieldref:
version: v1
targets:
- fieldPaths:
- spec.template.spec.containers.0.env.1.value
select:
group: apps
kind: Deployment
name: centraldashboard
version: v1
- source:
fieldPath: data.CD_REGISTRATION_FLOW
name: CD_REGISTRATION_FLOW
objref:
apiVersion: v1
kind: ConfigMap
name: centraldashboard-parameters
- fieldref:
version: v1
targets:
- fieldPaths:
- spec.template.spec.containers.0.env.3.value
select:
group: apps
kind: Deployment
name: centraldashboard
version: v1
- source:
fieldPath: metadata.name
name: CD_CONFIGMAP_NAME
objref:
apiVersion: v1
kind: ConfigMap
name: centraldashboard-config
version: v1
targets:
- fieldPaths:
- spec.template.spec.containers.0.env.4.value
select:
group: apps
kind: Deployment
name: centraldashboard
version: v1

Просмотреть файл

@ -1,18 +1,49 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../../base
- virtual-service.yaml
- authorizationpolicy.yaml
namespace: kubeflow
commonLabels:
kustomize.component: centraldashboard
app: centraldashboard
app.kubernetes.io/component: centraldashboard
app.kubernetes.io/name: centraldashboard
replacements:
- source:
fieldPath: metadata.namespace
kind: Service
name: centraldashboard
version: v1
targets:
- fieldPaths:
- spec.http.0.route.0.destination.host
options:
delimiter: .
index: 1
select:
group: networking.istio.io
kind: VirtualService
name: centraldashboard
version: v1alpha3
- source:
fieldPath: data.CD_CLUSTER_DOMAIN
kind: ConfigMap
name: centraldashboard-parameters
version: v1
targets:
- fieldPaths:
- spec.http.0.route.0.destination.host
options:
delimiter: .
index: 3
select:
group: networking.istio.io
kind: VirtualService
name: centraldashboard
version: v1alpha3
configurations:
- params.yaml
labels:
- includeSelectors: true
pairs:
app: centraldashboard
app.kubernetes.io/component: centraldashboard
app.kubernetes.io/name: centraldashboard
kustomize.component: centraldashboard

Просмотреть файл

@ -15,6 +15,6 @@ spec:
uri: /
route:
- destination:
host: centraldashboard.$(CD_NAMESPACE).svc.$(CD_CLUSTER_DOMAIN)
host: centraldashboard.CD_NAMESPACE_PLACEHOLDER.svc.CD_CLUSTER_DOMAIN_PLACEHOLDER
port:
number: 80

Просмотреть файл

@ -1,14 +1,13 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../istio
commonLabels:
kustomize.component: centraldashboard
app: centraldashboard
app.kubernetes.io/component: centraldashboard
app.kubernetes.io/name: centraldashboard
patchesStrategicMerge:
- patches/configmap.yaml
labels:
- includeSelectors: true
pairs:
app: centraldashboard
app.kubernetes.io/component: centraldashboard
app.kubernetes.io/name: centraldashboard
kustomize.component: centraldashboard
patches:
- path: patches/configmap.yaml