Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

fix(kube): deploy app with image [EE-5738] (#9194)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-07-12 10:26:50 +04:00 • committed by GitHub
parent a9c6fa5ac2
commit de5c959e24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/kubernetes/converters/daemonSet.js
View file

@ -10,7 +10,7 @@ import {
import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper';
import { buildImageFullURI } from '@/react/docker/images/utils';
import { buildImageFullURIFromModel } from '@/react/docker/images/utils';
class KubernetesDaemonSetConverter {
/**
@ -51,7 +51,7 @@ class KubernetesDaemonSetConverter {
payload.spec.template.metadata.labels.app = daemonSet.Name;
payload.spec.template.metadata.labels[KubernetesPortainerApplicationNameLabel] = daemonSet.ApplicationName;
payload.spec.template.spec.containers[0].name = daemonSet.Name;
payload.spec.template.spec.containers[0].image = buildImageFullURI(daemonSet.ImageModel);
payload.spec.template.spec.containers[0].image = buildImageFullURIFromModel(daemonSet.ImageModel);
if (daemonSet.ImageModel.Registry && daemonSet.ImageModel.Registry.Authentication) {
payload.spec.template.spec.imagePullSecrets = [{ name: `registry-${daemonSet.ImageModel.Registry.Id}` }];
}

4
app/kubernetes/converters/deployment.js
View file

@ -11,7 +11,7 @@ import {
import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper';
import { buildImageFullURI } from '@/react/docker/images/utils';
import { buildImageFullURIFromModel } from '@/react/docker/images/utils';
class KubernetesDeploymentConverter {
/**
@ -56,7 +56,7 @@ class KubernetesDeploymentConverter {
payload.spec.template.spec.containers[0].name = deployment.Name;
if (deployment.ImageModel) {
payload.spec.template.spec.containers[0].image = buildImageFullURI(deployment.ImageModel);
payload.spec.template.spec.containers[0].image = buildImageFullURIFromModel(deployment.ImageModel);
if (deployment.ImageModel.Registry && deployment.ImageModel.Registry.Authentication) {
payload.spec.template.spec.imagePullSecrets = [{ name: `registry-${deployment.ImageModel.Registry.Id}` }];

4
app/kubernetes/converters/statefulSet.js
View file

@ -12,7 +12,7 @@ import {
import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper';
import { buildImageFullURI } from '@/react/docker/images/utils';
import { buildImageFullURIFromModel } from '@/react/docker/images/utils';
import KubernetesPersistentVolumeClaimConverter from './persistentVolumeClaim';
class KubernetesStatefulSetConverter {
@ -58,7 +58,7 @@ class KubernetesStatefulSetConverter {
payload.spec.template.metadata.labels[KubernetesPortainerApplicationNameLabel] = statefulSet.ApplicationName;
payload.spec.template.spec.containers[0].name = statefulSet.Name;
if (statefulSet.ImageModel.Image) {
payload.spec.template.spec.containers[0].image = buildImageFullURI(statefulSet.ImageModel);
payload.spec.template.spec.containers[0].image = buildImageFullURIFromModel(statefulSet.ImageModel);
if (statefulSet.ImageModel.Registry && statefulSet.ImageModel.Registry.Authentication) {
payload.spec.template.spec.imagePullSecrets = [{ name: `registry-${statefulSet.ImageModel.Registry.Id}` }];
}