Skip to content

Commit c89071f

Browse files
committed
extract certificate based secrets from test cases
1 parent 222f7bc commit c89071f

File tree

7 files changed

+41
-19
lines changed

7 files changed

+41
-19
lines changed

hack/tls-cert-gen/certs.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,27 @@ var yamlSecrets = []yamlSecret{
135135
},
136136
},
137137

138+
{
139+
secretName: "grpc-secret",
140+
fileName: "tls-secret-grpc.yaml",
141+
templateData: templateData{
142+
country: []string{"IE"},
143+
organization: []string{"F5 NGINX"},
144+
organizationalUnit: []string{"NGINX Ingress Controller"},
145+
locality: []string{"Cork"},
146+
province: []string{"Cork"},
147+
commonName: "NGINXIngressController",
148+
dnsNames: []string{"*.example.com"},
149+
},
150+
valid: secretShouldHaveValidTLSCrt,
151+
symlinks: []string{
152+
"/tests/data/common/app/secure/secret/grpc-secret.yaml",
153+
},
154+
usedIn: []string{
155+
"tests/suite/test_annotations.py.py - needed for secret name",
156+
},
157+
},
158+
138159
{
139160
secretName: "default-server-secret",
140161
fileName: "tls-secret-default-gb.yaml",

tests/data/common/app/secure/app.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,3 @@ data:
9898
return 200 "here is your response via ssl port $server_port with X-Forwarded-Port $http_x_forwarded_port\n";
9999
}
100100
}
101-
---
102-
apiVersion: v1
103-
data:
104-
tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZvekNDQTR1Z0F3SUJBZ0lVUnlPSlVVZmVXUmMvenpCK01hYkN4ZWhOMzdjd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1ZqRUxNQWtHQTFVRUJoTUNTVVV4RFRBTEJnTlZCQWdNQkVOdmNtc3hEakFNQmdOVkJBb01CVTVIU1U1WQpNUTR3REFZRFZRUUxEQVZPUjBsT1dERVlNQllHQTFVRUF3d1BZWEJ3TG1WNFlXMXdiR1V1WTI5dE1CNFhEVEkwCk1UQXlPVEUzTURZMU4xb1hEVE0wTVRBeU56RTNNRFkxTjFvd1ZqRUxNQWtHQTFVRUJoTUNTVVV4RFRBTEJnTlYKQkFnTUJFTnZjbXN4RGpBTUJnTlZCQW9NQlU1SFNVNVlNUTR3REFZRFZRUUxEQVZPUjBsT1dERVlNQllHQTFVRQpBd3dQWVhCd0xtVjRZVzF3YkdVdVkyOXRNSUlDSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQWc4QU1JSUNDZ0tDCkFnRUF1VmcvMlNyWFFtM3FqeUNYYThINmcxMkpyYStzSGIzdnJScHh2SDNmbVJxR3JGK2t2RjJDa1lCcFF3ckkKWVAxeHJyMnI3TjNuMGlQR2hRclJxdjIrYm4zdTM0ZjhiaW5ZRmt1WmRKTkVaajB6b0o4eTZCN0dQVGhnLzg3cgpDRnR3NkdFaVh5K29BZXlVVzFGcHlxbld4QUcxRGpNek9RS1h2SjB6SXpBZEorWkluVmhiS1RpNHVkNnphaklJCklEY2pnYzdVUEh4bTlncDY4d1MvaUVMbWxFR2dlOC9CeE1NcGVqcmJsOTJvMXNybU02WU1ldXI1RStWZkowUWgKVHVwR1hyRVdySGNoT1F6akwyU0lOM09jVmp1SzVrUEdBNXh6WHllcUtjWkVJazZmdXlBaW5aLzJNL1JRL3F5eAo0RTB2MEVIbGpzN3UyTkdmQ2tudVZoZFhld28zMXRLUUI4ZnJiM29BRUNWYmk4cDdvdGxSalpLVE1FQXRlNkV4ClpmckdiVThObmJNRlVEV3lHZERnT1Q3a28xaFNSc3ZoM3h6cGk0V0pYSjZHYnpYdkxoenJyd0k2WjdDeHkrdDUKdzFPbFpOUFlQOGtSK1hHa3Vrb1RkSGplSWZZdGhtN04rYUxmdXU0ektFOUpGcWx6Szl4L3h6RFFUK1g0REpCMQp3UmpmcW9lQm9IMGxmN0l1MlpRK25VbVpIdEh4RFhSUFY0U1lESW42Q2JwaHF1ZnJZTEk3SExJMFZ4Y2Uwd1lZCnhoNlhzNHNydEFnZHJ1bUU0ek5URm56aHA3UjAyRktnbmxrWlBsYXZkSkJFaDlvLzU0NmFZSE44UmxEQzJLV2MKNWh5SmtxOVJlZE5YTTBxMjJpWDBndlVDMVR5MklxaTJmT2ZMS0krMGdMTUJSa0VDQXdFQUFhTnBNR2N3SFFZRApWUjBPQkJZRUZJU016S1lzVnZyMjM1VXp6Zmw1UGkwVEw4L3lNQjhHQTFVZEl3UVlNQmFBRklTTXpLWXNWdnIyCjM1VXp6Zmw1UGkwVEw4L3lNQm9HQTFVZEVRUVRNQkdDRDJGd2NDNWxlR0Z0Y0d4bExtTnZiVEFKQmdOVkhSTUUKQWpBQU1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQ0FRQTE4VHorS0IxbG5tM2hFSStOQ2ZWWlRTMlpmVUZxVTU2Uwp2MEwvejROWGhsWmhnZTNLckx0RGhPNTFsSWNqa2I2WlU2M25RUkp1bFJDbStGejdPdys2eGNoeUJWOFRNMmRsCnU4aEJwOXkxRDVXUTlLdmVPQU40b2E4U245OVdEcTBtUEIyUmpEUDRRMFo3bXE0QXpUdG40ZlhKQUdNWit0NUUKUWtZVGpJTktYTzk3cGtlRUdlOXg0dDAwWk04NHFJMnlRTW5hdkQzL2czK1phbkFiRXEySGEva25QaENrVnFwVQpoL2RHTTFiYWg4QmhLMW9QY3VvMWgwSFcrTzFzdktLelgzYXEzS3k2eHRSbTRST1BCR0hRVnA5TnR3b09LcSt2CjdtdmRybHZmVzV1VnhZQUE2eGlJZkQxWStacUVYUFdGZXZJUjdhU01TZ0ZIOG0rWVJ2NTFlMXZUOHkwNG1TWVQKRTI0aFpjRGw4ZWxMMXIvRmsrUzg2M1g0bk9BY1cwZTZxYTFpVkQveWhKdGhKWjI4NkhsSVAxc3J5WmJmd0ZNNgpLWFhBVHpvSWE1YUt2ajdic2JtaVpDZS9nd1RxNWpxNXJCK0FmNnk4dVBMaHRPMUFWSVdxaGpZSEgwcmlWdFk1ClpjN2hLWTdvUGhXeTVod1czOUtLT2lZbUgwbHRvdjFhT2xLL0ovVGI2YmdpZ00xZTNNbGhqQWxqVEErd1JhdDcKYXBUSDMvWnVhNUpweG9tdXlaelVQVHd1dnhic0NaNm41bHpqNXZYMVgzdWY4Y3lrNFdoRk1zbnVwTXFLOFJ3SApxUXFpdDBTUlVIRk9DaUVaNEVtSzI0OERHUVBrU051Y0MyZDVTVFZwcVVQSlE1YnpjZWlYRmIxWUFUN3JZT2ltCk5ON3J4Q2tVcEE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
105-
tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRZ0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1N3d2dna29BZ0VBQW9JQ0FRQzVXRC9aS3RkQ2JlcVAKSUpkcndmcURYWW10cjZ3ZHZlK3RHbkc4ZmQrWkdvYXNYNlM4WFlLUmdHbERDc2hnL1hHdXZhdnMzZWZTSThhRgpDdEdxL2I1dWZlN2ZoL3h1S2RnV1M1bDBrMFJtUFRPZ256TG9Ic1k5T0dEL3p1c0lXM0RvWVNKZkw2Z0I3SlJiClVXbktxZGJFQWJVT016TTVBcGU4blRNak1CMG41a2lkV0ZzcE9MaTUzck5xTWdnZ055T0J6dFE4ZkdiMkNucnoKQkwrSVF1YVVRYUI3ejhIRXd5bDZPdHVYM2FqV3l1WXpwZ3g2NnZrVDVWOG5SQ0ZPNmtaZXNSYXNkeUU1RE9NdgpaSWczYzV4V080cm1ROFlEbkhOZko2b3B4a1FpVHArN0lDS2RuL1l6OUZEK3JMSGdUUy9RUWVXT3p1N1kwWjhLClNlNVdGMWQ3Q2pmVzBwQUh4K3R2ZWdBUUpWdUx5bnVpMlZHTmtwTXdRQzE3b1RGbCtzWnRUdzJkc3dWUU5iSVoKME9BNVB1U2pXRkpHeStIZkhPbUxoWWxjbm9adk5lOHVIT3V2QWpwbnNMSEw2M25EVTZWazA5Zy95Ukg1Y2FTNgpTaE4wZU40aDlpMkdiczM1b3QrNjdqTW9UMGtXcVhNcjNIL0hNTkJQNWZnTWtIWEJHTitxaDRHZ2ZTVi9zaTdaCmxENmRTWmtlMGZFTmRFOVhoSmdNaWZvSnVtR3E1K3Rnc2pzY3NqUlhGeDdUQmhqR0hwZXppeXUwQ0IydTZZVGoKTTFNV2ZPR250SFRZVXFDZVdSaytWcTkwa0VTSDJqL25qcHBnYzN4R1VNTFlwWnptSEltU3IxRjUwMWN6U3JiYQpKZlNDOVFMVlBMWWlxTFo4NThzb2o3U0Fzd0ZHUVFJREFRQUJBb0lDQUJvRVBlSWtBS3lvZFN1N2JYQ0kwcnRYCk0rNUNJZGVDN241NVNjeDY5c1NzL29rbEJuWVNiTjR6dDVMYmsvT3V0U01oZmdmMUZqSUowamRMK2lackVTeTkKVjFIZjZzVWo4VEIxVXQyKzY1NVdWUEE2VXp1clVOOE52T3FXTWFrRFVqNnNTU3VIVmFsVTBNdXpYK0E4MEQxdgpQVCtqQnVaU2E0T08rcnRPYVA2aXlwVkdROHJ1S3EveDNNbGtBSDZxZnJ6SDVabDFTa0ZGM2dCTmd2MHVOdU9mCldxeEdlM0tTaFRpaWJtbjJOQVJYM1h4cEt6Tk4xeGRvaVFvZi9CK2NXYk1OQ2ZFU1A5aEc2MytlNHYxZ1V4VDEKQXJMK2djWEdxTzNnZENNQ1c2b0gwMUFYQmdUamkveGxwOERpbmpnQ3N3VjVXb1J6U1ArbnNtVmxWS1B0Q1lXcAp1NjJFY203OXh1Qys1WUlaQ2pTYlFLZUJPRkEzN01YMkpXanBBanZhZVhSZ2EwQjRnSXRKNEIvOEZ5UUJlNzVwCmJDTkw0VFpGMndMY01pU05lTWNKRmQ4eUJqbjJsZEgyeGg1YTM0L0lsNzdsa29FeHBFVHl4NVkxSkg2WlJqKzQKZVE2SnpaRWwzZkZ4eGtFSy9IalRVUUp5TVZFTEdCNnNFVURlVGxjYmhvcFZMYSsxTVgzVGRSdGJHNC9CY1VJbwpiNHBsZnRrdG81d3dSU0oza1c5RDBuc3MyTlh1UDE0R1JSZmw0L1VqSWtWUXpCR0dhcU5ub2tUaks2OGl4Yzg4CjhWTSt0QTJhUVNzM3FnV1lPQ0pBdnZRK2IxZFlFK0g2MDkzbzFWL052QkhKYjhxb2lsbjFvcXJNTWt6NC95M2QKNi9XbzdCL2xzM0ZSRjFsc2hVbnBBb0lCQVFEeWVpdjRrQk9meDU5Y0NaaFVOWFJ4U3NUVnpENFNmMHlsQ09kYgpwYk1KWnVVbnRNYlYxVzNiZzRFV0tYYVZMaVVvRjJ6byt6WlVYNmxzNGNqOEVyc2I1VjVDNXVqdjJmYkxFeFBTCm9FeGt4WFpRaFNtYTdCSHdDeUEzZlNoZDlLNWNoVE1vVWxKVStIT0ttcjBYUFV5Nm90YldSaFRiWmVxS2s3SjIKM0ZkUVhiOE80TzdUSllHSzVlTERCcW1UTXR0dGw2SllDdzhuNm83dXZuRXB6MjM0OGlYZ21HZWRxS0FPMjRIUQp1dDdQMzNSUWdSVWdwZXhOYWkrRHdLQ2cveGdkdlloSVEzSXlWelJKK3pQNXFhTFRGSzhQRHJjSHJHSzZLeG9vCms1ZnpTR1haWGVjM3pwWGE4L0tqVlZqR2p0SXNaODA3eDlGV09SaWVpSndjTWxJbkFvSUJBUUREcm1hK1VrMnUKNStBUFBuRGh2cFNieHJwejg0dEV1SGUzL1lRb0pWdy9kYVFLZllkekR6MEY2cEh1N05zRjR2SlVPV0pSV0l2VQp1b3M5TVZ4U3NsdTVOVmlIRWVQdnc3d2xheE5yZTVLbFJmSDJ6eTI4d1JOeUNkbjdsT0EvOUpMYjRxUzJxaG1aCnpvTXdzbWYwMDZ5TllnY3p1TDV2elNlMENTMzZGVEM5UmxXaVM0MXRDcWFCY005VkhlWkF1NG9vZUxyTXdVbEwKYTc4MXQxWVhkMUI0a0JGRExJY1BQYWlxSGdFY1FGY05wOURleTVRcTVtamlhRHdyb2VmZUFyK1pYelFqSzBjRwpXRGJpcGpFZ3NoY1RWNjVXNUJaTkJNTEV0NnVWT3NqVmE5dXo1czVrUWVydHppS0UxZ0plcGJCZGMwaFNYeXBwCit2SW1zYmFWWmExWEFvSUJBUUNFL3JHamNoTHhibUpmN3Z0WUpNR3JhaUV3U3dnNHlRM1c3MTFHalVuMy9ESHcKWjEwdjZCS0xka09WVGtTMmFrc0RCR1krRzV1ZkI2RThFVk5WdjBoVmNxY1M5dWdJdG5xQXhBUDVZT2JGMXZDZwpGWW5PYVhFbFFsVDNXblNMcENzR29DQ0JHellCV1F5Mmwwemp0RUdqbExGVmNiYjY1NW1QVEpkMFRrS3QxOTExClliWmNwWk82QllFdEN6aHpmaytRZXIwV29XbzhzSkNaTG1lUFVUQzJmTXA5dDlvTlJYSVU5Qnp0eWJGd1B0WGoKV2dtbWtKdGRrc0pnOTRTakNZZkd1REJKd29TZVMrcG9NWm8rYytiVTgrRlkxdTlaREJwU2xsV1FyL09HQXMycQpQYkVXa1A3c3l5VG9wV1U5OHhRZ093YjhwUXFTeWxwUWlnbG1CY3U5QW9JQkFBODJkTWhoRDZjRVlkZnRpOHNSCkRPNmJZWTE0SnFDZUVyaWNIZlVkQ25Ib2pHdEFYUkpsNGVHZTNkK01URzdGdVA4eFF1SitGc2pnQThrckdEbFoKb21YZ3J0UTVZTllZQ24yQ09JMUhteHY4Tnhadi91ZEl2MkZEUU00ZFFkM1cvci9YZStTempxLzFiUitSRHlIcQpmdVN5OVVwaEYzVUxwd1dKSFNqdkVzMzBOTjRjTDQrRm4zSTZ1Zk90RW1SLzcvcTdnQkpCQ0ppemRMY1JYTUVRClJwSkk2UDZtN0kwVHh4UUtweDF5SnhKcHRJUk5vV1JBYTNFR2wzN3c1RnpQSytRWmthMFdSVHhLQ1dKUGQweEsKYkI3VjF6anNISXU2VGdZTEhXekptQ2wzYkNvdFRHaGc4NG12VitHcDNaOU1GRXovbEdUSy96b2tCMFZZMVpBQgp5cHNDZ2dFQUVTb0xNd0VvN3dWNDVlQ3JVOWNoMzBnSHY3RUpnYStLeGNHMjBPT0RKcEZMVVViYlZ0ZVQ5aFBUCnJSZ0l6WDUzNGZxVmVKQ2Zpdy9xZW56RS9wcjlBcW8rNjYrYWdDN1JlRUMyeS83R2kxWEdwcThJa3hKZEtzUEsKVjFqbk9sdmpMU0lSV3RVdGRwSmlhdTBWcTAzZW1GVDNERFJJTTF3RkhjK0hQakNwVER3bDh1WDRscmlPWlFJdApRbnhjRUFSbzNIMkdudmpSZ2xxZ1Z2S0NPaWF2anozalBpaEpGZjVCRjR6YzlkdWZVajhBSjVhd2J1SDFLSHJ4ClIzYXFSamUzSTV0eDVJU0FXTVhjRmVXWDhucUZJUDM5L0V5TE5xRHQ2enQrUkZETU4xNGx2WVNLQ01KNVA5RUIKazB1RU0xQ2pzeWtwNnNlT2lyTEVYWW01QWpvZDNBPT0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo=
106-
kind: Secret
107-
metadata:
108-
name: app-tls-secret
109-
type: Opaque
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../../common-secrets/tls-secret-grpc.yaml

