github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(k8s): add ingressClassName to payload EE-2129 (#6265) 

* add ingressClassName to payload

* add IngressClass.Name into formValues
pull/6366/head
Richard Wei 2022-01-10 09:02:02 +13:00 committed by GitHub
parent c24d8fab0f
commit 84f354452b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/kubernetes/ingress/converter.js
View File

@ -91,6 +91,7 @@ export class KubernetesIngressConverter {
_.extend(res.Annotations, KubernetesIngressClassRewriteTargetAnnotations[formValues.IngressClass.Type]); _.extend(res.Annotations, KubernetesIngressClassRewriteTargetAnnotations[formValues.IngressClass.Type]);
} }
res.Annotations[KubernetesIngressClassAnnotation] = formValues.IngressClass.Name; res.Annotations[KubernetesIngressClassAnnotation] = formValues.IngressClass.Name;
res.IngressClassName = formValues.IngressClass.Name;
res.Hosts = formValues.Hosts; res.Hosts = formValues.Hosts;
res.Paths = formValues.Paths; res.Paths = formValues.Paths;
return res; return res;
@ -139,7 +140,7 @@ export class KubernetesIngressConverter {
const res = new KubernetesIngressCreatePayload(); const res = new KubernetesIngressCreatePayload();
res.metadata.name = data.Name; res.metadata.name = data.Name;
res.metadata.namespace = data.Namespace; res.metadata.namespace = data.Namespace;
res.metadata.annotations = data.Annotations; res.spec.ingressClassName = data.IngressClassName;
if (data.Paths && data.Paths.length) { if (data.Paths && data.Paths.length) {
_.forEach(data.Paths, (p) => { _.forEach(data.Paths, (p) => {
if (p.Host === 'undefined' || p.Host === undefined) { if (p.Host === 'undefined' || p.Host === undefined) {

1
app/kubernetes/ingress/payloads.js
View File

@ -4,6 +4,7 @@ export function KubernetesIngressCreatePayload() {
return { return {
metadata: new KubernetesCommonMetadataPayload(), metadata: new KubernetesCommonMetadataPayload(),
spec: { spec: {
ingressClassName: '',
rules: [], rules: [],
}, },
}; };