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

fix(annotations): parse annotation keys in angular forms [r8s-170] (#233)

release/2.25
Ali 2024-12-11 17:50:08 +13:00 committed by GitHub
parent 94d2e32b49
commit e1388eff84
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/kubernetes/converters/configuration.js
View File

@ -19,7 +19,8 @@ class KubernetesConfigurationConverter {
res.IsRegistrySecret = secret.IsRegistrySecret; res.IsRegistrySecret = secret.IsRegistrySecret;
res.SecretType = secret.SecretType; res.SecretType = secret.SecretType;
if (secret.Annotations) { if (secret.Annotations) {
res.ServiceAccountName = secret.Annotations['kubernetes.io/service-account.name']; const serviceAccountAnnotation = secret.Annotations.find((a) => a.key === 'kubernetes.io/service-account.name');
res.ServiceAccountName = serviceAccountAnnotation ? serviceAccountAnnotation.value : undefined;
} }
res.Labels = secret.Labels; res.Labels = secret.Labels;
return res; return res;

5
app/kubernetes/converters/secret.js
View File

@ -109,7 +109,10 @@ class KubernetesSecretConverter {
res.Type = formValues.customType; res.Type = formValues.customType;
} }
if (formValues.Type === KubernetesSecretTypeOptions.SERVICEACCOUNTTOKEN.value) { if (formValues.Type === KubernetesSecretTypeOptions.SERVICEACCOUNTTOKEN.value) {
res.Annotations = [{ name: 'kubernetes.io/service-account.name', value: formValues.ServiceAccountName }]; const serviceAccountAnnotation = formValues.Annotations.find((a) => a.key === 'kubernetes.io/service-account.name');
if (!serviceAccountAnnotation) {
res.Annotations.push({ key: 'kubernetes.io/service-account.name', value: formValues.ServiceAccountName });
}
} }
return res; return res;
} }

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

@ -118,7 +118,7 @@ export class KubernetesIngressConverter {
const res = new KubernetesIngress(); const res = new KubernetesIngress();
res.Name = formValues.IngressClass.Name; res.Name = formValues.IngressClass.Name;
res.Namespace = formValues.Namespace; res.Namespace = formValues.Namespace;
const pairs = _.map(formValues.Annotations, (a) => [a.Key, a.Value]); const pairs = _.map(formValues.Annotations, (a) => [a.key, a.value]);
res.Annotations = _.fromPairs(pairs); res.Annotations = _.fromPairs(pairs);
res.Annotations[PortainerIngressClassTypes] = formValues.IngressClass.Name; res.Annotations[PortainerIngressClassTypes] = formValues.IngressClass.Name;
res.IngressClassName = formValues.IngressClass.Name; res.IngressClassName = formValues.IngressClass.Name;
@ -149,8 +149,8 @@ export class KubernetesIngressConverter {
const annotations = _.map(_.toPairs(ingress.Annotations), ([key, value]) => { const annotations = _.map(_.toPairs(ingress.Annotations), ([key, value]) => {
if (key !== PortainerIngressClassTypes) { if (key !== PortainerIngressClassTypes) {
const annotation = new KubernetesResourcePoolIngressClassAnnotationFormValue(); const annotation = new KubernetesResourcePoolIngressClassAnnotationFormValue();
annotation.Key = key; annotation.key = key;
annotation.Value = value; annotation.value = value;
return annotation; return annotation;
} }
}); });