tests/data/common/app/vsr/secure/single.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,3 @@ data:
6868
return 200 "here is your response via ssl port $server_port with X-Forwarded-Port $http_x_forwarded_port\n";
6969
}
7070
}
71-
---
72-
apiVersion: v1
73-
data:
74-
tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVCakNDQXU2Z0F3SUJBZ0lKQUpicWVnTHB0U2JhTUEwR0NTcUdTSWIzRFFFQkJRVUFNRjh4Q3pBSkJnTlYKQkFZVEFrZENNUk13RVFZRFZRUUlFd3BUYjIxbExWTjBZWFJsTVNFd0h3WURWUVFLRXhoSmJuUmxjbTVsZENCWAphV1JuYVhSeklGQjBlU0JNZEdReEdEQVdCZ05WQkFNVEQyRndjQzVsZUdGdGNHeGxMbU52YlRBZUZ3MHhPREF5Ck1USXdNREF6TkRWYUZ3MHhPVEF5TVRJd01EQXpORFZhTUY4eEN6QUpCZ05WQkFZVEFrZENNUk13RVFZRFZRUUkKRXdwVGIyMWxMVk4wWVhSbE1TRXdId1lEVlFRS0V4aEpiblJsY201bGRDQlhhV1JuYVhSeklGQjBlU0JNZEdReApHREFXQmdOVkJBTVREMkZ3Y0M1bGVHRnRjR3hsTG1OdmJUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQCkFEQ0NBUW9DZ2dFQkFLenNmMll0R2hVU0lyYWpTS1ZLSVBrTmFzODcrTzJDaHlsZTduL212V012WFJZZWI2R3oKQktKV3FkSS9UajlQQlJxTWVzajByMjF5UlAwaVc0VVBTYjZNT3psNisyYjBJeS9nTEhJRGxJN0NDTVU5cThHSAorL3Y4ZjAyMXJWYmUrNGdsWmZWVTZJbXg2Vlc0ODkzVTcwQXR6Y1hGNnFDUGRUWDNjWW02MTVmNE02M1YzdTdqClJGN1JINzBDL1NScVVvN29FVmZxR0thN1prdWVodnlLSWZURE5hQUt0WFhDLzlCeDlYSDIyREFxcTVKRUhHVHAKSVluRFE4eFdFRXlUQmx1V2JwU0JwUEVMRDcyUHhwQW9DU0trdVdXSzJYbmlKOG9BTFZJWlhaaHFvamw4Sk5SMgpiNWE3RFJEcTNTYzNNSzhwMEwzZXFsLzRPcnhjUGdJUVdtTUNBd0VBQWFPQnhEQ0J3VEFkQmdOVkhRNEVGZ1FVCmtvK2owNGJWaDZyTjdCbk8wbjRLMUo4S2tIRXdnWkVHQTFVZEl3U0JpVENCaG9BVWtvK2owNGJWaDZyTjdCbk8KMG40SzFKOEtrSEdoWTZSaE1GOHhDekFKQmdOVkJBWVRBa2RDTVJNd0VRWURWUVFJRXdwVGIyMWxMVk4wWVhSbApNU0V3SHdZRFZRUUtFeGhKYm5SbGNtNWxkQ0JYYVdSbmFYUnpJRkIwZVNCTWRHUXhHREFXQmdOVkJBTVREMkZ3CmNDNWxlR0Z0Y0d4bExtTnZiWUlKQUpicWVnTHB0U2JhTUF3R0ExVWRFd1FGTUFNQkFmOHdEUVlKS29aSWh2Y04KQVFFRkJRQURnZ0VCQUc3RUxMUGVrQXJkYy9COUxsZXZsMCtLNWtYN2JsZDBqa1JmZjRzalA5MTdkSFliem0zMQoxNi9QT0ZKc3ZmOTFhNXdOTnNzL3JOVG13ZEZuSC8xNTJJVEgyamJiUEd5bGIyMkNiemgvU09XWVUzcnJEeHk3ClVtMFNqMmdJUHRWdjc3WTY4Y1ZtOTNVK3oxNjM1akVNUUtXcUpYRlBCSU9iWVd1SWNManJ1WTg5dGhpdUtVNTcKNGlraFlqT0t2ZnU4NVNyUDQybGV5Qk1PMHROVVNCZWl6SmZpWDA1N3RtR0xwaXhRYnBsaTlXUjc5bXpLcFJwZApEaEdFMHpxZ1ZSMDlOeGF2cmpNcjdtNHpvRGg1d09McFVQSEVCU2FhU2QzNzA4WGwrTFVDSTNQajhHcEtvUWRlCm11b2t3MndVTFQzR0ZTZjd4OTZSdUJqTmRWb3NSRkJpZjM0PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
75-
tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBck94L1ppMGFGUklpdHFOSXBVb2crUTFxenp2NDdZS0hLVjd1ZithOVl5OWRGaDV2Cm9iTUVvbGFwMGo5T1AwOEZHb3g2eVBTdmJYSkUvU0piaFE5SnZvdzdPWHI3WnZRakwrQXNjZ09VanNJSXhUMnIKd1lmNysveC9UYld0VnQ3N2lDVmw5VlRvaWJIcFZianozZFR2UUMzTnhjWHFvSTkxTmZkeGliclhsL2d6cmRYZQo3dU5FWHRFZnZRTDlKR3BTanVnUlYrb1lwcnRtUzU2Ry9Jb2g5TU0xb0FxMWRjTC8wSEgxY2ZiWU1DcXJra1FjClpPa2hpY05EekZZUVRKTUdXNVp1bElHazhRc1B2WS9Ha0NnSklxUzVaWXJaZWVJbnlnQXRVaGxkbUdxaU9Yd2sKMUhadmxyc05FT3JkSnpjd3J5blF2ZDZxWC9nNnZGdytBaEJhWXdJREFRQUJBb0lCQVFDSGd2WDdmbEM0UG5RUgpxRGZmd0EzQzNtN2JZK1laU25iZFJ0V2tTWkFVMENNa21FbG04RUVyYnJxNlZuM2RRdkYrOHFPdUk0SHVST1FuCmN1dEJoTStIa2FFLzFFNTdTY3JoVTgzQXMybVJ6aUROWVJ6ZUZ0Q3praFc1TWl4YXJYZDBJOHFZelNkRjhMUW8KUno1a2t0L0M3YUlaNEpXVHFaaHk2Q3lEZ0hZL1VpcEFGZG5mTE1NWG00Q1R3OTVGV1VpNGRaUHY4ZzVNNFZVUQo1K25sMUdPUFdsdGpNaWRlY0VxYVlYdzh3amVYQ1JNMDZLeWJSaDU1cU5reHladDZ4YWU4d0JLaE1PV2VRcmVPCjZhQ0tBQjNaOC9vM21JeTd2WjUzWE51WEFQaHhLR3E2OFVkQTgrQ1lKb3dPNFdscGhKRkE2QUcrYjZpRnJwNkgKZmFybVkxRkJBb0dCQU5wT0xZUGVhNEY1eXhxU3NpYkFpTXJiYkZROTlDejRZampkTUlEM25zWnpFblVrdjF0QwpGbTUwOHhodFk0TFRiUEQ0c2RPcmNETVlqYTM0UENKQTFOV0p5UXdZWkdMaEhxTXg1NWJjQ2VaL1Y0S3FlN29ZCm5aK2tPb29RbFBsQUFTZVViYU0vWCtHdDRUdjdwVGxjQWJETWVTd1Z0R2I2ZXFhZUpNUFJmZlhUQW9HQkFNckkKVGVBSjhkejQ2TC9raWZOMjMrVVFkSGdZdzZ5cExSZ0JuRllweGpIM1VWOWRFZVdXdUZzdzhraTVha25TVmIwVgpFaWJqb1BCdjZxd1RvWmhKNHE5L0lOdzJmZE4xTGV3N3ZOaG5vL1A5MHJpUDZ4b2llczJsN2c3bmlEUDJ5ZnRaCnpJSkU0OUs2SVJzT3c4ZHkrS3hrQzJaZDdWcy9BM2x1Q2hYZWVWOHhBb0dBSG9yTGdXU1A0K2gzU3Z0MUkwalMKbXBjQ1cvTGpBNXVvbWs0UDZDczhzb1VNOHdpMklQMXBDQUVpdGFzd1BmQjRrR29xN3ZOUVdrVzRKTHZUSmZPdQpFMFlZczdHQjhmZVBBc1FMbzZhYlYvMCs4QkFNQ1doQ1BVQ0wxQjhueUl0MDNlVzlSUmFyd25aQ1NkTVdOYVV5CnMxcVlKVnZRQm94S3RwN3ZnOW4rWm5NQ2dZRUFsUmJmNnJCbEdzb0dsYzg1ZmI4UXJpR0RBQ2wwOUNVTituQjAKdVFUTnF6N2luUEtZamV4YWJ2RjFzUEpocXhUeDVLcnhSWlptWldCamNWQ2RwcEhzRUl1dlpUakxHZ1UxVmxJMQpiZ1lGRFFhNVB1alJPYzNQN0JMckRCbytrYllJbXJ4VEdCUCtUSmg4YnFCVVlQZXV6VkJnOFVwdGtJQ3IxVU9LCk5ybnpFb0VDZ1lFQXh5a3JTblQreGdjZHFSaXBQenFnL1NJT0VJTXp2VHp2alQ2cG9nb1FhOGhYUkJxTTQ3NUoKVnJlMWlIUXF5b2tDcEM0d0wvTWx2SkhhNW1FMExkdGdyNG9UOUVsMkwrNy9qNHlUL01CUHB2a2M2UWtKaEFLcgpYQ2pIN29seHhWVmhjaVUwZG9JUlYwL0VjRjAwS1NnQnBXR1dOU2UyVm44cTdFelhISHpQVC80PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
76-
kind: Secret
77-
metadata:
78-
name: app-tls-secret
79-
namespace: backend2-namespace
80-
type: Opaque

