Skip to content

Fix kustomize5 warnings #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+38 −30
Open

Fix kustomize5 warnings #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84269a7
# This is a combination of 4 commits.
vikas-saxena02 Mar 29, 2025
1e03a26
fixed based with kustomize edit fix
vikas-saxena02 Apr 16, 2025
0c331b7
resolving merge cnflicts in intel.Dockerfile 4
vikas-saxena02 Apr 16, 2025
c1a7252
# This is a combination of 5 commits.
vikas-saxena02 Apr 16, 2025
922e947
resolving merge cnflicts in intel.Dockerfile 6
vikas-saxena02 Apr 16, 2025
9dffb8a
fixed based with kustomize edit fix
vikas-saxena02 Apr 16, 2025
49c46be
resolving errors after rebase
vikas-saxena02 Apr 16, 2025
afad2b2
removed duplicates
vikas-saxena02 Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions build/base/intel.Dockerfile
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think we should change these.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tanzen-y I think I have messed up my PR. I will be raising a new one soon

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ ARG BASE_LABEL

FROM bash AS downloader

# switch to use the new gpg key
RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -O key.PUB

FROM mpioperator/base:${BASE_LABEL}
Expand All @@ -18,9 +19,10 @@ RUN apt update \
&& echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg trusted=yes] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
&& apt update \
&& apt install -y --no-install-recommends \
dnsutils \
intel-oneapi-mpi-2021.13 \
&& apt remove -y gnupg2 ca-certificates \
libstdc++-12-dev binutils procps clang \
intel-oneapi-compiler-dpcpp-cpp \
intel-oneapi-mpi-devel-2021.13 \
&& apt remove -y gnupg2 ca-certificates apt-transport-https \
&& apt autoremove -y \
&& rm -rf /var/lib/apt/lists/*

Expand Down
12 changes: 7 additions & 5 deletions manifests/base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ resources:
- kubeflow.org_mpijobs.yaml
- deployment.yaml
- service-account.yaml
commonLabels:
kustomize.component: mpi-operator
app: mpi-operator
app.kubernetes.io/name: mpi-operator
app.kubernetes.io/component: mpijob
images:
- name: mpioperator/mpi-operator
newName: mpioperator/mpi-operator
newTag: latest
labels:
- includeSelectors: true
pairs:
app: mpi-operator
app.kubernetes.io/component: mpijob
app.kubernetes.io/name: mpi-operator
kustomize.component: mpi-operator
24 changes: 13 additions & 11 deletions manifests/overlays/kubeflow/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ kind: Kustomization
resources:
- ../../base
namespace: kubeflow
commonLabels:
kustomize.component: mpi-operator
app: mpi-operator
app.kubernetes.io/name: mpi-operator
app.kubernetes.io/component: mpijob
patches:
- target:
group: apps
version: v1
kind: Deployment
name: mpi-operator
path: ./patch.yaml
- path: ./patch.yaml
target:
group: apps
kind: Deployment
name: mpi-operator
version: v1
labels:
- includeSelectors: true
pairs:
app: mpi-operator
app.kubernetes.io/component: mpijob
app.kubernetes.io/name: mpi-operator
kustomize.component: mpi-operator
24 changes: 13 additions & 11 deletions manifests/overlays/standalone/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@ resources:
- ../../base
- namespace.yaml
namespace: mpi-operator
commonLabels:
kustomize.component: mpi-operator
app: mpi-operator
app.kubernetes.io/name: mpi-operator
app.kubernetes.io/component: mpijob
images:
- name: mpioperator/mpi-operator
newName: mpioperator/mpi-operator
newTag: master
patches:
- target:
group: apps
version: v1
kind: Deployment
name: mpi-operator
path: ./patch.yaml
- path: ./patch.yaml
target:
group: apps
kind: Deployment
name: mpi-operator
version: v1
labels:
- includeSelectors: true
pairs:
app: mpi-operator
app.kubernetes.io/component: mpijob
app.kubernetes.io/name: mpi-operator
kustomize.component: mpi-operator
Loading