From 7ad4bf0b5df0c13dcfed158660c603f58df5d960 Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 24 Jun 2025 09:40:45 +0200 Subject: [PATCH] add prometheus --- deployed_config | 8 +-- opencloud/charts/hydra/values.yaml | 6 +- opencloud/dev-values.yaml | 67 ++++++++++++------- opencloud/prod-values.yaml | 57 ++++++++++------ opencloud/templates/openCloudConf.yaml | 4 +- .../templates/prometheus/deployment.yaml | 22 ++++++ opencloud/templates/prometheus/service.yaml | 11 +++ 7 files changed, 120 insertions(+), 55 deletions(-) create mode 100644 opencloud/templates/prometheus/deployment.yaml create mode 100644 opencloud/templates/prometheus/service.yaml diff --git a/deployed_config b/deployed_config index 8870464..6355058 100644 --- a/deployed_config +++ b/deployed_config @@ -1,8 +1,8 @@ apiVersion: v1 clusters: - cluster: - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lJVFA2eU84cjFJTm93RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBek16RXdOekUyTXpsYUZ3MHpOVEF6TWprd056SXhNemxhTUJVeApFekFSQmdOVkJBTVRDbXQxWW1WeWJtVjBaWE13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLCkFvSUJBUURuY0tKTEY2TGNRb2dTMS9Nclkwcm9XVVZqbzB6UE1XNmdpSzR3OWpUYmdXQnEyVlNkTWRHV01EY0YKNXREa0dwWUI2UlEwL0NEdXNPdTcyaU85bU56K0g3MWRnSDBFUG4vNUdSNDcvT2NqRzlncGwxMk9QdUVqdTJTWApZUlY1bTg0QWl5Z3FjTVJtY0greEIvVURQaTVvd2czMFByQ0xhM1E4OVdvYURIQkZZd0ZMRTNtY3NlS0cxelE4Ck9icnhISWU3TUJpUjk2bVFSbjV6dHRINlArZ2dmOTNQMUdGSk5zd2dRVmpTZC8yTlRiTXJYMWhLRG5Sa2Y1QWcKWW4vNUhidk4xeTZCOFZNc2xJUnJNNVVPNGVGY0oxamVnbDMyUFEwZm5aMm5EaGRkZ3NYb3JwbjBzK3JURkM1bApFU3VvMTlETGxTdE01bHJ3Z244TmN5eUxxSnZ4QWdNQkFBR2pXVEJYTUE0R0ExVWREd0VCL3dRRUF3SUNwREFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJRQXlUSy9SRmsxRDZrTkJuVWRaSEdFb0M2L3ZUQVYKQmdOVkhSRUVEakFNZ2dwcmRXSmxjbTVsZEdWek1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQ1dRZm5sNTE4Zwp1cyttdjRFN1lNS25jcnh3dnhRbEdmNWVjWXZ1eUFJMU5ScGdud2tMTm9QeWptRVdiZWE5SVo5Z2JndkVVakFQCjdJUzloQU1sc2M4M2xxQTBWT3cxa0t4YTVIb0UyL2paUDlHUElrOUhSaHVxaGljY24vNWJpZWwrRlFHYVZkY0IKMlQxdGdsU254eno5RVdzSFkvTDl3dkFJM2VuSVhjSFNsT1l6MWpia1BqOWZXZFRXZ1JEOWFhaWFwRDNUVUloTgpYTG9OVmhiMWVxTXZsa2RQeEsxaHZxVEJqVkNMQk1KOTBZTGMzUkh3TkpicG1kUXJvTkpYbzY4bE9sVmZ2Tzk5CmlHTjFkcW9zbGltOENrYXRBTlJrak54RmtITitEdXpUMFAza2RHUHJQK2ZBN1lxWWIvZEMwOGhvTDZJSi9zdUYKRWpkYTBTcHFGcEZDCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - server: https://127.0.0.1:36641 + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lJS1huSGhrNXV6cjR3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBME1ETXdOalUzTlRsYUZ3MHpOVEEwTURFd056QXlOVGxhTUJVeApFekFSQmdOVkJBTVRDbXQxWW1WeWJtVjBaWE13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLCkFvSUJBUUNtcUM1VWwwYTloNEZLUmxsZ0hEaGJtbVlIOGdMVXNpMzRkVzRSZEY0N3pUWW43YklVYm5KaWxXenMKbFJVek9ZdytZUEE3cWdrOG56TUxaZUpTeXI3TnpDSmpYTm9tNFJGYi82RXFtNVRRUkdYQ0ZjNHJwZC9WcXYyQQpudkZxTFF2SXc2SGsrc1pVNS9PU21FSm9VZWdRbFp2NGxYNXZQeDdQbEVmR1Y1MG9RYlprNEUvc0tpcEQ3YlVrCnlKeUkyN054TUM0ZkRiK0FTNWZPbWtrNFlpdis4bG0zUEdCVXp1ZGMzdFFyd1NuNGtmWitYTnBkRk9KeXh2cEgKVjliSTdCb3NXbGthU3hTQWUxQllCMEpOdXVYSjFhZjMwcmk3TjF4MGFrc1JSdEYyUzVUeCtmNXhlRDNJTG1zbwp3QzdTTG82VjI1Um5oVnV6UGtiR0ZkbzJnQ2RQQWdNQkFBR2pXVEJYTUE0R0ExVWREd0VCL3dRRUF3SUNwREFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJSSzk1NEExY1ZGdktVUmxaMXI0ejUrOGZqdFVEQVYKQmdOVkhSRUVEakFNZ2dwcmRXSmxjbTVsZEdWek1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQXhzZFdha3FSWgpJUzBMUXM3RUFrdVZrUzRGdTRoY2R2UzA5K29OTHA0Z0dLN3JjRXRob1dQVjlzK01jL01ZRStqaXIzYWlsakZUCm9zK0JVNE1vMmtHQnFIbkRUY3dBTjFzeVpib2p1QzJGRlN4SFNxeEJSK1lUL1RmWm5Tdkd0NUNNVEpudG1iMk8KeTduUmx6TUpYaXo3THF0d0xVMlZONTgwdUNDRTYrNkZyb041bjZna1hlYjJ0dXpMMzN4OW1yUUN4biswMjBpRApVcUUwSTZqZHhIcGl6dDZaSzBKQnRMYlZYVHExbFBDN00rMnNyVXRVUlg1ckp1OE91RTZ0WUhrbTV4UnlVTnJUCmJiZUdQWHRBTGdLWStMMVgybSsvT0kzNEEzRWV6cy91dTBpRHVYTWVBM1Z3UWxUZlROY2NXS1Z6STRxQ0lidTcKQ3NFOTBCNDRETkx0Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + server: https://127.0.0.1:41449 name: kind-opencloud contexts: - context: @@ -15,6 +15,6 @@ preferences: {} users: - name: kind-opencloud user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLVENDQWhHZ0F3SUJBZ0lJR3pRd29aaDl4M3N3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBek16RXdOekUyTXpsYUZ3MHlOakF6TXpFd056SXhNemxhTUR3eApIekFkQmdOVkJBb1RGbXQxWW1WaFpHMDZZMngxYzNSbGNpMWhaRzFwYm5NeEdUQVhCZ05WQkFNVEVHdDFZbVZ5CmJtVjBaWE10WVdSdGFXNHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDNlRTemsKKzRXNThCNTZpckJQN0JIUXlVbXViaUxJNGN0QjZMQ2I2S0Yxb0lmM3JqMk1vTDVwcXFtTmlLazQxMW5RYk9JOQovczlZMHFQQmpsb0ZmdzR5UFpWNHZWd3VXNkxCTmxZTlNYNXdCYUUzZ1ZhS0dpMzFUVFVFM2gySXFnZUtzcTQxClhkMWN2UUR0dkFsZEk1cUw3dDNWczFVTENiaEtEdUNza2I3TjByQ3NSeUJ4eUVWUncwa05vQkdiUWV2Ym5QRnUKUXV3M1RaZlJPRkJ4UnVmR25CWTBubTZqVGhCS3M5T0xnSThTVUNwUHh6L2czWElaMXkrUmt6d0FKdE9zTnFPaQpkdWIxTnFYSE1YNC8vY3BzQ081TktUWWJUSkxRYmgzNktxdHZYSHhwRFJ6OXBjT0JJc0hsTUNIS2FlSFNLb1RzCk4xMlJvR0MxT3JOVjRKczdBZ01CQUFHalZqQlVNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUsKQmdnckJnRUZCUWNEQWpBTUJnTlZIUk1CQWY4RUFqQUFNQjhHQTFVZEl3UVlNQmFBRkFESk1yOUVXVFVQcVEwRwpkUjFrY1lTZ0xyKzlNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUIvSG1hSVA4bmlpWkduY0lZQzkyL1NxMFU3CndxeW9abFhRaWd3TndlemgwaWk1NUZ4OGV0WGJ5RitCT244R2EzSFphVW5kYkJPeDVlMWFEM1o3MFFVd2FZdDgKbkJnN3d0VXhIZE55bXpwbldSeU1HQWpwcHNmc29BaVlVMnY0bjYwdCtTZzUrRFRlUS8vc2hLQkl5N1Y1MlFQZQplRllhNmh6UUpyYUV1Z1UxcjhqeC9CdUFaZHdOeTNqY3hrUHpoVE1lVXg3aUxjTE90b21DaVBxdE1semVHVWwyCkhTOU1tdVE3Wmx1bVJOUkV4Y0oxTnRIMDNobHBCVE9RK2FHdWZGa0xFM2ZrbmQvQWlXd2ZmQVBlK2VpSFNXYnUKT1FIVy9tZi91Q0ZWZmRKbWdVZFJ2UFZ1M0dkYzZQZzB4S0l1Slkyb01JdkJ2ZktEMFVQaUVQdHRZMjkyCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBdWswczVQdUZ1ZkFlZW9xd1Qrd1IwTWxKcm00aXlPSExRZWl3bStpaGRhQ0g5NjQ5CmpLQythYXFwallpcE9OZFowR3ppUGY3UFdOS2p3WTVhQlg4T01qMlZlTDFjTGx1aXdUWldEVWwrY0FXaE40RlcKaWhvdDlVMDFCTjRkaUtvSGlyS3VOVjNkWEwwQTdid0pYU09haSs3ZDFiTlZDd200U2c3Z3JKRyt6ZEt3ckVjZwpjY2hGVWNOSkRhQVJtMEhyMjV6eGJrTHNOMDJYMFRoUWNVYm54cHdXTko1dW8wNFFTclBUaTRDUEVsQXFUOGMvCjROMXlHZGN2a1pNOEFDYlRyRGFqb25ibTlUYWx4ekYrUC8zS2JBanVUU2syRzB5UzBHNGQraXFyYjF4OGFRMGMKL2FYRGdTTEI1VEFoeW1uaDBpcUU3RGRka2FCZ3RUcXpWZUNiT3dJREFRQUJBb0lCQUE4NFF0U3FIN0NqQnpwbgpuaVBKVzJNOUxvSExpWmZ6cWxGR0d6ZUJkNzlPVUExUjlNRktXSVAxWjBpaXc0QmJSNEVaaEJvZ2VQditxVllrCnRRSUI4VHoxZndLUUpibTd6cjRPSEZXVmpYakZYUGhWM3FZRm9YK0t3U3dXb1Q4SzlQYkZ4aW1oODNXaUV6TlkKeTBNS3A1T0svaUI1T0JkZ3dlZDY4NnZsZERzSU9ha3UxVTM5Rm80VnU3QmFUa2lOWGdGbEhIdHNXREI3ejd6bQpLVm1WOS8zcThmR3c4MWZxdTJHN1BUcG1YVFc1bzVST3BoWFA3ajVTNTRrY3hwTTVWVUptUWd0N1lST1diNXljCjVIZDRNaGllZEM0SUFla0IzaWpPYWlzM0tjSFhLdE5PdzN2SEFTSlhmejFOcnlYVTQ3QWVOZ3MwNXpoU1loTXMKYkFmZVphRUNnWUVBMVExbXlJcng2cHlWcVdOWHJtS3g2cnlBRFIrNStiNjBuTmQ3aUFnM2RXS3FIWTVYbHFtcAplYkdXelVrZ2Y2bWh2Tk1sVmV1bGJabkhna2ZKWkZXUFhuUWRINGFFYytYWEhqa2svOG5BMnp0Ymp0bnE5dTlRCjFRNnQwRHM3eExlSkduczgzZDV1NEdRZVVpdFF1TktCUkZWa0Q0WGsvSXpvWVJlK0hFY1g2VWtDZ1lFQTM5dEsKWDRORXIwaWdBZDliZTZrN0R3d0hlZ2x6Y3ZVYmFJaHIzbEpWUnNudjM4RmtpUEdiUUFnRGlvZzBSOU4xZHo1ZAo1eEVrVUxScFNkVXpoeVY2MTNHQUd1M2hsNHRWREczOUpFUVl0aWZ5MjNWV2loakZ3QjJIS3BKbTNxTWdKQ0V2CnBaeGV1SmJxS0lvY0JId3BrZzh3VUFsVEg2VWJ1SlZ1RjZwYVJHTUNnWUFNeWZjbmhwK3E4NmRRT2JSanRXejAKcUVnUGdaNEtUZFpOcSttd2FyM1pnQWl5S1g4OGZnYThWVnEyQy9PMWRodE5XR2RmVnZ2aExsLzVoQkdrd2pZTwo5MjFnSFJVS1YvdW54c3BmeUY2WlNtRGVuRm9zWklVM3BOL3VKZ0FhZU9IMEF2M09XN0hRS25KZmdGWWlJaEM4CloxdlFTcnRLSmJNMVVOV0tvUUhnY1FLQmdFWTJ0aUUzUHpmcmc2U1N0bE1YUlpyMm52RzhQU1gxazE4NlN2czAKditLd1BEam1vKzRBT2ozZlJaMFNFN1BqczVodlMyektoNlY0c1AyampjSDZFNG0zNUFLT1VwQUI5KzhxSUpoYgpjNVRPK3ZHeTRDMzRqeTR2Rk5KWmtVS0x6KzBGSzdpNlQwdCtxbnVFdGowQjVOZ1hRNFFYS0tkb1ZrV1RPVERiCkVlMFpBb0dCQUszZzFuLzB3aktJaFhhbGxPalgraXo3NEEzaVdUWWh3SG1XMjlTR0pWL20zY3l3a1JPWVVKcjgKR1hYamo2YWsvd0g4bXFvMEtpb2pRZWpKS1dzbjVHMDJxaXFGY1FseExtM0dxYTR6OXBZd1VCTFVzL0hWdTVOTwpwanBTMHpVM01UcmVtUStYNmF2MDdQNzcyRGlDTEJyY1YwOFJybStFVDkycFNreGNUOG90Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLVENDQWhHZ0F3SUJBZ0lJV09YL1R4a255L1l3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBME1ETXdOalUzTlRsYUZ3MHlOakEwTURNd056QXlOVGxhTUR3eApIekFkQmdOVkJBb1RGbXQxWW1WaFpHMDZZMngxYzNSbGNpMWhaRzFwYm5NeEdUQVhCZ05WQkFNVEVHdDFZbVZ5CmJtVjBaWE10WVdSdGFXNHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEY3VLc3MKNDNTcFZpa0t6L0c5MU04K3RMbC9hL0FMMi9uckJkUVFWMVBadmJ2cUF3VWozbWdoenVTdTRXZ2laV2lteFZ6SQowRnNPbzhzVk9QRVF6SExOaVo4ejROZGRTN3NZSjY4clpsR1RZb3Zyb1BWQzJKcWdUOVpqZ1FWRDJqYUsyYWhkCmd3WmxIVUlIYW9meWl6UEQ0S1IzSWcwd1dWSHRDbnpob2kxUTJreXlrdFh5QkZrSzczTkJBZVpBNEtUdURQNUEKbWFJMXNBS2hoM25ranFPd2JubFhNdmV0b0ZjT0krYlpyUk04UDE5ZUR2QnB1OWNEcXRyUjg1dm40em5aaFNpYwpBamdtT29sNUZUdmNpYTdQTnV3RTVPTVptSWdieDR3TzFPZlcxZm0yVnJnMWJReGlVU04rOGxpdi82bHNna0h1CkNzYmxER1VuUmZQdWVNcXBBZ01CQUFHalZqQlVNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUsKQmdnckJnRUZCUWNEQWpBTUJnTlZIUk1CQWY4RUFqQUFNQjhHQTFVZEl3UVlNQmFBRkVyM25nRFZ4VVc4cFJHVgpuV3ZqUG43eCtPMVFNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUFTd0Q1YzVwK2pSMkFKUkEwY21jY3E5WXcrCjBSR0k5citvTDg0dEZPUDJrdTEzQTdwUHZ4UlUzTVlxclg1WWpvYmZBbGN5eG9jM3ZsU0U2ZGVHUDRNZ3hIdFkKWnJuSUg2SzA1eE1iaC9tc2I2QmZPQmNMWWNQaVRCNC92SjNMN0pRdDhjc0RZd0RZeXRpd1NTRFRBMXEyZjQvdQorZG5DRXczdXYvK0pVL2RyVDR5MDdTMHA5OHowelhZaENaVXN5a2d0ekFkZDlLYWNoeU8wbGU4WHg3VWx4SzF5CkZDb2RHYXdweW94SFpvT0dVZ0dQK2NZNWR1bys1Tk5QNE1WRHMvQlIyZWkxR1pkcDJMUERZeUxSdVB3YnVXS3AKS3Raa0dtMFFQL1I0WnNVVXhpOVdpaTJ0TEhEVGxuL1ZJZUdXeFgrRStDR1dzTkRacEhkUEVwNERFVHEyCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBM0xpckxPTjBxVllwQ3MveHZkVFBQclM1ZjJ2d0M5djU2d1hVRUZkVDJiMjc2Z01GCkk5NW9JYzdrcnVGb0ltVm9wc1ZjeU5CYkRxUExGVGp4RU14eXpZbWZNK0RYWFV1N0dDZXZLMlpSazJLTDY2RDEKUXRpYW9FL1dZNEVGUTlvMml0bW9YWU1HWlIxQ0IycUg4b3N6dytDa2R5SU5NRmxSN1FwODRhSXRVTnBNc3BMVgo4Z1JaQ3U5elFRSG1RT0NrN2d6K1FKbWlOYkFDb1lkNTVJNmpzRzU1VnpMM3JhQlhEaVBtMmEwVFBEOWZYZzd3CmFidlhBNnJhMGZPYjUrTTUyWVVvbkFJNEpqcUplUlU3M0ltdXp6YnNCT1RqR1ppSUc4ZU1EdFRuMXRYNXRsYTQKTlcwTVlsRWpmdkpZci8rcGJJSkI3Z3JHNVF4bEowWHo3bmpLcVFJREFRQUJBb0lCQUNEU3paSGxXV245U0NrMQpkMHUxcEFROU9BQzgrbnVwQU9kMGZHN1pyYnlKdkxJMk5NTjZ4WjJSZU95UTFMMll1eEZoOUVSZ3g4bkxqZDNnCkUrbGRuZ3oyMUZnUXJiWlFGc2ltemlQMEdWbURwQzhzUm96a1RVcGQxUklERTlkZFVoTWYveXU0Mm5DYkEwQzcKRlBCNnh2M3dJRVVmS1RyeGJYK0V1Y0dNTHBVQk92YjQ1VUE3OFovK3dteVFGcUR0OE9nRnRCRkI4Q3dmRDNaZApkdTA0NkNwbDVnUDVOSWpMUm5vTUM4MHBTYTNTK2tpUkxUZWJNaVRkTkdLdDNRV0xCdG8yVDJsQ2U2VFhBc1M3CmZQRHdLcWZYZ09ickxQS2Q5L0duaG5sSTRBQjB6bzNCOUJRRjNGcUVTNC9UaTJia01CMy9ROFg5b3AzOENndEQKQ09CMGNpRUNnWUVBNDhOQXZsK1BJUWxISXpTNGZ4VFE0TGY1T1Q0dzZhcGdaWGQ5TzN2QTh1WmdVZUYweWN0bwpKbEFDWE5IWXVsSXpza0NqaEw2OWpNVTFDNmZiYmF4RlQ0cm5PcHVVQXh2cWJXM2pHaDJXMTBaNWJ5REdqaXk0CkpRYzZlK0lCK3IxbWNtTkgxMWFTa1NKd2w3NW1JQzM2NU9NUFVmbkRsSmwvcUpMNS9maHF4YTBDZ1lFQStCWHYKNWtQak9yMW52S2VES05idzRXdmJQWDkrUm1Lclp3UXc0QW9rRXJ0S25EOUpBNlZqd3JOejZzUm1OcFNBbld0SwpMQWM3bXF3clNGMUJvMWo3ZC9XeXZrSmRLWTJVUWNVcEtESkk5TmtkRkxSUFp3Q29iRllUU1A3NmdOZjA0d2pkCncxakpqalJhNVhwSHZIWjR5aWM1MXFiMmlrellpd0ZVYWtraElHMENnWUFjVDE2eXl3bnRYMHZhVW1sRVVvQU0KRHBJSnpYTWkrQ3gzTUR6K3Nja3Y1L2E4OXJzZmdncjJDQ2ZqQmFwY3JtOENqd3BFSzdrLzBCdGgwWUZ5eG1EdgpIQ0xWcEJUbnRnYVRoMzhjOWVTVDZZeWFoWVpva2FKcDU5WWJJK0ovR2grcnhDOWYwc0R4RFVqVmM3TVorTjBnCnFpQnpYZ296WkVqNzJSajl1bXo3R1FLQmdFUUlJQVdSVUZyblhlOUtNSm1lZCtnWlg4SDVtSE5NMDV3b2RnNjYKT1RJNTBqZ08wc01CTTk1TXY5ajlpdG9rMXpCVUg3NzdMTWs1dFpUZW5nVmhmWFJrR0dROFpyZmliMm1wMjZOKwpScXQrYm84aTh6Tlg1dGZ1c3RNdHVSeGtIRysyR3JwYk9zcVlhT1ROSjZiekJpVEpwUDdNUW9laWt5OXJhZTdMCnB4M3hBb0dCQU5vZ1MwQTd4NnNtaUo0NVJ1SGtBRmFjNlIveFNWd1ZqTDBBTVVqaHpkZUU4Ri9BK0VQSjJnaG0KdXhEM0p5YlI0dnVuL05DbDg2KzZMejhXZGpQdTcrenF4M0UxVXJ1ZVkzZklKS3VQQXQvYks4eWVFakNxeldYcAo3bkkrZUFNM0pyWlhrRzJiNVlLaWhHdU9ieDJnUGVRYk1Dcy9wQUg3NUM0TlJyd01FK0lNCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== diff --git a/opencloud/charts/hydra/values.yaml b/opencloud/charts/hydra/values.yaml index f81ff60..1a3592e 100644 --- a/opencloud/charts/hydra/values.yaml +++ b/opencloud/charts/hydra/values.yaml @@ -88,7 +88,7 @@ ingress: # -- Configure ingress for the proxy port. public: # -- En-/Disable the proxy ingress. - enabled: false + enabled: true className: "" annotations: {} # kubernetes.io/ingress.class: nginx @@ -105,7 +105,7 @@ ingress: admin: # -- En-/Disable the api ingress. - enabled: false + enabled: true className: "" annotations: {} # If you do want to specify annotations, uncomment the following @@ -557,7 +557,7 @@ cronjob: # -- If you want to mount external volume extraVolumes: [] - # - name: my-volume + # - name: my-volumep # secret: # secretName: my-secret extraVolumeMounts: [] diff --git a/opencloud/dev-values.yaml b/opencloud/dev-values.yaml index 885f46b..0dbea7c 100644 --- a/opencloud/dev-values.yaml +++ b/opencloud/dev-values.yaml @@ -58,6 +58,26 @@ nats: storageClassName: kind-sc +prometheus: + replicaCount: 1 + + image: + repository: prom/prometheus + tag: v2.52.0 + pullPolicy: IfNotPresent + + service: + type: ClusterIP + port: 9090 + + resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 200m + memory: 256Mi + openldap: enabled: true test: @@ -118,7 +138,7 @@ openldap: objectClass: posixGroup cn: everybody memberUid: admin - gidNumber: 2003 + gidNumber: 2002 02-ldapadmin.ldif : |- dn: cn=ldapadmin,ou=groups,dc=example,dc=com @@ -144,29 +164,24 @@ openldap: homeDirectory: /home/ldapadmin 03-opencloudadmin.ldif : |- - dn: cn=admin,ou=groups,dc=example,dc=com - objectClass: top - objectClass: posixGroup - cn: admin - memberUid: admin - gidNumber: 2002 - - dn: uid=admin,ou=users,dc=example,dc=com - givenName: John - sn: Doe - uid: admin - mail: john.doe@example.com - cn: JohnDoe - objectClass: person + dn: uid=admin,ou=Users,dc=example,dc=com objectClass: inetOrgPerson - objectClass: posixAccount - userPassword:: e0NSWVBUfSQ2JDdTZ0daU1FXJGw1ZWRTTHVDaDV6a0NvUlllZzFLd3MwUHRKQ - jJQL09CQWdoc0RkbWhzTXJPcEpCbzR3b01yNWJQcjlubi8udWdzM25LcHlKQmt2eHVJWFM0eUQ1 - cnox - uidNumber: 2002 - gidNumber: 2002 - loginShell: /bin/bash - homeDirectory: /home/admin + cn: Admin + sn: Istrator + uid: admin + userPassword: admin + mail: admin@example.com + ou: Users + + dn: ou=AppRoles,dc=example,dc=com + objectClass: organizationalunit + ou: AppRoles + description: AppRoles + + dn: ou=App1,ou=AppRoles,dc=example,dc=com + objectClass: organizationalunit + ou: App1 + description: App1 # ldap user manager configuration ldapUserManager: @@ -221,9 +236,9 @@ hydra: config: dsn: memory urls: - login: https://localhost-login/authentication/login - consent: https://localhost-consent/consent/consent - logout: https://localhost-logout/authentication/logout + #login: https://localhost-login/authentication/login + #consent: https://localhost-consent/consent/consent + #logout: https://localhost-logout/authentication/logout self: issuer: http://dev-hydra-public:4444/ diff --git a/opencloud/prod-values.yaml b/opencloud/prod-values.yaml index f639170..02ea5b2 100644 --- a/opencloud/prod-values.yaml +++ b/opencloud/prod-values.yaml @@ -145,27 +145,44 @@ openldap: homeDirectory: /home/ldapadmin 03-opencloudadmin.ldif : |- - dn: cn=admin,ou=groups,dc=example,dc=com - objectClass: top - objectClass: posixGroup - cn: admin - memberUid: admin - gidNumber: 2002 - - dn: uid=admin,ou=users,dc=example,dc=com - givenName: John - sn: Doe - uid: admin - mail: john.doe@example.com - cn: JohnDoe - objectClass: person + dn: uid=admin,ou=Users,dc=example,dc=com objectClass: inetOrgPerson - objectClass: posixAccount - userPassword: diiVei8y - uidNumber: 2002 - gidNumber: 2002 - loginShell: /bin/bash - homeDirectory: /home/admin + cn: Admin + sn: Istrator + uid: admin + userPassword: admin + mail: admin@example.com + ou: Users + + dn: ou=AppRoles,dc=example,dc=com + objectClass: organizationalunit + ou: AppRoles + description: AppRoles + + dn: ou=App1,ou=AppRoles,dc=example,dc=com + objectClass: organizationalunit + ou: App1 + description: App1 + +prometheus: + replicaCount: 1 + + image: + repository: prom/prometheus + tag: v2.52.0 + pullPolicy: IfNotPresent + + service: + type: ClusterIP + port: 9090 + + resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 200m + memory: 256Mi # ldap user manager configuration ldapUserManager: diff --git a/opencloud/templates/openCloudConf.yaml b/opencloud/templates/openCloudConf.yaml index d13103c..de4979b 100644 --- a/opencloud/templates/openCloudConf.yaml +++ b/opencloud/templates/openCloudConf.yaml @@ -12,11 +12,11 @@ data: OC_AUTH_CONNECTOR_HOST: "{{ .Release.Name }}-hydra-admin.{{ .Release.Namespace }}" OC_AUTH_CONNECTOR_PUBLIC_HOST: "{{ .Release.Name }}-hydra-public.{{ .Release.Namespace }}" OC_AUTH_CONNECTOR_PORT: "4444" - OC_AUTH_CONNECTOR_ADMIN_PORT: "4445" + OC_AUTH_CONNECTOR_ADMIN_PORT: "4445/admin" OC_PERMISSION_CONNECTOR_READ_HOST: "{{ .Release.Name }}-keto-read.{{ .Release.Namespace }}" OC_PERMISSION_CONNECTOR_WRITE_HOST: "{{ .Release.Name }}-keto-write.{{ .Release.Namespace }}" OC_PERMISSION_CONNECTOR_PORT: "80" - OC_PERMISSION_CONNECTOR_ADMIN_PORT: "80" + OC_PERMISSION_CONNECTOR_ADMIN_PORT: "80/admin" OC_LDAP_ENDPOINTS: "{{ .Release.Name }}-openldap.{{ .Release.Namespace }}.svc.cluster.local:389" OC_LDAP_BINDDN: "{{ index .Values.ocAuth.ldap.bindDn }}" OC_LDAP_BINDPW: "{{ index .Values.ocAuth.ldap.binPwd }}" diff --git a/opencloud/templates/prometheus/deployment.yaml b/opencloud/templates/prometheus/deployment.yaml new file mode 100644 index 0000000..bdee65b --- /dev/null +++ b/opencloud/templates/prometheus/deployment.yaml @@ -0,0 +1,22 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "my-prometheus.fullname" . }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app: {{ include "my-prometheus.name" . }} + template: + metadata: + labels: + app: {{ include "my-prometheus.name" . }} + spec: + containers: + - name: prometheus + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - containerPort: 9090 + resources: + {{- toYaml .Values.resources | nindent 12 }} \ No newline at end of file diff --git a/opencloud/templates/prometheus/service.yaml b/opencloud/templates/prometheus/service.yaml new file mode 100644 index 0000000..616a6c4 --- /dev/null +++ b/opencloud/templates/prometheus/service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "my-prometheus.fullname" . }} +spec: + type: {{ .Values.service.type }} + selector: + app: {{ include "my-prometheus.name" . }} + ports: + - port: {{ .Values.service.port }} + targetPort: 9090 \ No newline at end of file