From 39a1fe921be8b380044ff54382bb3147d33cb5b4 Mon Sep 17 00:00:00 2001 From: william Date: Wed, 16 Apr 2025 03:46:36 +0800 Subject: [PATCH] 1 --- .gitignore | 1 + base/secret/client-ca-secret.yaml | 8 -------- base/secret/server-tls-secret.yaml | 10 ---------- base/tls/kustomization.yaml | 2 +- base/tls/kx33-cert.yaml | 8 ++++++++ base/tls/kx33-net-cert.yaml | 7 ------- gp2504/ingress.yaml | 2 +- 7 files changed, 11 insertions(+), 27 deletions(-) create mode 100644 .gitignore delete mode 100644 base/secret/client-ca-secret.yaml delete mode 100644 base/secret/server-tls-secret.yaml create mode 100644 base/tls/kx33-cert.yaml delete mode 100644 base/tls/kx33-net-cert.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..757fee3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea \ No newline at end of file diff --git a/base/secret/client-ca-secret.yaml b/base/secret/client-ca-secret.yaml deleted file mode 100644 index f8a2443..0000000 --- a/base/secret/client-ca-secret.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: client-ca-secret - namespace: ingress-nginx -type: Opaque -data: - ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlDK0RDQ0FlQ2dBd0lCQWdJQkFUQU5CZ2txaGtpRzl3MEJBUXNGQURBd01SRXdEd1lEVlFRREV3aE5lVlJsDQpjM1JEUVRFTE1Ba0dBMVVFQmhNQ1EwNHhEakFNQmdOVkJBb1RCVTE1VDNKbk1CNFhEVEkxTURReE5URTROREUxDQpNMW9YRFRJMk1EUXhOVEU0TkRFMU0xb3dNREVSTUE4R0ExVUVBeE1JVFhsVVpYTjBRMEV4Q3pBSkJnTlZCQVlUDQpBa05PTVE0d0RBWURWUVFLRXdWTmVVOXlaekNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DDQpnZ0VCQUt0TEVSRFB5cnZTbDBmamtFWUVLMHFUTUEzTUZHUEg0RU96V1RFNERZVFJRRHBnTmlkZ2VFYWYwUzZKDQpDSFNsM0VrQTJFeEx3U0gyQUh5MUxxd3NwblVyNVVkWENIUXZEVFNKZWcrSGovZ054b3dBakZlMVgzclRhTWtjDQpRZDg0aHNiTExMQndjankwQUhmbXJ3eXJuN1B6d3RHb1dJZTJ0Y3BkRVpiWXVZR0tLOWk4YmsrT2xUeFFoYlBYDQpNM1pNNEFLc2NMUXZDNEpnaGZNc2JNZWtITThOSnV5V3dYSmV5MzFIRXRNK3JjZWJPRkFTRnVFMkhkMTVubVJpDQo5RjBVNnJEYWVrMjRsT2c0RDk3R2NTUVpvczRydklxV280aVo0Z2Q3dHNVRnFFaG1CTTQvNElISmV0elFQc0tODQpNbWh5L2wyZHNheDJFaVRmbVVQNVNsNkltOU1DQXdFQUFhTWRNQnN3REFZRFZSMFRCQVV3QXdFQi96QUxCZ05WDQpIUThFQkFNQ0FvUXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSVFDanRLS0NLdnFkTG8yUXN5Y0VYMmRoTVVpDQoxbWU3bFIyMmgzc0NONitKeGk2TG9FOGdvdVRUMSt2dEhGRmlKblBaeWhPd3B0S2VyYTIvWWdaUC9GZU1TS0NCDQpxZGNjY2JISFpaQWhjWUdkcVFHR0ZyK2lWNDkyc3dEc3JiVGo0amZ4TTBZY3VocENoc0d3UDNCNXMyd0FwbkU5DQpyTVFxZlRyeEkvMjJTbkpDRWcrQmxqL1dXRVoxTVF4bG5WdmtoNG5JNk1YWlI1RDA5ekg0SWFWMDhPbjI5S1BNDQo3Smd4elpMQmQwVnR6YXpIUXh3V1dVNkluekE3bjUvUVh2VnFRYURYRk9LNUhRT0NvQkU4RzJGcW1sYkd2bnB5DQoxTFZXcDJxOEFrV2NFZ2xveWQzd1ZzT1pUbGQ5SGZUNDdzNG5rT2hlL0tFUDhhZDB2SlNla3pmenJJVT0NCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0NCg== \ No newline at end of file diff --git a/base/secret/server-tls-secret.yaml b/base/secret/server-tls-secret.yaml deleted file mode 100644 index ed71059..0000000 --- a/base/secret/server-tls-secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# tls-secret.yaml -apiVersion: v1 -kind: Secret -metadata: - name: server-tls-secret - namespace: ingress-nginx -type: kubernetes.io/tls -data: - tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlESVRDQ0FnbWdBd0lCQWdJQkFqQU5CZ2txaGtpRzl3MEJBUXNGQURBd01SRXdEd1lEVlFRREV3aE5lVlJsDQpjM1JEUVRFTE1Ba0dBMVVFQmhNQ1EwNHhEakFNQmdOVkJBb1RCVTE1VDNKbk1CNFhEVEkxTURReE5URTROREUxDQpNMW9YRFRJMk1EUXhOVEU0TkRFMU0xb3dNVEVTTUJBR0ExVUVBeE1KYkc5allXeG9iM04wTVFzd0NRWURWUVFHDQpFd0pEVGpFT01Bd0dBMVVFQ2hNRlRYbFBjbWN3Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLDQpBb0lCQVFDdDFOTkhhZTlvN2tUb2VKTnhSbi9oTWZ1YWdoREZaTkl3Z2QxTkZDL253Qm5lSnFSNFhaNnIyVDVSDQphTWprVkZ4bndERTJWRk9BV1NKdmI2dWVwcmtiYWZtVU94b3pHbTFmWVk4UmNqMmhiS2JOYXVQRjRsZFhXWmRwDQpkZ0RjWldNL09TL0lMNjB0NTJXem9JQ3VzRTlkR3RSU2daMERoMUliSTU1eENncVdWdysvMGtxUElXNTB2eHQ1DQpOMW1aZmpCN3Qveng2SEFReHlnT21zMW54YUM0Qlhnc09lbDVnVVFtOCtPUHY5TmV3aG51UkttZ04rd3hJVTBhDQpSeERoeWk3S2J0ek90SEpMZTY0TWRxVmh6b2ZheHg5Y3RENUJ0UkY3Y2Q5NSs1WXFYYTRqUE9rWWNIV3cwbVJ3DQp4UmwxSzBnQ0V5ek52NW9KbUdVdmEramxLcXYxQWdNQkFBR2pSVEJETUFrR0ExVWRFd1FDTUFBd0N3WURWUjBQDQpCQVFEQWdXZ01CTUdBMVVkSlFRTU1Bb0dDQ3NHQVFVRkJ3TUJNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6DQpkREFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBWTdTMFdxN3Rud01RUHdpM29HczAyODUvVTI5TDFBT1lpci9RDQpPR0pVYlJ5NnBUL3ltTm5TOHVQMjFaMlNpdjl6QzhteTVlbGtwcElndWNHL2ljaERTNXJIMTNTRThadll1RXZrDQpwL3o3KzBOcFdVa2RiZTlWZHRNL2pIb2ViZUJZUlV5UEwzSzREVGZEalNKM0ZkK2daVU5ON0hKRWVjdTJtbnY4DQpnbnJYZEpWRytWTHplbnpEMmV1TFBNalh2dHlkSkVRZkpQQzJveU1vWDF4YjVCOEMzaCtXWXRyNjk0ZWQ4MTFHDQp6UUpNMWkvOXpsVmFRc1EwMXVabDZPTHlRSkFWQWZnWkpneFpJZy9mbExERVZQV2RRS2NQcHhTVUhlUGgyUTQvDQpmOUZHVENsbnhLVzBubEVRbWE4K1htQ1d4ZXhEbm9qaFRaMzZaRHB1T2lhR0llSkFoQT09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tDQo= - tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQ0KTUlJRW93SUJBQUtDQVFFQXJkVFRSMm52YU81RTZIaVRjVVovNFRIN21vSVF4V1RTTUlIZFRSUXY1OEFaM2lhaw0KZUYyZXE5aytVV2pJNUZSY1o4QXhObFJUZ0ZraWIyK3JucWE1RzJuNWxEc2FNeHB0WDJHUEVYSTlvV3lteldyag0KeGVKWFYxbVhhWFlBM0dWalB6a3Z5Qyt0TGVkbHM2Q0FyckJQWFJyVVVvR2RBNGRTR3lPZWNRb0tsbGNQdjlKSw0KanlGdWRMOGJlVGRabVg0d2U3Zjg4ZWh3RU1jb0Rwck5aOFdndUFWNExEbnBlWUZFSnZQamo3L1RYc0laN2tTcA0Kb0Rmc01TRk5Ha2NRNGNvdXltN2N6clJ5UzN1dURIYWxZYzZIMnNjZlhMUStRYlVSZTNIZmVmdVdLbDJ1SXp6cA0KR0hCMXNOSmtjTVVaZFN0SUFoTXN6YithQ1pobEwydm81U3FyOVFJREFRQUJBb0lCQUFJNWh0R3phS0c4YU92Yg0KdlRGV01HVktyVGhyUVRreGd1SWxpMVpFODU4QTdhUFM5VWhvRkZPSk5udTJ2bGx6dmZJQyt1NUIwb2JDUFVkVg0KVThvMlFvaTRDTDV0cWpac3VHa2YxOE9tcFdUSFBmUkRrYkl5NVNERVVBU0V3dHFQUHArc3hQQ0lNYXgwZVcvOA0KMWlER04ySE82ZGc3ZWUyMVllYmdoQkxZeU0xblB1OFk2cEhrZW8vd2k0RFNpNlEvMmlMWlNOS0hqdnhSUkM3Rw0KTTQ0OWxVM0JSTDd0UmlmYUNMUWtvZERXdTdBZ2JUeFFtbFVkdjh5ODV5UHB5dytGVWN3UGpMMXo4Mm92aStqYQ0Kb2t4MUpYVWxrOUt3eDBWVERHeVJUVE11WmtZV2l4VGljN1JVKzJwUDgvM2NpbXQ2ZlFsYlpBSm5PZTZSNlBJNA0KNUJDTDlKRUNnWUVBM3kwZEp2NUxuRG1wVklQRVZJQk5SRkJHQkk5OFdmR0cwWSszQVk4K2dXWVlySnhVWkhTbw0KRDAyUWJYbXNpN1FtYk95NHhkQTZjUXZsdVkyamVnRjhRYXJYVTNNZ01ldzllUHR0NldJc0xJUWc1cnlHeDVtSw0KanplZW9zdWl1VUNHQnlLeGFDek9MN2NnMDRrQUhNeWhFU2VXUjBHLzYzMTluaXN4bnliR01JVUNnWUVBeDJYUA0KYWF2VS91VEFvNnVtQUlHbk9veUhOUE5JbWJWRHNmaklZUFlxN3Y0ZkFNTStQR3BaNmhmdWYvQTJyVVVXdUUwMg0KaVhwYUk4Z0E3NDFGRG9CWnU0LzFUSGRmTHlsMTRWQ29pM0QyWkxYeFBMMlptUjFzbHEzUm9SbzE3ZTdicFFwTg0KTmx4dVBCNWNGc3lZYW5RNUxNQ1JGT3NUOCtTOTZSV0Zxa21Rb0xFQ2dZRUF5RHdCMitwc2pFNXZ6cFFxb21ZNg0KN1AvWTBsNnFnMGhnWGNWRHZQSjRja0RZQW9hQWNXRDVLRUcvUTNuWGhjQ3NlUzRxMmRCcG51Tzl5UzE3Ynd2Rw0KSUdUWHJOZXVHeHlLU3ZITE80b0plQ2RVSGJFb2ZBMFdkRWpDMiswNG9sMXg0eFVOZHhvOEpETjZFRkRxK092Zg0KMXpSZGNMRmRNRHYzYU9INE00TG1ic0VDZ1lCR0g3LzU0YnhlaUFSWGl4NHVQMnFZWktPSU02YnNwNXJQRkRjaw0KSW02bTdpZnBGTURtYm1DQXV6bmROSldHQ2k0YlVzeERQUXhHV1NnN0Z1dWFWZms0eFQvM1RHUGxLaWVTdmRNSQ0KZHdtd0VXeHRlQ0IwZ0t5WHNUbHY5cy9RaFpncFNwNHM2QVM4ajlEREUrRG1UMGxzTzZ6S05vSWwyK1FOL011dA0KUDRIbGdRS0JnRTRJa0cvMkc5K0h6Y1VCeGtPYnpwWlM4dG9KRzc3TmtwZjRkdm4wRm1nNFhZamNVZHZqOWF2Mw0KUm9LS2RHNE9KejJpdTVkanhhZFF3VEM2WkhLRFQ3eW03TEtOOEF3M0lTeHJsdzE2TlNSczgzczZ1SnMwbnJrUg0KTWZZZ0F2UVIwbVdNZFVpRVIyckJCcGZPaXZ2Ykg4UlpDM2l3VXFNSnNDREp6czB6UXE3NA0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0NCg== diff --git a/base/tls/kustomization.yaml b/base/tls/kustomization.yaml index 38ff8e6..f172f01 100644 --- a/base/tls/kustomization.yaml +++ b/base/tls/kustomization.yaml @@ -1,2 +1,2 @@ resources: - - kx33-net-cert.yaml \ No newline at end of file + - kx33-cert.yaml \ No newline at end of file diff --git a/base/tls/kx33-cert.yaml b/base/tls/kx33-cert.yaml new file mode 100644 index 0000000..5f8335d --- /dev/null +++ b/base/tls/kx33-cert.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +stringData: + qcloud_cert_id: NVLniB9q ## 证书ID + qcloud_ca_cert_id: NVLg94ze ## CA证书ID +kind: Secret +metadata: + name: kx33-cert +type: Opaque \ No newline at end of file diff --git a/base/tls/kx33-net-cert.yaml b/base/tls/kx33-net-cert.yaml deleted file mode 100644 index 303de47..0000000 --- a/base/tls/kx33-net-cert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -stringData: - qcloud_cert_id: ESqefc6J -kind: Secret -metadata: - name: kx33-net-cert -type: Opaque \ No newline at end of file diff --git a/gp2504/ingress.yaml b/gp2504/ingress.yaml index 8816211..8006f03 100644 --- a/gp2504/ingress.yaml +++ b/gp2504/ingress.yaml @@ -20,7 +20,7 @@ spec: - h5.g2504.qq.com - admin.g2504.qq.com - agent.g2504.qq.com - secretName: server-tls-secret # 对应你的服务端 SSL Secret + secretName: kx33-cert # 对应你的服务端 SSL Secret rules: - host: api.g2504.qq.com http: