aubay-oci-deploy-tool 1.0.2 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/argocd/argocd.js +44 -1
- package/argocd/argocd.js.map +1 -1
- package/istio/config.js +8 -6
- package/istio/config.js.map +1 -1
- package/istio/interfaces.d.ts +7 -2
- package/istio/istio.d.ts +2 -2
- package/istio/istio.js +71 -94
- package/istio/istio.js.map +1 -1
- package/package.json +1 -1
package/argocd/argocd.js
CHANGED
|
@@ -108,11 +108,54 @@ class ArgoCd {
|
|
|
108
108
|
#userNameKey: email
|
|
109
109
|
#groupsKey: groups --> Añadimos estas dos por si en un futuro queremos granular permisos por grupos. Habilitamos procesamiento del claim groups
|
|
110
110
|
`,
|
|
111
|
-
//"ui.logo": "https://d2q79iu7y748jz.cloudfront.net/s/_squarelogo/256x256/df56b4d370b83792bb6d2fc465b0a480"
|
|
112
111
|
},
|
|
113
112
|
rbac: {
|
|
114
113
|
"policy.default": "role:admin",
|
|
115
114
|
},
|
|
115
|
+
clusterCredentials: {
|
|
116
|
+
"cluster-sam-lab": {
|
|
117
|
+
server: "https://158.101.180.0:6443",
|
|
118
|
+
config: {
|
|
119
|
+
bearerToken: "eyJhbGciOiJSUzI1NiIsImtpZCI6IkVlNExmT1NUNEVjUUpEenBDWm1vbWNZeDFHbjNweWtRTUd3SWNDSUNSbmsifQ.eyJhdWQiOlsiYXBpIl0sImV4cCI6MTgwMTIzNTMwNiwiaWF0IjoxNzY5Njk5MzA2LCJpc3MiOiJodHRwczovL2t1YmVybmV0ZXMuZGVmYXVsdC5zdmMuY2x1c3Rlci5sb2NhbCIsImp0aSI6ImY5MThlMTI3LTYzNGItNGVmNC04Njc1LTI0ZmQxMDM3MjAzMiIsImt1YmVybmV0ZXMuaW8iOnsibmFtZXNwYWNlIjoiYXJnb2NkLW1hbmFnZWQiLCJzZXJ2aWNlYWNjb3VudCI6eyJuYW1lIjoiYXJnb2NkLXNhIiwidWlkIjoiNjIzNjA4MjEtNTA2Yy00OTdlLWFjY2EtMDM4NTc2ZWU4NzlhIn19LCJuYmYiOjE3Njk2OTkzMDYsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDphcmdvY2QtbWFuYWdlZDphcmdvY2Qtc2EifQ.M1YJFgqIcOfesq9vTATbyPUmZNMNr_6sK6n4S85qz2CvyZ-GzgOf54BdMjQInAXER5oH_uNwbxBPIlIj5k1bhSrbW4Hx9Aq_CfLb8V1cpLhZ0V3uq48TaHTBKMXfm9h8sCb3XYzG3PEqTiyFwdmbV0QhQn5S_MfJfkpgxQX2u-u6ck10zRMcp6asXzfmPe4CB5M4z2FRo-O2B_ZAtIHxZp1VYQLqaRV4yhcdlLbBqMalU3-EQUXTlZTPecJJahlIQJUH6ogQt0BpexJFz_cH52val7XRNZ58paQfhRGr7iSjR4zAtlnXpm9aCNJwqUKlSmSw6KkVBtbyZOuIc5cbOQ",
|
|
120
|
+
tlsClientConfig: {
|
|
121
|
+
insecure: false,
|
|
122
|
+
caData: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURpVENDQW5HZ0F3SUJBZ0lSQUk4cWFsWnNBZE43UmdyMTZJaHhKekl3RFFZSktvWklodmNOQVFFTEJRQXcKWGpFUE1BMEdBMVVFQXd3R1N6aHpJRU5CTVFzd0NRWURWUVFHRXdKVlV6RVBNQTBHQTFVRUJ3d0dRWFZ6ZEdsdQpNUTh3RFFZRFZRUUtEQVpQY21GamJHVXhEREFLQmdOVkJBc01BMDlqYVRFT01Bd0dBMVVFQ0F3RlZHVjRZWE13CkhoY05Nall3TVRFNU1UQXdOREkyV2hjTk16RXdNVEU1TVRBd05ESTJXakJlTVE4d0RRWURWUVFEREFaTE9ITWcKUTBFeEN6QUpCZ05WQkFZVEFsVlRNUTh3RFFZRFZRUUhEQVpCZFhOMGFXNHhEekFOQmdOVkJBb01Cazl5WVdOcwpaVEVNTUFvR0ExVUVDd3dEVDJOcE1RNHdEQVlEVlFRSURBVlVaWGhoY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCCkJRQURnZ0VQQURDQ0FRb0NnZ0VCQU9DbG94L01QTjg0d3VSTkZXRzRSYlVBZjNVeTZBMC96M2grMmNjVzRNWk0KWHhCWGZ4elRZMkh4NzBwUmhLcWJ0OUx4eTF2WDFtQmV4VHpuWW5welBzclNBSzlvV0RDRVlKMEFIZGFWRVhYWQpJcHNWSUdZVitBUHRzSGxqS09mWDhpVThRb2t6RWYxK3FNVHpBckxOMkkzcGhsWGsvY2FUeDJaUWo2R0labmY5CnJwK3VqREk4VEhoaVkwckdjaFdtWXJaU1FPNWNHMVRPMzhJSXRpaFR4OTcyVnhoVTNTT2lOczRlM1c0YlljVlcKS0FOcGtIQlZQNHY4K1lUOTk5R3NYWVhTREpUd2o4eEJZbXd5QnJPUmo1R0dJRFpuTjdOelVMbnVBb1pVZms2VwpwMEpwTXhNdE9Lb05GZHVNU0hYcjBVOWZ5RHZFWmtGUjZneWkvMGhPN2lzQ0F3RUFBYU5DTUVBd0R3WURWUjBUCkFRSC9CQVV3QXdFQi96QU9CZ05WSFE4QkFmOEVCQU1DQVFZd0hRWURWUjBPQkJZRUZGNmdDeEIrbXFFMFFKaUoKdm9rYTlPQlhEUDlBTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFEQkZFNWl1QjRzM1VyYkR0c3hsL2RBL2k2TgpwaEd4MFlZOUtIUERWdXM1amV4aUVDM1dLQVJQbVJuMkZjNFBJK0Y5NmJSOFBBTkdERnBCTGljUGpLaEoyZnFSCjlNWTFiUTBkQmE0TEpzRUQvK2x4V3hES1JrckI1UEhUQ0M2bXExcDVIZHhJWFhJdlNxSGlHdzJtYUVrU2N1c1IKa1pKM29uV1Yyci9OWU4vdUxvajNvSVYxVEczYnI2VTB3KzdYQ2xFMkxjNWtyekd4YU1XTXo5N2N4aC9hLzdJcgpEYm1CL1EvdVZCeldXemsySDlWQVlVUnBSdUdoMDlaOGdzMmorc0o4R2hzOUZDUWF0SFlhU0FoMDIwQXVlajM5CmNqWElOdWxiN2tCdTV2bEM1TlFBRVFjbm1hMjMzdHQwVzJaUkdDVUp5R3J2VjJuaGpIUUFscStaQ2x1ZAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
},
|
|
126
|
+
},
|
|
127
|
+
styles: `
|
|
128
|
+
.login__logo img { display: none !important; }
|
|
129
|
+
.login__logo {
|
|
130
|
+
background-image: url("https://www.aubay-sam.io/resources/default/images/aubay-logo-solo-text.svg") !important;
|
|
131
|
+
background-size: contain !important;
|
|
132
|
+
background-repeat: no-repeat !important;
|
|
133
|
+
background-position: center !important;
|
|
134
|
+
height: 120px !important; /* El logo de login suele ser más grande */
|
|
135
|
+
width: 100% !important;
|
|
136
|
+
margin-bottom: 20px !important;
|
|
137
|
+
}
|
|
138
|
+
.sidebar__logo img, .sidebar__logo-container img { display: none !important; }
|
|
139
|
+
.sidebar__version {display: none !important;}
|
|
140
|
+
.sidebar__logo {
|
|
141
|
+
background-image: url("https://www.aubay-sam.io/resources/default/images/aubay-logo-solo-text.svg");
|
|
142
|
+
background-size: 70% !important;
|
|
143
|
+
background-repeat: no-repeat !important;
|
|
144
|
+
background-position: center !important;
|
|
145
|
+
height: 50px !important;
|
|
146
|
+
margin: 10px 0 !important;
|
|
147
|
+
}
|
|
148
|
+
.login__box_saml .argo-button--xlg span {
|
|
149
|
+
font-size: 0 !important;
|
|
150
|
+
display: block !important;
|
|
151
|
+
}
|
|
152
|
+
.login__box_saml .argo-button--xlg span::before {
|
|
153
|
+
content: "Login via AzureAD" !important;
|
|
154
|
+
font-size: 14px !important;
|
|
155
|
+
visibility: visible !important;
|
|
156
|
+
letter-spacing: normal !important;
|
|
157
|
+
}
|
|
158
|
+
`
|
|
116
159
|
},
|
|
117
160
|
},
|
|
118
161
|
}, { provider, dependsOn: [ns] });
|
package/argocd/argocd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"argocd.js","sourceRoot":"","sources":["../../src/argocd/argocd.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"argocd.js","sourceRoot":"","sources":["../../src/argocd/argocd.ts"],"names":[],"mappings":"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"}
|
package/istio/config.js
CHANGED
|
@@ -8,11 +8,13 @@ const istioCfg = cfg.requireObject("istio");
|
|
|
8
8
|
exports.istioConfig = {
|
|
9
9
|
namespace: istioCfg.namespace,
|
|
10
10
|
chartVersion: istioCfg.chartVersion,
|
|
11
|
-
|
|
12
|
-
...
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
11
|
+
clusters: istioCfg.clusters.map(c => ({
|
|
12
|
+
...c,
|
|
13
|
+
name: `${stack}-${c.name}`,
|
|
14
|
+
lb: c.lb.map(lb => ({
|
|
15
|
+
...lb,
|
|
16
|
+
subnetName: `${stack}-${lb.subnetName}`
|
|
17
|
+
}))
|
|
18
|
+
}))
|
|
17
19
|
};
|
|
18
20
|
//# sourceMappingURL=config.js.map
|
package/istio/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/istio/config.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AAGzC,MAAM,KAAK,GAAW,MAAM,CAAC,QAAQ,EAAE,CAAC;AAExC,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAExC,MAAM,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAc,OAAO,CAAC,CAAC;AAE5C,QAAA,WAAW,GAAgB;IACtC,SAAS,EAAE,QAAQ,CAAC,SAAS;IAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY;IACnC,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/istio/config.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AAGzC,MAAM,KAAK,GAAW,MAAM,CAAC,QAAQ,EAAE,CAAC;AAExC,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAExC,MAAM,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAc,OAAO,CAAC,CAAC;AAE5C,QAAA,WAAW,GAAgB;IACtC,SAAS,EAAE,QAAQ,CAAC,SAAS;IAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY;IACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpC,GAAG,CAAC;QACJ,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,IAAI,EAAE;QAC1B,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACnB,GAAG,EAAE;YACL,UAAU,EAAE,GAAG,KAAK,IAAI,EAAE,CAAC,UAAU,EAAE;SACxC,CAAC,CAAC;KACJ,CAAC,CAAC;CACJ,CAAC"}
|
package/istio/interfaces.d.ts
CHANGED
|
@@ -3,14 +3,19 @@ export interface IstioLbConfig {
|
|
|
3
3
|
name: string;
|
|
4
4
|
type: "public" | "private";
|
|
5
5
|
subnetName: string;
|
|
6
|
+
vaultSecretTLS?: string;
|
|
6
7
|
reservedIpOcid?: string;
|
|
7
8
|
}
|
|
8
9
|
export interface IstioConfig {
|
|
9
10
|
namespace: string;
|
|
10
11
|
chartVersion: string;
|
|
12
|
+
clusters: IClusterConfig[];
|
|
13
|
+
}
|
|
14
|
+
export interface IClusterConfig {
|
|
15
|
+
name: string;
|
|
11
16
|
lb: IstioLbConfig[];
|
|
12
|
-
namespacesToInject
|
|
13
|
-
cnpgNamespace
|
|
17
|
+
namespacesToInject?: string[];
|
|
18
|
+
cnpgNamespace?: string;
|
|
14
19
|
}
|
|
15
20
|
export interface IIstio {
|
|
16
21
|
releases: k8s.helm.v3.Release[];
|
package/istio/istio.d.ts
CHANGED
|
@@ -10,15 +10,15 @@ export declare class Istio implements IIstio {
|
|
|
10
10
|
private opts?;
|
|
11
11
|
releases: k8s.helm.v3.Release[];
|
|
12
12
|
gwCRD: k8s.apiextensions.CustomResource[];
|
|
13
|
+
private externalSecretsByVaultKey;
|
|
13
14
|
constructor(clusters: pulumi.Output<IOkeKubeconfig[]>, subnets: pulumi.Output<oci.core.Subnet[]>, config: IstioConfig, opts?: pulumi.CustomResourceOptions | undefined);
|
|
14
15
|
private deploy;
|
|
15
16
|
private ensureNamespace;
|
|
16
17
|
private installIstioControlPlane;
|
|
17
|
-
private applyNamespaceInjection;
|
|
18
18
|
private createGateways;
|
|
19
|
+
private createExternalSecretTLS;
|
|
19
20
|
private applyServiceLoadBalancerAnnotations;
|
|
20
21
|
private createGatewayCR;
|
|
21
22
|
private applyMtlsStrict;
|
|
22
23
|
private findSubnet;
|
|
23
|
-
private applyCnpgIstioExceptions;
|
|
24
24
|
}
|
package/istio/istio.js
CHANGED
|
@@ -11,6 +11,7 @@ class Istio {
|
|
|
11
11
|
this.opts = opts;
|
|
12
12
|
this.releases = [];
|
|
13
13
|
this.gwCRD = [];
|
|
14
|
+
this.externalSecretsByVaultKey = {};
|
|
14
15
|
this.deploy();
|
|
15
16
|
}
|
|
16
17
|
// ===========================================================
|
|
@@ -21,17 +22,22 @@ class Istio {
|
|
|
21
22
|
const allClusterValues = clusters.map(c => pulumi.all([c.clusterName, c.kubeconfig]));
|
|
22
23
|
pulumi.all(allClusterValues).apply(resolvedClusters => {
|
|
23
24
|
resolvedClusters.forEach(([clusterName, kubeconfig]) => {
|
|
25
|
+
const clusterCfg = this.config.clusters.find(c => c.name === clusterName);
|
|
26
|
+
if (!clusterCfg) {
|
|
27
|
+
pulumi.log.info(`No existe el cluster ${clusterName}`);
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
24
30
|
pulumi.log.info(`Desplegando Istio en cluster: ${clusterName}`);
|
|
25
31
|
const provider = new k8s.Provider(`k8s-istio-${clusterName}`, { kubeconfig }, this.opts);
|
|
26
32
|
// Crear namespace istio-system si no existe
|
|
27
|
-
this.ensureNamespace(this.config.namespace, provider);
|
|
33
|
+
const ns = this.ensureNamespace(this.config.namespace, provider);
|
|
28
34
|
// Instalar Base + Istiod
|
|
29
35
|
const releases = this.installIstioControlPlane(clusterName, provider);
|
|
30
36
|
this.releases.push(...releases);
|
|
31
37
|
// Crear namespaces para istio-injection
|
|
32
38
|
// this.applyNamespaceInjection(clusterName, provider);
|
|
33
39
|
// Crear los Istio Gateways (1 por cada LB definido)
|
|
34
|
-
this.createGateways(
|
|
40
|
+
this.createGateways(clusterCfg, provider, releases);
|
|
35
41
|
//this.applyMtlsStrict(provider, releases);
|
|
36
42
|
//this.applyCnpgIstioExceptions(provider, releases);
|
|
37
43
|
});
|
|
@@ -68,25 +74,32 @@ class Istio {
|
|
|
68
74
|
// ===========================================================
|
|
69
75
|
// NAMESPACES WITH SIDECAR INJECTION
|
|
70
76
|
// ===========================================================
|
|
71
|
-
applyNamespaceInjection(clusterName, provider) {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
77
|
+
/* private applyNamespaceInjection(clusterName: string, provider: k8s.Provider) {
|
|
78
|
+
this.config.namespacesToInject.forEach(ns => {
|
|
79
|
+
const namespace = new k8s.core.v1.Namespace(
|
|
80
|
+
`istio-injection-${clusterName}-${ns}`,
|
|
81
|
+
{
|
|
82
|
+
metadata: {
|
|
83
|
+
name: ns,
|
|
84
|
+
labels: { "istio-injection": "enabled" },
|
|
85
|
+
},
|
|
86
|
+
},
|
|
87
|
+
{ provider }
|
|
88
|
+
);
|
|
89
|
+
|
|
90
|
+
this.releases.push(namespace as any);
|
|
91
|
+
});
|
|
92
|
+
} */
|
|
82
93
|
// ===========================================================
|
|
83
94
|
// ISTIO GATEWAYS
|
|
84
95
|
// (1 gateway por cada entrada en config.lb)
|
|
85
96
|
// ===========================================================
|
|
86
|
-
createGateways(
|
|
87
|
-
|
|
97
|
+
createGateways(clusterCfg, provider, opts) {
|
|
98
|
+
clusterCfg.lb.forEach(lb => {
|
|
88
99
|
const subnetId = this.findSubnet(lb.subnetName);
|
|
89
|
-
|
|
100
|
+
if (lb.vaultSecretTLS)
|
|
101
|
+
this.createExternalSecretTLS(provider, lb.vaultSecretTLS, clusterCfg.name);
|
|
102
|
+
const ingressGateway = new k8s.helm.v3.Release(`istio-gateway-${clusterCfg.name}-${lb.name}`, {
|
|
90
103
|
chart: "gateway",
|
|
91
104
|
version: this.config.chartVersion,
|
|
92
105
|
namespace: this.config.namespace,
|
|
@@ -99,26 +112,62 @@ class Istio {
|
|
|
99
112
|
istio: `ingressgateway-${lb.type}`,
|
|
100
113
|
},
|
|
101
114
|
service: this.applyServiceLoadBalancerAnnotations(lb, subnetId, lb.reservedIpOcid),
|
|
102
|
-
volumes: [
|
|
115
|
+
volumes: `${lb.vaultSecretTLS}` ? [
|
|
103
116
|
{
|
|
104
117
|
name: "tls-certs",
|
|
105
|
-
secret: { secretName:
|
|
118
|
+
secret: { secretName: `${lb.vaultSecretTLS}-secret` }
|
|
106
119
|
}
|
|
107
|
-
],
|
|
108
|
-
volumeMounts: [
|
|
120
|
+
] : [],
|
|
121
|
+
volumeMounts: `${lb.vaultSecretTLS}` ? [
|
|
109
122
|
{
|
|
110
123
|
name: "tls-certs",
|
|
111
124
|
mountPath: "/certs/istio"
|
|
112
125
|
}
|
|
113
|
-
]
|
|
126
|
+
] : []
|
|
114
127
|
},
|
|
115
128
|
}, { provider, dependsOn: opts });
|
|
116
129
|
this.releases.push(ingressGateway);
|
|
117
130
|
// Creamos Gateway CRD
|
|
118
|
-
const gatewayCR = this.createGatewayCR(
|
|
131
|
+
const gatewayCR = this.createGatewayCR(clusterCfg.name, lb, provider, ingressGateway);
|
|
119
132
|
this.gwCRD.push(gatewayCR);
|
|
120
133
|
});
|
|
121
134
|
}
|
|
135
|
+
createExternalSecretTLS(provider, vaultSecretsTLS, clusterName) {
|
|
136
|
+
if (this.externalSecretsByVaultKey[vaultSecretsTLS]) {
|
|
137
|
+
return this.externalSecretsByVaultKey[vaultSecretsTLS];
|
|
138
|
+
}
|
|
139
|
+
const es = new k8s.apiextensions.CustomResource(`tls-external-secret-${vaultSecretsTLS}-${clusterName}`, {
|
|
140
|
+
apiVersion: "external-secrets.io/v1",
|
|
141
|
+
kind: "ExternalSecret",
|
|
142
|
+
metadata: {
|
|
143
|
+
name: `${vaultSecretsTLS}-es`,
|
|
144
|
+
namespace: this.config.namespace,
|
|
145
|
+
},
|
|
146
|
+
spec: {
|
|
147
|
+
refreshInterval: "1h",
|
|
148
|
+
secretStoreRef: {
|
|
149
|
+
name: "oci-vault-cluster-secret-store", // tu ClusterSecretStore
|
|
150
|
+
kind: "ClusterSecretStore",
|
|
151
|
+
},
|
|
152
|
+
target: {
|
|
153
|
+
name: `${vaultSecretsTLS}-secret`,
|
|
154
|
+
creationPolicy: "Owner",
|
|
155
|
+
template: {
|
|
156
|
+
type: "kubernetes.io/tls"
|
|
157
|
+
}
|
|
158
|
+
},
|
|
159
|
+
dataFrom: [
|
|
160
|
+
{
|
|
161
|
+
extract: {
|
|
162
|
+
key: vaultSecretsTLS,
|
|
163
|
+
},
|
|
164
|
+
},
|
|
165
|
+
],
|
|
166
|
+
},
|
|
167
|
+
}, { provider, ignoreChanges: ["spec.refreshInterval"] });
|
|
168
|
+
this.externalSecretsByVaultKey[vaultSecretsTLS] = es;
|
|
169
|
+
return es;
|
|
170
|
+
}
|
|
122
171
|
applyServiceLoadBalancerAnnotations(lb, subnetId, reservedIp) {
|
|
123
172
|
const isPrivate = lb.type === "private";
|
|
124
173
|
const annotations = {
|
|
@@ -211,78 +260,6 @@ class Istio {
|
|
|
211
260
|
return found;
|
|
212
261
|
}));
|
|
213
262
|
}
|
|
214
|
-
// ===========================================================
|
|
215
|
-
// CNPG (PostgreSQL Operator) – Istio Exceptions
|
|
216
|
-
// Permite al operator hablar con las BDs aunque estas tengan sidecar
|
|
217
|
-
// ===========================================================
|
|
218
|
-
applyCnpgIstioExceptions(provider, opts) {
|
|
219
|
-
const namespace = this.config.cnpgNamespace && this.config.cnpgNamespace !== ""
|
|
220
|
-
? this.config.cnpgNamespace
|
|
221
|
-
: "databases";
|
|
222
|
-
//
|
|
223
|
-
// 1. PeerAuthentication
|
|
224
|
-
// Deshabilita mTLS SOLO en el puerto 8000 de los pods de PostgreSQL
|
|
225
|
-
//
|
|
226
|
-
const pa = new k8s.apiextensions.CustomResource("cnpg-peer-auth", {
|
|
227
|
-
apiVersion: "security.istio.io/v1beta1",
|
|
228
|
-
kind: "PeerAuthentication",
|
|
229
|
-
metadata: {
|
|
230
|
-
name: "cnpg-operator-mtls",
|
|
231
|
-
namespace,
|
|
232
|
-
},
|
|
233
|
-
spec: {
|
|
234
|
-
selector: {
|
|
235
|
-
matchLabels: {
|
|
236
|
-
"cnpg.io/podRole": "instance",
|
|
237
|
-
},
|
|
238
|
-
},
|
|
239
|
-
mtls: { mode: "STRICT" },
|
|
240
|
-
portLevelMtls: {
|
|
241
|
-
"8000": { mode: "DISABLE" },
|
|
242
|
-
},
|
|
243
|
-
},
|
|
244
|
-
}, { provider, dependsOn: opts });
|
|
245
|
-
//
|
|
246
|
-
// 2. AuthorizationPolicy
|
|
247
|
-
// Permite que SOLO el operator acceda al puerto 8000
|
|
248
|
-
//
|
|
249
|
-
const ap = new k8s.apiextensions.CustomResource("cnpg-authorization-policy", {
|
|
250
|
-
apiVersion: "security.istio.io/v1beta1",
|
|
251
|
-
kind: "AuthorizationPolicy",
|
|
252
|
-
metadata: {
|
|
253
|
-
name: "cnpg-operator-access",
|
|
254
|
-
namespace,
|
|
255
|
-
},
|
|
256
|
-
spec: {
|
|
257
|
-
selector: {
|
|
258
|
-
matchLabels: {
|
|
259
|
-
"cnpg.io/podRole": "instance",
|
|
260
|
-
},
|
|
261
|
-
},
|
|
262
|
-
rules: [
|
|
263
|
-
{
|
|
264
|
-
from: [
|
|
265
|
-
{
|
|
266
|
-
source: {
|
|
267
|
-
principals: [
|
|
268
|
-
"cluster.local/ns/cnpg-system/sa/cnpg-operator",
|
|
269
|
-
],
|
|
270
|
-
},
|
|
271
|
-
},
|
|
272
|
-
],
|
|
273
|
-
to: [
|
|
274
|
-
{
|
|
275
|
-
operation: {
|
|
276
|
-
ports: ["8000"],
|
|
277
|
-
},
|
|
278
|
-
},
|
|
279
|
-
],
|
|
280
|
-
},
|
|
281
|
-
],
|
|
282
|
-
},
|
|
283
|
-
}, { provider, dependsOn: opts });
|
|
284
|
-
return [pa, ap];
|
|
285
|
-
}
|
|
286
263
|
}
|
|
287
264
|
exports.Istio = Istio;
|
|
288
265
|
//# sourceMappingURL=istio.js.map
|
package/istio/istio.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"istio.js","sourceRoot":"","sources":["../../src/istio/istio.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,0CAA0C;AAK1C,MAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"istio.js","sourceRoot":"","sources":["../../src/istio/istio.ts"],"names":[],"mappings":"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"}
|