diff --git a/cert/gyeonggi/create_secret.sh b/cert/gyeonggi/create_secret.sh new file mode 100755 index 0000000..7878fbf --- /dev/null +++ b/cert/gyeonggi/create_secret.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# 사용할 Secret 이름 +SECRET_NAME="gpulive-new-ssl" + +# 인증서/키 파일 경로 +CERT_FILE="./fullchain.pem" +KEY_FILE="./gyeonggido.nhncloud.key" + +# 대상 네임스페이스 목록 +NAMESPACES=( + default + istio-system + monitoring + argocd + gitea + ingress-nginx +) + +# 각 네임스페이스에 Secret 생성 +for ns in "${NAMESPACES[@]}"; do + echo " [$ns] Creating secret $SECRET_NAME..." + + # 네임스페이스 존재하지 않으면 생성 (선택사항) + kubectl get ns "$ns" >/dev/null 2>&1 || kubectl create ns "$ns" + + kubectl create secret tls "$SECRET_NAME" \ + --cert="$CERT_FILE" \ + --key="$KEY_FILE" \ + -n "$ns" \ + --dry-run=client -o yaml | kubectl apply -f - + + echo "✅ [$ns] Secret created or updated." +done + diff --git a/cert/gyeonggi/fullchain.pem b/cert/gyeonggi/fullchain.pem new file mode 100644 index 0000000..f114294 --- /dev/null +++ b/cert/gyeonggi/fullchain.pem @@ -0,0 +1,109 @@ +-----BEGIN CERTIFICATE----- +MIIG+jCCBeKgAwIBAgIRANT/aYwW4xCQ3VLgcoMbVX4wDQYJKoZIhvcNAQELBQAw +gZUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO +BgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE9MDsGA1UE +AxM0U2VjdGlnbyBSU0EgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gU2VjdXJlIFNl +cnZlciBDQTAeFw0yNTA5MDMwMDAwMDBaFw0yNjEwMDQyMzU5NTlaMGExCzAJBgNV +BAYTAktSMRQwEgYDVQQIEwtHeWVvbmdnaS1kbzEYMBYGA1UEChMPTkhOIENvcnBv +cmF0aW9uMSIwIAYDVQQDDBkqLmd5ZW9uZ2dpZG8ubmhuY2xvdWQuY29tMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAubeeXKwvunO6hGA7wuwkbHlFzS3O +jSQ09HjUQ5NKuc88ALwYE988aiFbFZxis3fYG5wvMauAmoItQiEvmSVw05JOILXk +3nFyihWMSFNx5Zhd097Q58ioqqEFwx6Nqs7esSHIypgUn/2jRpcWFTHc0S6QW0Z2 +9OSTN+kV+xjBkcaE6oLk0rzzJGUDVVcuu8ityS4C+vUryhJyvvdFkJSBbqk2oMqt +5CuRwjY28DpiVLoQZK6jzXOar89Su7fhw3MKRWw5aLYvMnFrlLkZhmawcF8enrJz +e9BoGVyd1ejdHJpBzdAHRJX4c4QY7kRBlkMjHROlGhvUpEkWnq5hOBe/vQIDAQAB +o4IDdjCCA3IwHwYDVR0jBBgwFoAUF9nWJSdn+THCSUPZMDZEjGypT+swHQYDVR0O +BBYEFJngBN4o26syeiJDhOpIQamiMCDoMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB +Af8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBKBgNVHSAEQzBB +MDUGDCsGAQQBsjEBAgEDBDAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3RpZ28u +Y29tL0NQUzAIBgZngQwBAgIwWgYDVR0fBFMwUTBPoE2gS4ZJaHR0cDovL2NybC5z +ZWN0aWdvLmNvbS9TZWN0aWdvUlNBT3JnYW5pemF0aW9uVmFsaWRhdGlvblNlY3Vy +ZVNlcnZlckNBLmNybDCBigYIKwYBBQUHAQEEfjB8MFUGCCsGAQUFBzAChklodHRw +Oi8vY3J0LnNlY3RpZ28uY29tL1NlY3RpZ29SU0FPcmdhbml6YXRpb25WYWxpZGF0 +aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5z +ZWN0aWdvLmNvbTA9BgNVHREENjA0ghkqLmd5ZW9uZ2dpZG8ubmhuY2xvdWQuY29t +ghdneWVvbmdnaWRvLm5obmNsb3VkLmNvbTCCAX0GCisGAQQB1nkCBAIEggFtBIIB +aQFnAHYA2AlVO5RPev/IFhlvlE+Fq7D4/F6HVSYPFdEucrtFSxQAAAGZDiwXdwAA +BAMARzBFAiBNtOjsfvAI7T+gWzeLTFzwrFJ7nEoVMzGNkK++sgy9mgIhAPynMQ5J +lbs4HqDNJHVYcDSXy6O66roMk4nNOUG7/2xbAHUArKswcGzr7IQx9BPS9JFfER5C +JEOx8qaMTzwrO6ceAsMAAAGZDiwXEQAABAMARjBEAiAHlTIt+6ie5U2vcupFnM02 +WyCLs9TeQMk/XSUNxU4QKQIgZKXXE85KStTt4XO/ENtagIAEy6XC5eDETRhpO/sV +rYwAdgDXbX0Q0af1d8LH6V/XAL/5gskzWmXh0LMBcxfAyMVpdwAAAZkOLBcNAAAE +AwBHMEUCIQCo5zbD39Tmvq1IN7VP3MhXo3ZcpydxboGE0R9dR1qZ+wIgeiLMc9mV +6Yx+pH8EqjKbRghAZT1JaHZKLs9TZQYD0qcwDQYJKoZIhvcNAQELBQADggEBACsY +woz4IsGGjSm2NEmfSWZYzSVZJiFOB8eeIszUClcvBVWQM7I2kQbxbKiuYWQx09IO +qfQ+6NO8Vw22X1fOR7sd8DheEE4SF/ogUhTOkv2sM4p1OlDXAnktsOzoGwLmZFyv +CPMPYA54iolsDKOgKLGW21onK0IL56A52RTqTv+QJwKDVkvk7M4b5J4OGb/EqPuI +jpAKQUznK1hikPxjbfcMm42SqsuwvyDudOVK8D2zLIYxvF1sBQKTdmUTezgkTzXe +F45o5kjmEHRrGWcJfQX8Shf9Lan3Ab3XelD85+0yU44mbpmYGWIUvVHzaOy7kvnq +fkBOkLV0GDkV4TUkwmk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGGTCCBAGgAwIBAgIQE31TnKp8MamkM3AZaIR6jTANBgkqhkiG9w0BAQwFADCB +iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl +cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV +BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTgx +MTAyMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjCBlTELMAkGA1UEBhMCR0IxGzAZBgNV +BAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UE +ChMPU2VjdGlnbyBMaW1pdGVkMT0wOwYDVQQDEzRTZWN0aWdvIFJTQSBPcmdhbml6 +YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAnJMCRkVKUkiS/FeN+S3qU76zLNXYqKXsW2kDwB0Q +9lkz3v4HSKjojHpnSvH1jcM3ZtAykffEnQRgxLVK4oOLp64m1F06XvjRFnG7ir1x +on3IzqJgJLBSoDpFUd54k2xiYPHkVpy3O/c8Vdjf1XoxfDV/ElFw4Sy+BKzL+k/h +fGVqwECn2XylY4QZ4ffK76q06Fha2ZnjJt+OErK43DOyNtoUHZZYQkBuCyKFHFEi +rsTIBkVtkuZntxkj5Ng2a4XQf8dS48+wdQHgibSov4o2TqPgbOuEQc6lL0giE5dQ +YkUeCaXMn2xXcEAG2yDoG9bzk4unMp63RBUJ16/9fAEc2wIDAQABo4IBbjCCAWow +HwYDVR0jBBgwFoAUU3m/WqorSs9UgOHYm8Cd8rIDZsswHQYDVR0OBBYEFBfZ1iUn +Z/kxwklD2TA2RIxsqU/rMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/ +AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHSAEFDASMAYG +BFUdIAAwCAYGZ4EMAQICMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNl +cnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNy +bDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jcnQudXNlcnRy +dXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAlBggrBgEFBQcwAYYZ +aHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAThNA +lsnD5m5bwOO69Bfhrgkfyb/LDCUW8nNTs3Yat6tIBtbNAHwgRUNFbBZaGxNh10m6 +pAKkrOjOzi3JKnSj3N6uq9BoNviRrzwB93fVC8+Xq+uH5xWo+jBaYXEgscBDxLmP +bYox6xU2JPti1Qucj+lmveZhUZeTth2HvbC1bP6mESkGYTQxMD0gJ3NR0N6Fg9N3 +OSBGltqnxloWJ4Wyz04PToxcvr44APhL+XJ71PJ616IphdAEutNCLFGIUi7RPSRn +R+xVzBv0yjTqJsHe3cQhifa6ezIejpZehEU4z4CqN2mLYBd0FUiRnG3wTqN3yhsc +SPr5z0noX0+FCuKPkBurcEya67emP7SsXaRfz+bYipaQ908mgWB2XQ8kd5GzKjGf +FlqyXYwcKapInI5v03hAcNt37N3j0VcFcC3mSZiIBYRiBXBWdoY5TtMibx3+bfEO +s2LEPMvAhblhHrrhFYBZlAyuBbuMf1a+HNJav5fyakywxnB2sJCNwQs2uRHY1ihc +6k/+JLcYCpsM0MF8XPtpvcyiTcaQvKZN8rG61ppnW5YCUtCC+cQKXA0o4D/I+pWV +idWkvklsQLI+qGu41SWyxP7x09fn1txDAXYw+zuLXfdKiXyaNb78yvBXAfCNP6CH +MntHWpdLgtJmwsQt6j8k9Kf5qLnjatkYYaA7jBU= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB +iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl +cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV +BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw +MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV +BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU +aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy +dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK +AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B +3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY +tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/ +Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2 +VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT +79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6 +c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT +Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l +c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee +UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE +Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd +BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G +A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF +Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO +VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3 +ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs +8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR +iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze +Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ +XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/ +qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB +VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB +L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG +jjxDah2nGN59PRbxYvnKkKj9 +-----END CERTIFICATE----- diff --git a/cert/gyeonggi/gyeonggido.nhncloud.key b/cert/gyeonggi/gyeonggido.nhncloud.key new file mode 100644 index 0000000..2e6c6af --- /dev/null +++ b/cert/gyeonggi/gyeonggido.nhncloud.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5t55crC+6c7qE +YDvC7CRseUXNLc6NJDT0eNRDk0q5zzwAvBgT3zxqIVsVnGKzd9gbnC8xq4Cagi1C +IS+ZJXDTkk4gteTecXKKFYxIU3HlmF3T3tDnyKiqoQXDHo2qzt6xIcjKmBSf/aNG +lxYVMdzRLpBbRnb05JM36RX7GMGRxoTqguTSvPMkZQNVVy67yK3JLgL69SvKEnK+ +90WQlIFuqTagyq3kK5HCNjbwOmJUuhBkrqPNc5qvz1K7t+HDcwpFbDloti8ycWuU +uRmGZrBwXx6esnN70GgZXJ3V6N0cmkHN0AdElfhzhBjuREGWQyMdE6UaG9SkSRae +rmE4F7+9AgMBAAECggEAJfsqdPN182DVpVr0/eFDdbe7kcGre2wLNHA9oPBPmP6L +2+6b0fyWo3Hc6eeIvAFnfgYMFNFpRLAYx2x4Co8AqxRBzCjG/MMg1KKhhO0j3vux +PLJV8QE1lWfHAOePu34BRyKMqPo/RZUevkIJ7x26dkFanoAjtePFQ+r0ZtziQYiJ +vyMDY7MUX/Fx19uZW3Fa/MsyXI79pf+spPetE0rQviurAaY/4zheIhc3duQgi1jj +GHDloUSgW2ZJcbzPptQmdM921RDStyhX1Ba8gbeQZHcxRiHyFkxVXvN5PwtoN9+i +lRhBxnjczUjIfeZJTScaCM7DptojL2HNkq4bTPm1IQKBgQDkmW0YDAT0V9qEM/SC ++oa7BkLm012CfCZ18LYqlmSJlCEK5g5r6QxLbznLVWU6LgHsj6IVWNVyVOSEEp0I +uqOV+L+RarzITTtqb6hk0GSeiF31hPPkNprUfvvrF59Qd8aqV7wAwiphOw0YkMdc +rPPLjzurWEB465NjoJRD8O0EBQKBgQDP+lsQ+C3mQTpCv7e4UnGYVpQbCEywaOxg +V/rQ2ZrBuVPyjnTLKzFHia6sAjXyxrakRloBpUygRAXbK7UJSdTMAiWf5w+BSs3G +YmKdg8EM/zgd5tGsvL/ZaKmyBtYkFYBdBRC+H/c1O9Wb53jSbt60XRqRucz0vg7c +GyjXSxUSWQKBgDvlx6QJYjLz4hnJ00OOiUbv+Q+qSlIqXZmBnPnDtkwmOBI2/Yhg +5AvP9QDGO2PnMjHd4MZfJG50t/uzNNpYrQxaxTdBFH4XXn4hC6p+wB6Z9KSkVZNy +i1cqfq+23NOkzrVLj8NTHO+lHWVWaiZqWub3fNcEpMAKWfA83xx+QFxRAoGAChxP +pQmLoa/2Fxye39USNKew14eVwtW2+BAO32xUu6o4zIfkYaQd5y5oUXBiEwVaB65r +3byddwUXi8oaKPNv5uML1TQ0asKqMkTCKoonLmyR29JGyzD52qXd6guvCV4KOXtv +ju6a4/mers+X7hL5vKbyDbeMoTFEI6smVyENSzECgYEA3qmNHAHPaD4r/YyuJ482 +DWEADGj9hIuAgYz47taW6rm7/LIl0xg8Vm4fJEx9Gz4rQKBkRxVxgBt1Nft8vT3z +IIqt+XyRf+sy8b0OauCavoR/+tCYS9/iESRZDhQMMxYUZwmHLlMGUus0WHJsehgm +t1xy6BgddEACs/VR+DQs2Hw= +-----END PRIVATE KEY----- diff --git a/template/gyeonggi/argocd_v2.12.3/3_apply/ing.yaml b/template/gyeonggi/argocd_v2.12.3/3_apply/ing.yaml index 1cec7d2..29bd110 100644 --- a/template/gyeonggi/argocd_v2.12.3/3_apply/ing.yaml +++ b/template/gyeonggi/argocd_v2.12.3/3_apply/ing.yaml @@ -9,10 +9,13 @@ metadata: nginx.ingress.kubernetes.io/backend-protocol: "https" nginx.ingress.kubernetes.io/ssl-passthrough: "true" nginx.ingress.kubernetes.io/whitelist-source-range: | - 114.110.128.150/32, - 114.110.128.46/32, - 114.110.132.4/32, - 114.110.132.5/32, + 133.186.208.56/32, + 133.186.208.12/32, + 133.186.251.95/32, + 125.6.60.6/32, + 125.6.60.4/32, + 125.6.60.5/32, + 125.6.60.7/32, 106.254.240.2/32, 103.243.200.17/32, 103.243.200.31/32, @@ -26,7 +29,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: argocd.gpulive.nhncloud.com # 사전 생성된 인증서의 도메인적용. + - host: argocd.gyeonggido.nhncloud.com # 사전 생성된 인증서의 도메인적용. http: paths: - path: / @@ -38,6 +41,6 @@ spec: number: 443 tls: - hosts: - - "argocd.gpulive.nhncloud.com" + - "argocd.gyeonggido.nhncloud.com" secretName: gpulive-new-ssl diff --git a/template/gyeonggi/gitea/1_configure/5_secret.yaml b/template/gyeonggi/gitea/1_configure/5_secret.yaml index a3166b4..fe30970 100644 --- a/template/gyeonggi/gitea/1_configure/5_secret.yaml +++ b/template/gyeonggi/gitea/1_configure/5_secret.yaml @@ -63,12 +63,12 @@ stringData: security: INSTALL_LOCK=true server: |- APP_DATA_PATH=/data - DOMAIN=gitea.gpulive.nhncloud.com + DOMAIN=gitea.gyeonggido.nhncloud.com ENABLE_PPROF=false HTTP_PORT=3000 PROTOCOL=http - ROOT_URL=https://gitea.gpulive.nhncloud.com - SSH_DOMAIN=gitea.gpulive.nhncloud.com + ROOT_URL=https://gitea.gyeonggido.nhncloud.com + SSH_DOMAIN=gitea.gyeonggido.nhncloud.com SSH_LISTEN_PORT=2222 SSH_PORT=22 START_SSH_SERVER=true diff --git a/template/gyeonggi/gitea/3_apply/ing.yaml b/template/gyeonggi/gitea/3_apply/ing.yaml index 3eb4968..30df802 100644 --- a/template/gyeonggi/gitea/3_apply/ing.yaml +++ b/template/gyeonggi/gitea/3_apply/ing.yaml @@ -7,10 +7,13 @@ metadata: nginx.ingress.kubernetes.io/force-ssl-redirect: "true" nginx.ingress.kubernetes.io/proxy-body-size: "0" nginx.ingress.kubernetes.io/whitelist-source-range: | - 114.110.128.150/32, - 114.110.128.46/32, - 114.110.132.4/32, - 114.110.132.5/32, + 133.186.208.56/32, + 133.186.208.12/32, + 133.186.251.95/32, + 125.6.60.6/32, + 125.6.60.4/32, + 125.6.60.5/32, + 125.6.60.7/32, 106.254.240.2/32, 103.243.200.17/32, 103.243.200.31/32, @@ -24,7 +27,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: gitea.gpulive.nhncloud.com + - host: gitea.gyeonggido.nhncloud.com http: paths: - path: / @@ -36,6 +39,6 @@ spec: number: 3000 tls: - hosts: - - "gitea.gpulive.nhncloud.com" + - "gitea.gyeonggido.nhncloud.com" secretName: gpulive-new-ssl diff --git a/template/gyeonggi/ingress-nginx/3_apply/deploy.yaml b/template/gyeonggi/ingress-nginx/3_apply/deploy.yaml index ecac590..f0b22ce 100644 --- a/template/gyeonggi/ingress-nginx/3_apply/deploy.yaml +++ b/template/gyeonggi/ingress-nginx/3_apply/deploy.yaml @@ -1,6 +1,9 @@ apiVersion: v1 kind: Service metadata: + annotations: + prometheus.io/port: "10254" + prometheus.io/scrape: "true" labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx @@ -97,7 +100,7 @@ spec: - --validating-webhook=:8443 - --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-key=/usr/local/certificates/key - - --enable-metrics=false + - --enable-metrics=true env: - name: POD_NAME valueFrom: diff --git a/template/gyeonggi/monitoring/overlays/default/grafana/patch-cm.yaml b/template/gyeonggi/monitoring/overlays/default/grafana/patch-cm.yaml index f66e03f..b6539dc 100644 --- a/template/gyeonggi/monitoring/overlays/default/grafana/patch-cm.yaml +++ b/template/gyeonggi/monitoring/overlays/default/grafana/patch-cm.yaml @@ -23,8 +23,8 @@ data: plugins = /var/lib/grafana/plugins provisioning = /etc/grafana/provisioning [server] - domain = 'monitoring.gpulive.nhncloud.com' - root_url = 'https://monitoring.gpulive.nhncloud.com/frame/monitoring' + domain = 'monitoring.gyeonggido.nhncloud.com' + root_url = 'https://monitoring.gyeonggido.nhncloud.com/frame/monitoring' serve_from_sub_path = true [auth.anonymous] enabled = true @@ -35,3 +35,6 @@ data: content_security_policy = true [panels] disable_sanitize_html = true + [database] + wal = true + busy_timeout = 10000 diff --git a/template/gyeonggi/monitoring/overlays/default/grafana/patch-ingress_grafana.yaml b/template/gyeonggi/monitoring/overlays/default/grafana/patch-ingress_grafana.yaml index 089e021..3667a67 100644 --- a/template/gyeonggi/monitoring/overlays/default/grafana/patch-ingress_grafana.yaml +++ b/template/gyeonggi/monitoring/overlays/default/grafana/patch-ingress_grafana.yaml @@ -6,7 +6,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: monitoring.gpulive.nhncloud.com + - host: monitoring.gyeonggido.nhncloud.com http: paths: - backend: @@ -18,7 +18,7 @@ spec: pathType: Prefix tls: - hosts: - - monitoring.gpulive.nhncloud.com + - monitoring.gyeonggido.nhncloud.com secretName: gpulive-new-ssl diff --git a/template/gyeonggi/monitoring/overlays/default/prometheus/patch-ingress_alertmanager.yaml b/template/gyeonggi/monitoring/overlays/default/prometheus/patch-ingress_alertmanager.yaml index faea305..411fa38 100644 --- a/template/gyeonggi/monitoring/overlays/default/prometheus/patch-ingress_alertmanager.yaml +++ b/template/gyeonggi/monitoring/overlays/default/prometheus/patch-ingress_alertmanager.yaml @@ -5,10 +5,13 @@ metadata: namespace: monitoring annotations: nginx.ingress.kubernetes.io/whitelist-source-range: | - 114.110.128.150/32, - 114.110.128.46/32, - 114.110.132.4/32, - 114.110.132.5/32, + 133.186.208.56/32, + 133.186.208.12/32, + 133.186.251.95/32, + 125.6.60.6/32, + 125.6.60.4/32, + 125.6.60.5/32, + 125.6.60.7/32, 106.254.240.2/32, 103.243.200.17/32, 103.243.200.31/32, @@ -22,7 +25,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: alert.gpulive.nhncloud.com + - host: alert.gyeonggido.nhncloud.com http: paths: - backend: @@ -34,5 +37,5 @@ spec: pathType: Prefix tls: - hosts: - - alert.gpulive.nhncloud.com + - alert.gyeonggido.nhncloud.com secretName: gpulive-new-ssl diff --git a/template/gyeonggi/monitoring/overlays/default/prometheus/patch-ingress_prometheus.yaml b/template/gyeonggi/monitoring/overlays/default/prometheus/patch-ingress_prometheus.yaml index c2f1762..279c2df 100644 --- a/template/gyeonggi/monitoring/overlays/default/prometheus/patch-ingress_prometheus.yaml +++ b/template/gyeonggi/monitoring/overlays/default/prometheus/patch-ingress_prometheus.yaml @@ -5,10 +5,13 @@ metadata: namespace: monitoring annotations: nginx.ingress.kubernetes.io/whitelist-source-range: | - 114.110.128.150/32, - 114.110.128.46/32, - 114.110.132.4/32, - 114.110.132.5/32, + 133.186.208.56/32, + 133.186.208.12/32, + 133.186.251.95/32, + 125.6.60.6/32, + 125.6.60.4/32, + 125.6.60.5/32, + 125.6.60.7/32, 106.254.240.2/32, 103.243.200.17/32, 103.243.200.31/32, @@ -22,7 +25,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: prometheus.gpulive.nhncloud.com + - host: prometheus.gyeonggido.nhncloud.com http: paths: - backend: @@ -34,5 +37,5 @@ spec: pathType: Prefix tls: - hosts: - - prometheus.gpulive.nhncloud.com - secretName: nhngpuaas-ssl + - prometheus.gyeonggido.nhncloud.com + secretName: gpulive-new-ssl