tests/suite/test_annotations.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ def annotations_setup(
111111
test_namespace,
112112
) -> AnnotationsSetup:
113113
print("------------------------- Deploy Annotations-Example -----------------------------------")
114+
if request.param == "grpc":
115+
create_items_from_yaml(kube_apis, f"{TEST_DATA}/annotations/{request.param}/grpc-secret.yaml", test_namespace)
114116
create_items_from_yaml(
115117
kube_apis, f"{TEST_DATA}/annotations/{request.param}/annotations-ingress.yaml", test_namespace
116118
)
@@ -120,6 +122,7 @@ def annotations_setup(
120122
minions_info = get_minions_info_from_yaml(f"{TEST_DATA}/annotations/{request.param}/annotations-ingress.yaml")
121123
else:
122124
minions_info = None
125+
123126
create_example_app(kube_apis, "simple", test_namespace)
124127
wait_until_all_pods_are_ready(kube_apis.v1, test_namespace)
125128
ensure_connection_to_public_endpoint(
@@ -151,6 +154,10 @@ def fin():
151154
delete_items_from_yaml(
152155
kube_apis, f"{TEST_DATA}/annotations/{request.param}/annotations-ingress.yaml", test_namespace
153156
)
157+
if request.param == "grpc":
158+
delete_items_from_yaml(
159+
kube_apis, f"{TEST_DATA}/annotations/{request.param}/grpc-secret.yaml", test_namespace
160+
)
154161

155162
request.addfinalizer(fin)
156163

tests/suite/test_v_s_route_upstream_tls.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ def v_s_route_secure_app_setup(request, kube_apis, v_s_route_setup) -> None:
3939
kube_apis, f"{TEST_DATA}/common/app/vsr/secure/multiple.yaml", v_s_route_setup.route_m.namespace
4040
)
4141

42+
create_items_from_yaml(
43+
kube_apis, f"{TEST_DATA}/common/app/secure/secret/app-tls-secret.yaml", v_s_route_setup.route_s.namespace
44+
)
4245
create_items_from_yaml(
4346
kube_apis, f"{TEST_DATA}/common/app/vsr/secure/single.yaml", v_s_route_setup.route_s.namespace
4447
)
@@ -52,6 +55,11 @@ def fin():
5255
delete_items_from_yaml(
5356
kube_apis, f"{TEST_DATA}/common/app/vsr/secure/multiple.yaml", v_s_route_setup.route_m.namespace
5457
)
58+
delete_items_from_yaml(
59+
kube_apis,
60+
f"{TEST_DATA}/common/app/secure/secret/app-tls-secret.yaml",
61+
v_s_route_setup.route_s.namespace,
62+
)
5563
delete_items_from_yaml(
5664
kube_apis, f"{TEST_DATA}/common/app/vsr/secure/single.yaml", v_s_route_setup.route_s.namespace
5765
)

tests/suite/utils/resources_utils.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,6 +1109,8 @@ def create_example_app(kube_apis, app_type, namespace) -> None:
11091109
:param namespace: namespace name
11101110
:return:
11111111
"""
1112+
if app_type in ["secure"]:
1113+
create_secret_from_yaml(kube_apis.v1, namespace, f"{TEST_DATA}/common/app/{app_type}/app-tls-secret.yaml")
11121114
create_items_from_yaml(kube_apis, f"{TEST_DATA}/common/app/{app_type}/app.yaml", namespace)
11131115

11141116

@@ -1122,6 +1124,8 @@ def delete_common_app(kube_apis, app_type, namespace) -> None:
11221124
:return:
11231125
"""
11241126
delete_items_from_yaml(kube_apis, f"{TEST_DATA}/common/app/{app_type}/app.yaml", namespace)
1127+
if app_type in ["secure"]:
1128+
delete_items_from_yaml(kube_apis.v1, namespace, f"{TEST_DATA}/common/app/{app_type}/app-tls-secret.yaml")
11251129

11261130

11271131
def delete_service(v1: CoreV1Api, name, namespace) -> None:

0 commit comments

Comments
 (0)