From 62311619b61c43de982cf17509efaf1515071d86 Mon Sep 17 00:00:00 2001 From: jackyu Date: Tue, 20 Feb 2024 13:56:27 +0800 Subject: [PATCH 1/2] setup timeout for cronjob-gc --- charts/ks-devops/templates/cronjob-gc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/ks-devops/templates/cronjob-gc.yaml b/charts/ks-devops/templates/cronjob-gc.yaml index 3cc0742..30d947d 100644 --- a/charts/ks-devops/templates/cronjob-gc.yaml +++ b/charts/ks-devops/templates/cronjob-gc.yaml @@ -13,6 +13,7 @@ spec: failedJobsHistoryLimit: {{ .Values.gcJobs.failedJobsHistoryLimit }} jobTemplate: spec: + activeDeadlineSeconds: 3600 template: metadata: labels: From 539d174d86d7cc139b531149b1dd903b922829eb Mon Sep 17 00:00:00 2001 From: jackyu Date: Tue, 20 Feb 2024 13:58:04 +0800 Subject: [PATCH 2/2] update s2i expired certificate --- charts/ks-devops/charts/s2i/values.yaml | 147 +++++++++++------------- 1 file changed, 66 insertions(+), 81 deletions(-) diff --git a/charts/ks-devops/charts/s2i/values.yaml b/charts/ks-devops/charts/s2i/values.yaml index 0a6ea86..3cda8c6 100644 --- a/charts/ks-devops/charts/s2i/values.yaml +++ b/charts/ks-devops/charts/s2i/values.yaml @@ -94,93 +94,78 @@ s2ioperator: secret: caBundle: | -----BEGIN CERTIFICATE----- - MIIFhzCCA2+gAwIBAgIJAJbx5hsBi3ZdMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNV - BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX - aWRnaXRzIFB0eSBMdGQxEzARBgNVBAMMCktVQkVTUEhFUkUwHhcNMjEwNDI2MDYw - ODQ4WhcNMjQwMjE0MDYwODQ4WjBaMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29t - ZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRMwEQYD - VQQDDApLVUJFU1BIRVJFMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA - 0JnXp/eLTnFNNBzWl+kFiyjLAf0vUhU3dXvlYJ+yTQczx0ucHAGY8nbnhB49s9vH - z1TV9AP60+DHHmmy57wiM/m6bqP1e0j2AbJ4vuoauvfEfW6ZjQ4FfcYH8VJ8nsks - ZNiJAI/HX4Y0itqWNG31frovjxdJ3T7EJjwzxrTMiRuPL9YmErKDQiSIsuePI5L+ - CIgAPdVVSbF3t+ioIYyQZm5l7/HY7uybYn6x4AwN3SgG8V0UXDEV21XcMpRhOFjU - 7CbNt7arKIMQcrtEQR7X5I7ZbQmpLKg3PoB9QHBCjIIuHXgTyk6K4v9OnjzJsZ+N - mdyuI9G9y0ADbRYpcOT3dnBMEy1Tpaq0fOfWqNhe4F2w7WTj6SkYlI28STFWAiga - xOwwY0Xj9VAuUiX/H69BKcYOJ0jXdHcUqGcl4olx62raM5uZfqejWpDGKZlQzCdF - GooSk26SspiZ2IcOwoepz1CVCM08GvRHEUcSa5ZhBZpC5CgmhqLQhPQvKypX3As6 - 5kog9+aRwSKqKIL9839a6BILwW5L3USULrGBtjY8sfbZUInnSO8QDD0tsUmfFadI - NKsFcjhoygaTGvXXuIw9X5IpAkcWW6qAAk+4Mc999eVGej1BVkl1eCbLm7TQn1UD - pSLoko9AnDfmTE1R/nYL6AoSRxuIUJPCmQWobqJFVsUCAwEAAaNQME4wHQYDVR0O - BBYEFNS/nvNA6MU+QDSbgZFrSyeqt27hMB8GA1UdIwQYMBaAFNS/nvNA6MU+QDSb - gZFrSyeqt27hMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGJVy7RN - qIylR2E726LdsN8Id80pH3J16uFIxfyzTfkX/OGKfRPmSmvaEoP1Tyyr/bqKL0SX - vVjpxyfwtteEu4NCgpRqyw74sCT8Y+sG76hvp717nSNEHg35QpHcz0EZ1n31uMDR - edwks0tTwntGxGymXbeIimnWzyImtOAnDcCzV3I+sDcV7xOTBhshUwW8tmgLpkSO - ZYRPMcjhEwIkEwZgyaxVfBJ7tcJ7wiaYkdZHXP8NJA5N6TpFED5zoT3cCkC2oGUg - Qno+AIA5oJS2UIAdkpJ0yzdL9WYHM8eQD+Fs7Abgze6gSRnSdXQnLSx3olzCPNKa - pQ3npULnSxUdp6KrFUPgVbnWxdAxBrT3c10T7Wip43ZQMAjXOLgZ9J83ud3OLxzX - Czx0fKKZ33Y/DvPK2LcfruEgCWxQhwQCgKrkdPn695kBuccqSV20+av0HyUPElNn - YDojEqvuXvlL2LI5zI+6elpyvQ7r6vuKFgjyMpoQ0bSVACRVCvIjf//01hpeXrR4 - fmfUrPG3msbNrIjLmrnYHcnB9/UA4ejCI4WEfspCEpRt7Au3kl2/xVNtqXgOS2Np - NR2xF0A7VFgtbx2x6zw/WUkRI4ugGu79Nt1OvM+D/X77JykNIjizJFHaFWCOuh3Q - jF9FR0nTiGgtyJkHubjKMd8YBu9S9q0HgGOm + MIIDczCCAlugAwIBAgIUYi+KIMA4h5fpbgTwY/7NHWNQvQ4wDQYJKoZIhvcNAQEL + BQAwSDELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkhCMQswCQYDVQQKDAJRQzEfMB0G + A1UEAwwWd2ViaG9vay1zZXJ2ZXItc2VydmljZTAgFw0yNDAyMjAwNDI4MzFaGA8y + MDUxMDcwODA0MjgzMVowSDELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkhCMQswCQYD + VQQKDAJRQzEfMB0GA1UEAwwWd2ViaG9vay1zZXJ2ZXItc2VydmljZTCCASIwDQYJ + KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqyOmdFhCZws43R4azfyAX23YgMd4PI + ZgfjGuroeDlVsRRrFJZKWmQiz+KyzZjmP2/JWDZZ20kg9i0AYTodZdn3pTQj1rcU + wYO43idK6Jf2rSiXFAi3nwr6G4jtyOuf4ZTDjFDe4wRFByStZU473YYPBFgLwZBa + P2O4I11ZzfHIjSt+oGdcLYFQJ2kqcan9ZIj5w5/I/NxfGEBaEWhX1MyK820cavpL + xVn1icO6AK1BJMy4yxXU6IYkBWZqoBd6hUYjbHZYO88Unt5+f1kNlp1euFi4vBeD + voa5gZVsK6zNvrJoCatt+zxJzvsBiA/vCUg5nlTNYGj/NEJVbM5xMw8CAwEAAaNT + MFEwHQYDVR0OBBYEFNqyC4zRRnpuqhhARO4VF1NQmJWZMB8GA1UdIwQYMBaAFNqy + C4zRRnpuqhhARO4VF1NQmJWZMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL + BQADggEBAFCJVHFqElJSLSZfYMTRBAWP4DxrAXAB4uOHumlLT4UzySbxBPzafmJD + +Th7oguHWU/eks2BQulstiqjwZ25pH5MU3cykJsrVCYsrPeeO3t9GstOeFY9zS/H + fN5cdap9sPAWwRlAK7spTafCyYPSm8d+LXE5rhc2OPYFAWqLCXPNnwjvawJwAJbo + qobEHQ+CDZIVjQDcgNJVa0Qx1vGkDHhhkicLP1EeG2QmazeZupJ3DsC42gJRa41h + J9rpCu3Yduk3nqF9hS8O4NwffsXwyr+toEX9fl0Ew7gF37qx+L34BIYTXBfkPceZ + vG22oAx9ZNIQrJbYTZr8QP9KPK+krXU= -----END CERTIFICATE----- key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- certificate: | -----BEGIN CERTIFICATE----- - MIIE0TCCArmgAwIBAgIJAOoJB0y3z6bMMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNV - BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX - aWRnaXRzIFB0eSBMdGQxEzARBgNVBAMMCktVQkVTUEhFUkUwHhcNMjEwNDI2MDYx - MjU1WhcNMzEwNDI0MDYxMjU1WjAhMR8wHQYDVQQDDBZ3ZWJob29rLXNlcnZlci1z - ZXJ2aWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx78d2JIYf0EX - TO4fN3VHqJiQUlnmYMVcGgoIK/TeHI0irrCKN1wnTfxPNEE4/W0yvLARKpF+hzf3 - r3VWr0Ab7pKr8UEAYtTXRz0YdwL/Ek4XBCX07/nGaPM/lRgg8UW05aeSg+VrMSVx - t53hiIPMY3+JdM9tEI6DJbLsa2ECNQ/VU9UhKXd8YUTxEcKDkBWnqTiihVTk0Raf - AvIUcIIwu7+mz0+tlN/YHMxfvK+pkJaeA92HOnTifMGQ+YbpV8YwUpYfi71MJbuo - 5AAWuDl0GfoiawkIUzT2Hl7BDCrHnnZ5p7LatLcDEqHANGRBlN1G6oxFVTtQdVtA - 3m53i/3Y+QIDAQABo4HSMIHPMIHMBgNVHREEgcQwgcGCFndlYmhvb2stc2VydmVy - LXNlcnZpY2WCL3dlYmhvb2stc2VydmVyLXNlcnZpY2Uua3ViZXNwaGVyZS1kZXZv - cHMtc3lzdGVtgjN3ZWJob29rLXNlcnZlci1zZXJ2aWNlLmt1YmVzcGhlcmUtZGV2 - b3BzLXN5c3RlbS5zdmOCQXdlYmhvb2stc2VydmVyLXNlcnZpY2Uua3ViZXNwaGVy - ZS1kZXZvcHMtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FsMA0GCSqGSIb3DQEBCwUA - A4ICAQAG9tdFrUxR02kgd/qSG/p+sRQDOYpG5qqZgERhxXE32Gb4o7rJbtZ2Zvcb - SWiF1PP4QnMevycXD1dYsCSdVzGFsDA0fcyuF1sKc32ljhfTTDmymzmEJQNYXPx2 - rzqf9u+483n/+gFgLDexukXKJ5+p9gzXLePSZwE+HEgZdNplS5kfMR+Uvpo+eMhc - 6yn5aBJWLsgvKTx7Gar27PdM297vhpPFcxSbDykHJNDw2U+uxwwIR5SM1PmWhuoj - oz1UO3xeLKPPluUH/gJKGRt7rv3WDVR1u0yFFFGLumd2SAKjayTROq9nRzONjeGH - JeC7drnKcnvunaZW27NiCzfhaq0neXhaGEOpcdaYBVs0MZfnb2uaAQFy0P3HZ6UI - QISOpQ/6Prv6dgheU0hHsbjhHX8Y1Z/EpNs6nS6i2UCde+RaEgK1xxnLtBL7r76d - EBvpC49ChRZ0r7U6m8LJ6yjbLTMEPVqODcxZKn9aoXI1TCNgzW7QUv5b5qMB2oOp - q1lPSxxEQboelsczSxWK6U4uwcyGuVNymBgfPNuc7wwcPBLbuahUo6YtFNky2OKz - p2hvkjDixDbGS3Svi45eEpBnIrcma+fanPKJCYUZbiRIoD+kA8Ss5mZgtah3LcrQ - U8UUR60N6LJ52m2ik/zHh+p31ihhCz7F7JWq7itNpbjFcb9T6g== + MIIECjCCAvKgAwIBAgIUWNbcbhB3WmQeaE2EE6XZ6h9o5j0wDQYJKoZIhvcNAQEL + BQAwSDELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkhCMQswCQYDVQQKDAJRQzEfMB0G + A1UEAwwWd2ViaG9vay1zZXJ2ZXItc2VydmljZTAgFw0yNDAyMjAwNDI4MzFaGA8y + MDUxMDcwODA0MjgzMVowZTELMAkGA1UEBhMCQ04xCzAJBgNVBAgMAkhCMQswCQYD + VQQKDAJRQzE8MDoGA1UEAwwzd2ViaG9vay1zZXJ2ZXItc2VydmljZS5rdWJlc3Bo + ZXJlLWRldm9wcy1zeXN0ZW0uc3ZjMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB + CgKCAQEAzy/izqghKOE5Ttvs6ZLQB0QK2Irkl9aUGLWI9f6D2PmtW51nIjrRtzZb + 1Y2MciF3MJEXc1ZO3iEIS2vdn8jx8I/vs8DWJMBGGkiw8k5VUhh1gUJI6DfFpHjF + iOB4XnLgzdkPQ6YjUQabTp3RFSjVph/6aHHhtvLrZ1MpD7lSZkeq6p4Dxdi1pihF + vmX6AXMdBEFKv5v2EX8oe7qfJUXtM2Sai+HRVJJPNzjerPBfvqj47K9jQk9vt1aH + oSUBf7c4Fr7WoqHBq2hdE4TTtNLs66BX1USIfumXdnm3tSp/8wO4sQJAkkB5hIg5 + qzIWA8+H3s2wCyFnkYwVorodYLHYbwIDAQABo4HMMIHJMB8GA1UdIwQYMBaAFNqy + C4zRRnpuqhhARO4VF1NQmJWZMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1Ud + JQQMMAoGCCsGAQUFBwMBMHkGA1UdEQRyMHCCM3dlYmhvb2stc2VydmVyLXNlcnZp + Y2Uua3ViZXNwaGVyZS1kZXZvcHMtc3lzdGVtLnN2Y4Ivd2ViaG9vay1zZXJ2ZXIt + c2VydmljZS5rdWJlc3BoZXJlLWRldm9wcy1zeXN0ZW2CCGhvc3RuYW1lMA0GCSqG + SIb3DQEBCwUAA4IBAQCLUFqV4rppDmquyLYNsfC1i3YYlDRq6wvJ9LF+p6/RjH1G + hCxHvuUfUqVU5TjQaVmuXIuVUUXoPAEgU5RQNoMzQCMCyGmIJOqGVqJIieKlPwhV + v5mCiCBJuRPNVIQTizodDX3UzEHjz2G+zejrttuUcwvGKx5Gm5topVXnSeHxfzFz + kE8jl1MXue2vyB78FIVMRNkAMpzkS5knhVDMflkVYLLYNHB+svcNbMlz2aiKJjgK + pPFvftHdX6+OrT+FrPledE9qaqF4GlOaqYn4WbXtj+sg4v4WyPuum/P5FESb1bxo + faliszxNx37r14JHMus9JAPds6VJb3oilOoqAGWQ -----END CERTIFICATE----- prometheus: