From b96466685d69f1acca9cabefa7c2e4be11c9555c Mon Sep 17 00:00:00 2001 From: baeky Date: Thu, 12 Jan 2023 15:56:50 +0900 Subject: [PATCH] chore(chart): harbor ingress tls - #3 --- chart/manifest/0005-harbor.k8s.yaml | 72 ++++++++++---------------- chart/manifest/construct-metadata.json | 2 +- chart/src/app.ts | 35 ++++++++++--- chart/src/charts/harbor.chart.ts | 8 ++- 4 files changed, 63 insertions(+), 54 deletions(-) diff --git a/chart/manifest/0005-harbor.k8s.yaml b/chart/manifest/0005-harbor.k8s.yaml index 1f8affe..15a523f 100644 --- a/chart/manifest/0005-harbor.k8s.yaml +++ b/chart/manifest/0005-harbor.k8s.yaml @@ -23,11 +23,11 @@ metadata: name: harbor-core namespace: harbor data: - CSRF_KEY: QVFmV2ZwWTdIUHdndjh3SEpDVkJOSTg5UGZ5UDRxVWI= - HARBOR_ADMIN_PASSWORD: SGFyYm9yMTIzNDU= + CSRF_KEY: MkxEeFlZek12UU84THNIczNkNFhiZE1RNzl1OVFiSzQ= + HARBOR_ADMIN_PASSWORD: YWRtaW4= POSTGRESQL_PASSWORD: Y2hhbmdlaXQ= REGISTRY_CREDENTIAL_PASSWORD: aGFyYm9yX3JlZ2lzdHJ5X3Bhc3N3b3Jk - secret: d3VhYWhWZHowOVdKVFRIbA== + secret: dWp1TlBhYzRZa0ZhS0RIVg== secretKey: bm90LWEtc2VjdXJlLWtleQ== tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUUwekNDQXJ1Z0F3SUJBZ0lKQVBZL096TE1lVnEyTUEwR0NTcUdTSWIzRFFFQkN3VUFNQUF3SGhjTk1Ua3cKTkRFNE1ESXlOek0zV2hjTk1qa3dOREUxTURJeU56TTNXakFBTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQwpBZzhBTUlJQ0NnS0NBZ0VBM3hsVUpzMmIvYUkyTkxveTRPSVErZG4veU1iL085OWlLRFJ5WktwSDhyU09tUytvCkY5dW5tU0F6TDY1WEEvdjZuWTBPTEkvZEFTRGprcWtCcElkVEd6b2dSNWY4VWlCNm9zdUVZN1Y3MVhaZHpXTHIKUGpuSnE2WkxBYW9LbXdHODBXNStXZDZWOFB5Z094NTJta3IxdzdJV0t6KzFaTEk1aXpicHBvbjdYVkdWUmFBVApSdk5aRGlKNkNlSnBjSjVINzIzbGtmNVJ2SldhdFpMQ1lJWURiUmZUaUtzeVEvU2xSY3Y1QlZmSGcvTEpTSDlRCkxHUmhQTUFSbGRsOXd5WkN3WlpESHhoZUk0YSsyNmFhOE1ZM3U5c3QvbDAvT282VkNUR3BNaUVoaUdGMkxWanAKVVdxLytCUDRTRkV2SmZxL0R1aW5JMTM5Vy81YVpaNy9Id1JQbG1ZVTZwWFRSTHlJZzdqZCsxOWZKd1I3WDM3cQp3MG84dDA2RmhqbXJDemFZQ1Vqb1JlcURtSGFObVpOL2Rkdkc3alpXQnUrak5oMFlhdnN5UXlDSVZtdjZ5cVNjCmpQaUQ5dWl2eHFUd2pKaWRJQlJmdVVyejNhRVJRN2NRZ2YwcWhxakl6Zmx6SGJGS2hJTG9jQldxN3p5Tmw5aHIKdlVHVC9XWmN3MHQvT3RNNzJTUGFwbG1UZ1ZiYlFSeGYyVkh6eXB0R0l2dHlkbFhLOHRoeE9NcFhvNGUrU2w4ZAoxZ2RRY0M0b2lzTjlGMjlvTnM4UDV5RlFQLy94WXV2OEM2MDduQ2oxRHpySWQ1YXZHL05WZktCL2ZiREtFRmdOCjJXaEhJblR6UExFY2pGNGZFcmNVQUV1V1cwYnVYLzZGSENHM2lUdHJxeUQ5MktUVkRmTjFKNTZycmNzQ0F3RUEKQWFOUU1FNHdIUVlEVlIwT0JCWUVGRmhOaFRvNFVBQzJQVXNmOGpZYVdqMTYwdkdFTUI4R0ExVWRJd1FZTUJhQQpGRmhOaFRvNFVBQzJQVXNmOGpZYVdqMTYwdkdFTUF3R0ExVWRFd1FGTUFNQkFmOHdEUVlKS29aSWh2Y05BUUVMCkJRQURnZ0lCQU1Bc0V0VmxFTE13ZHRjaWZIZU9UMGtPbWY1d285SW4vZUZTZ3NjQ3pCTURhUngyQjNxMzZBb1MKSWw3WFdBWnBldmFSN1c3eWVBUkthQXNoQkxoeWdVcUxEMHpXYktsU045SHByZDF3ZHBNMGZmeVBwTjVkeE9ZQQplcjA0eTEyR1JuQ2JNWXFpNGN2enRQNFRpblhxcTJ5SFNZaExiTzlxa0k1Z2JXVnhrUnVJY01Ldml4ZGRsbE5ZClEzb2JKYURESG1vdk0zK2cvRysxWUZndDRxRVMzOFhuSjdCclNzaEhubjVFSVFoMjg2eGZKcml5cksyaEhiTEoKcXowWXVGNkczRFhQZVdHZ1h2ajBIaXBjMGY4VURaa0tray9lR0VJNnZFa3l0eXZvZXBvWkkyWGJBZi9aTXk1bgpLd3VoRW40aGhrRk13V2FTV3AvaDBRZE1DYXhrNEJWU09xbU5WYUxTQjcrRmpzSWo0Q2FzRm90WWl5SjJncFJCCk5mOFFhUzRiejBUbjFlQmJDOGtzaitlM1pXZVgyYjV3Vk1qcWw5alR0MlgxSUNzOEtLZTN2RUJranFUMkFVaTIKNTJUdEt6bTczYVdyei9HUHkvUTJMQ29yM0ZoOUZHVlNCT0JCRFhHeTZNSnBOSEpuWVZIOUVFTkZHT2g4NW9sMQoycEFET0JCNXZBVS9rTEI1TEhQajJrdWUvRk1pSGFObnJTWUlHck1sQlNYMmpqOUVZYTF1dVVIK3BkNE1CajFGCjV1SDhPUmlhUTZodDIrV0hrbHhpYzFSajV5VFlRd1ZsSDcwQ0JPbitxVkVkbzYzeVF3ekFNSktGSXdsR1VRRVgKamlsamdjODZxNGNadFVURnJjd01pZGJrKzhRNitKYkRWZzdIVi8rcG5DK3dudjE5N2t3ZQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS1FJQkFBS0NBZ0VBM3hsVUpzMmIvYUkyTkxveTRPSVErZG4veU1iL085OWlLRFJ5WktwSDhyU09tUytvCkY5dW5tU0F6TDY1WEEvdjZuWTBPTEkvZEFTRGprcWtCcElkVEd6b2dSNWY4VWlCNm9zdUVZN1Y3MVhaZHpXTHIKUGpuSnE2WkxBYW9LbXdHODBXNStXZDZWOFB5Z094NTJta3IxdzdJV0t6KzFaTEk1aXpicHBvbjdYVkdWUmFBVApSdk5aRGlKNkNlSnBjSjVINzIzbGtmNVJ2SldhdFpMQ1lJWURiUmZUaUtzeVEvU2xSY3Y1QlZmSGcvTEpTSDlRCkxHUmhQTUFSbGRsOXd5WkN3WlpESHhoZUk0YSsyNmFhOE1ZM3U5c3QvbDAvT282VkNUR3BNaUVoaUdGMkxWanAKVVdxLytCUDRTRkV2SmZxL0R1aW5JMTM5Vy81YVpaNy9Id1JQbG1ZVTZwWFRSTHlJZzdqZCsxOWZKd1I3WDM3cQp3MG84dDA2RmhqbXJDemFZQ1Vqb1JlcURtSGFObVpOL2Rkdkc3alpXQnUrak5oMFlhdnN5UXlDSVZtdjZ5cVNjCmpQaUQ5dWl2eHFUd2pKaWRJQlJmdVVyejNhRVJRN2NRZ2YwcWhxakl6Zmx6SGJGS2hJTG9jQldxN3p5Tmw5aHIKdlVHVC9XWmN3MHQvT3RNNzJTUGFwbG1UZ1ZiYlFSeGYyVkh6eXB0R0l2dHlkbFhLOHRoeE9NcFhvNGUrU2w4ZAoxZ2RRY0M0b2lzTjlGMjlvTnM4UDV5RlFQLy94WXV2OEM2MDduQ2oxRHpySWQ1YXZHL05WZktCL2ZiREtFRmdOCjJXaEhJblR6UExFY2pGNGZFcmNVQUV1V1cwYnVYLzZGSENHM2lUdHJxeUQ5MktUVkRmTjFKNTZycmNzQ0F3RUEKQVFLQ0FnRUFrOHE4czRQcnZZYnk3OVVWbFdKTktxY2V5a3dCa3hFMWZqcllPUldRMmhpQWlyeEdWNSs4bERULwprNnVqbTFFV3diNUswSHh4UktrYitQRWExSHFOTkhFNkp4TnBKS0s5ZXhEbFlBUSt4N2RGQnFWci8ybmF6bW80Ck1COE1MWWxtSXp0V1dvU1l3ZThvMm1FZzRxK2J4WXM1SW1kdTdBa2hFN2RKNjNobTIzZ0xNZmVNTGFsUnFvcHUKWEJQd0U1blhQNmFHdVVOSHRHMUs4dFFKRGxaWStMRWJBZU9mUmVOUWhUOU5kUnVrWVNXNTc5dmZLYmxKclN2egp1bGc4OXNWbTNjV0VLNXBCNnJqOXdKYks5NHZvS2Z0VnFiYnVCd1dqZDFhOXBpYktod1ZCZTJMMkZXaHBTWmM1CkYvY29DN25qVGFZVDZ0cjkxeTVWaGhKaElaUUNmL3Z2NFpsNVhoRkhzNVZUWk5iTS9PZnF5RlFMWVhWSk80OEsKRjd0bWF6QUVRUUJRd1ZacUg5QzlOUWR6UEhXbWMzOE9raHRjMXd6YXFuL3JnOSsxc2dBTUQ4aFdDdFFKVWU5NwpiOXltaDVBMFo0UVhLcHlGVDBiK3BYY0QxalJoYTA3VXRrWCsvekxKOUhwQVhjVW16a0crajVDWE5wbnhzSXE1CmZKRmVxM2hCajl3Nm40aCs1ME00VzBGc2U1WW9FVXNjM0IwZno4QmxRQmIrWUpMRkxOSDM0TUg4cDFsMFpEWUoKeWFlMHBzeGxCaWpnNE9QWitXQ0JhK2p0Rlc0TGlXZ0VjeHdnejh3K2hFT0FRcjJhMURjN3c4amQrWTRJSzhVbQpsVFZzNWRicDRtT21QTWxSdi9HTTdrRHVkRnFiTWczWUZ3WGczUWJxdVZxTFp6RXpqVmtDZ2dFQkFQSktaYkNXCllmTGVqa1MvZmtSeVYzVkliNTRtS3dRSG9NV3ViODh0UGdHdVh6anNKeWQ1UVRRNThQcFVqWHJMSG1uOGxTMisKdmlFOEdKeWxLd04xeU1sWnc0MCtrWmhwSFVwQ1d4LzJaS2pBcXZxQTlPT0tvMmZ2NkhkL3dPQW5VNEN0aW9DMQpwcmk3bEtGWVhvUDhEdFFWd0hZdkl6Q1JxRG5oYzRtd0pEcXpUQzl4ZHVJK3N2eHpsNHhIODJmeDBqclBpRlkrCi93T2RYanlmSVBqeWhIQzRqUFRXYmFpcndYUzlkQmpTbDEyOGFJUlQ1ODAveVhFL1NZQXVnZzA1akt0ZzV6UUEKU28xM01UZXpYUkhYZE8wZGkzdEVNSEdSRUVrRnBlVm5uUFF2Q0NlZEswRFYzNmlOd2lXYzhwd2RmTE1WbmVUdApES3daZWRDeCtvLzdldjBDZ2dFQkFPdTQ4REdFSkpKekh4VlI1bVkxSzJBbFp5WXRwVE9XZWhLMXpYNzRKdk0zCll4TjRuZCtaeDVuOXVTUG1tS3pxRjNUVSs0NFJWdGRKSzZlam9GRThkTURUTldhU0xXL1pEbU4xblQwbmp2T24KSVdKbjU5eW5PQ2hXV0taZ1haLzlVcUdSN1B0Nk94U2trZXg5Yy9mWUJzTVgveHVzZFhRaWdlb2dsMGlPWVZGVwpnWElpaUxSTEhwSEpzSy91TnhJaXpqMGhUWVluN3VEN1BSRU53RlJjQ1lmOEoxZVVGYmQ2RHVDVldlUUNLV2dmCk5kMnRTV29pMFZ5bGo0dVVYOEl3MHRqTE5NRDVDUkVKRWs0R1N2NEVEU212VWR2MUxpQktKQ0wybEVjZ29QZUMKb09EMmlDYzVLcWdubVFyYVJpbEZGazhSVlhBOVBXWkdZM0MwYjZUVm1tY0NnZ0VBTlpPMkFPS0FMbENBYlR0YgpGSStrUDA4UlA0dDVINThBTWpac2l3ZWFHbzBRaVduUERxK0ZkNk1JWXBLbjVtdGNBbHZVTVJWb3ZiaW9TSnROCmM2cHNCL3BOZjhKQ044Mm1xSEViN1dseXdNNDZBTUxiWkNXWUZMZThWQkJ2K2lFNEdkQkdQRWZ1NGhLNHZ5VG4KWVpBdlJ6NjRIR280QWRsenRiamc3NlYvbld0Z2dXMDV1TFhjcG01NUtKQVFodisyV1VMakJ3OVBIT0dEb1N3ZgpBbTIrVTU2N3JMaHQ3MHByc1FEajEwbGFKMlF1U0hTMVlYR2xmZUZjdzNlRlVwOVROK0pwdmRvQ29sMmxDSWdsCklIamdaajZPUldmQ3Zwb3hXN1JnQnVadWtxQ0QwUjYwSGRZdGF2eE4zanRpZXBzYXBBODNweE8wSmFwTWdaV1oKcnBVUmtRS0NBUUJPY0V2OUxpdTlUL0dYOXBqa2llelZJWjBoWnk4QjY2RFRlUXZZcEZyUnRDeVQzaDhxdU5GaQp2THRPNXYwSERSNmhFZjVqV0FHOXdldDA3VTM3dWxKZmwraTlLUWRWb0xUWkE5bys3MXJ5V1RzU3MrREQzQ0VqCnl4ZlV4VnhpVUxtZWFpQ2h6aHE2MDhoN0dZUHRoVVU2eGxGdHRBV2hqNW9MZnF6WXlBZzZPTDc2YStOeG0wMmcKMWF5bDNtOFU2ZUFYRjIza3BvVW0rSE5wcVZuR3VKbXpWb1VBNzVZS1orTnJlRWRoU0JiZlB3TjlzSnd0WlVpbAp1N0g0a0hjTTk1SXg4ZXlzQ2pLcUtJcWV6QmxJVGJEVG5qTnZMamNiSjVDKzBhNmx2SVhUMXZRUjUvZUdsYzlNCkJXRTM2MHBOa1YvTEQ4bU9mOUplcGkyUTQzb0RMOUVoQW9JQkFRRFRXSW1meTBLOWdHekEyclB5MTY5bVdZUUsKT2xjbkQzK2hRcTZ4NTFabjFlL3RleEZlVmxoSG40cnJuUmRDRk9BcDQ3dUZrSjJtNzJHQ1ZENzRFd1F1Y0s5eQpBRDVqb3JxZ1ZIcUNLWmRrSGpiMlY2ME16bTZnM3J0TDlXSlhGVkx2TkJiL1FHQjJ2Z0hWT08wenFpcUdaajRlCkV4N2wybS8vNVNFNERMdG43MEo5Q2dHMUh0WENTOGRXckdQTDFwekRuazhWWHRub1h6YjBMQ2hMVUZFZ1pSbWgKY1Y2QUZIRUsySDh3Qkh2aU55ZWhzUlFpRGtsMkFpV09jSk52a3pXNjhjazJuSmpSV3lQWUsxSkwzTkNLcEIzUQpPb2hyUDBmSGNXQVhNVzk3d0ZYWmhSZm5RZkR4eElPbGozTWNZVDBBbGFuWGQwRjROR2MyTnZtcGh4MDQKLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K @@ -49,22 +49,6 @@ type: Opaque --- apiVersion: v1 kind: Secret -metadata: - labels: - app: harbor - chart: harbor - heritage: Helm - release: harbor - name: harbor-ingress - namespace: harbor -data: - ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFekNDQWZ1Z0F3SUJBZ0lRT1lPaitIUnlhTFJHbDNBYXU5SHl4VEFOQmdrcWhraUc5dzBCQVFzRkFEQVUKTVJJd0VBWURWUVFERXdsb1lYSmliM0l0WTJFd0hoY05Nak13TVRBMk1UQTBNVEEyV2hjTk1qUXdNVEEyTVRBMApNVEEyV2pBVU1SSXdFQVlEVlFRREV3bG9ZWEppYjNJdFkyRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCCkR3QXdnZ0VLQW9JQkFRREF0SnhEV0I0RUpFMmJETHZlWDZaVmxEd3hnSUI5c0E0Y3h0RG92Qlh2WmE4VGVrczQKZGwzUTlwNmlYMVZhSjBLbUJaN3B6ZVhMZzlGTVMzQ0ZsekIvRktUV0QrM3VhdVlpYTgxVHRGNEl6YVBYNWpsTQpBejJicnNsZ1FHT1ZBTU1wUk9iaTdaTldXZmNCaTY2ays0OXkrclBDWHlpWk9zdTM0OVprUnEyUmcrVitONWdaCmZXd2xDM0dBWStGaWI2M1A0ZFZYN0FBaVpoNmhqTnR1anZsR1hVbjBENHhDdTZJTEhiTzY5ZitQUGlNZmp2ZVMKeFNodFdxUVFUSHQ4MzFwY09LbHJpMi9UTEs2TmRTWG8wZ2VVVlhZSG54aEFKUXlqVjZzNmdMNk1ibDlxWElGQgpUUFJWZjdiRnJDMmRHcGNmRGdDeFZJS2x6QkZDazRuWjZiN3hBZ01CQUFHallUQmZNQTRHQTFVZER3RUIvd1FFCkF3SUNwREFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSUt3WUJCUVVIQXdJd0R3WURWUjBUQVFIL0JBVXcKQXdFQi96QWRCZ05WSFE0RUZnUVV6bm0wWUpSSnVTdWRicGFPQ01Va2ltNE9WOGt3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFKQ0pZYnNadGdoUmtPWkRFOWhGTGtNYUVpZWFDaHp6VzN4TTUzbjBnTi83d1dNOGQzbG9hTHlVCnMwdG1iYlZqYWNLTG55MWtUYkFqSmZFNEIrS3VXMFZXeVpUQWlHbzNDWS91QzBCZXRtbjJJdzE0UE04YUJPSE4KaGtGWGZabmV2WVNlWnU2YVlBak1xQkFpbmI5cVgwY0hLcXhOYUg4b0hCMFNKQkl5cmQ4bzRXS3cvSnRRNDB2aAo5eE5vVlNWK3daT0tVNjd3UHI3UzM1eEtMNlFQZHAxSDlPdkcrc2tMOVNwUm5ycFZDZS9pUFVTc0ZDcWxINVl6CkhmcTg1cTlDZ0tNUkQ1WE1oZTNYYzlxK25zY1k2YU9LQXptTEIreEZVblI3TzJSSkZVRXpPaUtRc0QweWhBbEgKeVBHY2NjcW14K3hOVkFuaXFCeWdXT1ZOVnJNSVFFZz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= - tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURWRENDQWp5Z0F3SUJBZ0lRV1l6bnBEdkJ0d2IzNG9hWlRIam5iVEFOQmdrcWhraUc5dzBCQVFzRkFEQVUKTVJJd0VBWURWUVFERXdsb1lYSmliM0l0WTJFd0hoY05Nak13TVRBMk1UQTBNVEEyV2hjTk1qUXdNVEEyTVRBMApNVEEyV2pBY01Sb3dHQVlEVlFRREV4Rm9ZWEppYjNJdWJHRmlPUzVqYkc5MVpEQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFLSWZPMjEya1UrbjJWNEVvamFhRnRvUXMxMm92SHFGZWpDRXJlM3MKZmdtUmNTZjIvb1JORTFvc0VFeUJkRDZJQllvTjUrVTdOTzFITzRTbUtlM0pYaDJBby9zODJCNDVZSERwbS9BeQpMaGZLbElDVXBqaU0wek5xbnJBbUlXWmdwdmcray90bW1YZFVCa1VHeXY2Y2pyYXpFVk5CWkFwVnRmTFhDQnJFCjllWmtDOXpkUjlnNnh4bzd4QkxCWTZvWjdLcm00dHcrUEhSeFZvSmNLSzQ0MHptK3R5dE1pdGttYmk2aVpWNWkKZFUyakJjVFNHQmRDeWJiNFZXVjB6cHU4bVdMMy9GaGJtUVVlUFgvYnJZQjFieEQ1R2FzQ00vQzFvanFqOWxjMQpKbVg2Z0ZoaVptaU90Z01PK25ZYUt2aVVqZW14M0pUQmVHMzlicmh6NmJPQ3d4MENBd0VBQWFPQm1UQ0JsakFPCkJnTlZIUThCQWY4RUJBTUNCYUF3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdFR0NDc0dBUVVGQndNQ01Bd0cKQTFVZEV3RUIvd1FDTUFBd0h3WURWUjBqQkJnd0ZvQVV6bm0wWUpSSnVTdWRicGFPQ01Va2ltNE9WOGt3TmdZRApWUjBSQkM4d0xZSVJhR0Z5WW05eUxteGhZamt1WTJ4dmRXU0NHR2hoY21KdmNpMXViM1JoY25rdWJHRmlPUzVqCmJHOTFaREFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBTmlURUgzV0E3WklKcDVIdVFCRUJIZTBRNnRZNGpqSHEKVlJkSTdzbEJIbTNnQ0dNbWtWbnJDVlgwZWxlRFlNT3RPUzEyQTd3a1JVa2pKMkJNQjU4cGlWZDBzU0xPZXFXagoycm4yYytOcnIzd1k2YkppMW5WOHBZSGdsVThRN0w2SFVzN2k1WEJleVRsSkhaYnVCTEtSQWNIUHcvcEVVK1lWCmhEc3prQmFoWHZRMW01bGswckN3eHVQRldWZG5nUFJ1b29LZTFSQmQzbTFHZG81SlBOOW95NE5vdkZmRldGMTYKaDNBelM4bmdsS2kwcGFVWnBzcUoyYkVmY0dXRU5tLy93eWRhNFFUTU9kNWtVWXd3WDZyUkFBQWxmL2trNlVWYgpRSzFPUVB6QlpJUHVyeGI3Vlczd1psWGZhRjEwWkhpam1CSDU3dyt2UTN3Qk1VRUxGbzZDemc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBb2g4N2JYYVJUNmZaWGdTaU5wb1cyaEN6WGFpOGVvVjZNSVN0N2V4K0NaRnhKL2IrCmhFMFRXaXdRVElGMFBvZ0ZpZzNuNVRzMDdVYzdoS1lwN2NsZUhZQ2orenpZSGpsZ2NPbWI4REl1RjhxVWdKU20KT0l6VE0ycWVzQ1loWm1DbStENlQrMmFaZDFRR1JRYksvcHlPdHJNUlUwRmtDbFcxOHRjSUdzVDE1bVFMM04xSAoyRHJIR2p2RUVzRmpxaG5zcXViaTNENDhkSEZXZ2x3b3JqalRPYjYzSzB5SzJTWnVMcUpsWG1KMVRhTUZ4TklZCkYwTEp0dmhWWlhUT203eVpZdmY4V0Z1WkJSNDlmOXV0Z0hWdkVQa1pxd0l6OExXaU9xUDJWelVtWmZxQVdHSm0KYUk2MkF3NzZkaG9xK0pTTjZiSGNsTUY0YmYxdXVIUHBzNExESFFJREFRQUJBb0lCQUZNekZndHlHdGEzUEIwOAo0WWFHQTQ0N25lRkY5QndvbmZHQ1ZjUlJac2xBUThNUHhjUmR6YjJyK1YxWjNpOHRIVEtoT2szdzJaT2Z4OUttCmQ4UVpZRnhocFVZTkRwaE1OOHNhaURWM2V5SW9pNWVGTWR5NW9MVzFWT1R2WEpxdXBXR21zOGtEK1dRODBjN2cKMHBKaUEvZU01Q3BHMTdGYUZUc2YwWC96Ym9LaUtqUkdLSWE2WkladU45UkNTakxjdXRlaUJmVWZEemtXREpDKwpEZUNRd2RMU3JxcjkwM3phb0FsTjFBTmdHcjNyOWRIa3VSQVNHa0JRN2pDVElmTngrbDFPcGQrWXFNMEpURmtiCmdRYnlIc1BqaWlQM0JBdlJ5Q1JNYWI4ZTlNWUtCUEV1SzNIYmFiaVVCdWpNWGtWUUd5RUwxK01DdnJLbHExOGIKZnZKQlZlRUNnWUVBejdzTytxWWc5ZUZlUVB4RGsxdnEwOWdMNHVKS1hFNk9vQStsdll2YWw1NTBCaFVsdWp1eQpWa2pnUi9GR2tGRzdScXpzeUtKbW9IeGt5UlhhVkxxallOOGhOV0QzN3hESkNvUXZrYU9oSndBZFBFcUMwZWVvCnR4NXV4cVlZUEhiMmNpY1E4UEdDK3dXQ3VjU0dGRmRtSHk4U24vYm80R1ZaQ3FYeG82U2YwUGtDZ1lFQXg4c2YKWGNaS2lYb1BjeG1Vc3IycjFIM25XMHFUQkFVdE5iVWlVTDl4ZXNOVkY5Q1Y4TEZSbnhKcW1EekVXR1AxTE54bQpTZTZiR0VvMWlwUkxuN0poRlVOOW16U2d3a3A2MWVBUTlnMXhkbkZ1b1lBZld2TkNoUFpYOUtNZ0NReS9pemdECitkUitnaTl4a2doQnhyMnhBMmVZWHlUUFJaellJbDBCSE13MjhFVUNnWUFJV3ZIRFN5TlFRSHhXQ005L0FkZDAKSmVCMGc3MlI4T2J6c1MxdGJrNmdncE1RRzVHazUvbklWcTRPdHJtcjNGMjMvZ1NZSFZBYmJHVnhZUnVqQk03RgplclFQUFpNN1htVjNzdEZtL2puaEk3UUpWTVhtUTNjWnhuT1dNZUFQcm9sREZpY3NTY3FHNWpYWDJ2dTVuYnBSCnpzYmxBRDFscVMzbnE3MElZL3E1b1FLQmdRQ2txVzdQZllhZTZWOWtVRmZ5UEVvcTFoMWdhd1Roa2xhaFpnakQKSGhVcnhXTVRQcERsRDI4aXVDM3NER0VTTEVlNzBtWG5WdVN5VHk3emFLY3ZGZmZYYTRsUTZqMzRBeVJic3RDbgp5WXFTd0lnYVNKc08vVi84YjM4c0cybGlyQVFOZkh3aVloUmx2UzVQMmNoRVFNQnIrdXhrdGRTeUhjTXdCeERNCnFDNDdOUUtCZ1FDVTFmb3FwYTBmWStrYjZEODFVZHo4eWp2dFdYMW01YlcwbXluc005eXNadC9aZnJCRy9NdXEKSmVOb1VUNEgwSFpoK3ArRVlaSnBuNmRZZ3BUcUZ3aGRpNGQyZU1VWEtuc2NjeGt0R1JRV0hsL0NhZlhCczlCUQowK1JBeVorbEF1VXZwV3ZYYkNzMWZzTzNJd2pVK0FEOEFtT3VES1N3bDBMMXh6N3l1aDlLWEE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= -type: kubernetes.io/tls ---- -apiVersion: v1 -kind: Secret metadata: labels: app: harbor @@ -74,7 +58,7 @@ metadata: name: harbor-jobservice namespace: harbor data: - JOBSERVICE_SECRET: ekhYV0VPSGI1RElPUjhFMg== + JOBSERVICE_SECRET: VWFhazFYU2RSaXJteTJKOA== REGISTRY_CREDENTIAL_PASSWORD: aGFyYm9yX3JlZ2lzdHJ5X3Bhc3N3b3Jk type: Opaque --- @@ -92,11 +76,11 @@ metadata: data: NOTARY_SERVER_DB_URL: cG9zdGdyZXM6Ly9wb3N0Z3JlczpjaGFuZ2VpdEBoYXJib3ItZGF0YWJhc2U6NTQzMi9ub3RhcnlzZXJ2ZXI/c3NsbW9kZT1kaXNhYmxl NOTARY_SIGNER_DB_URL: cG9zdGdyZXM6Ly9wb3N0Z3JlczpjaGFuZ2VpdEBoYXJib3ItZGF0YWJhc2U6NTQzMi9ub3RhcnlzaWduZXI/c3NsbW9kZT1kaXNhYmxl - ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURJakNDQWdxZ0F3SUJBZ0lSQUpFSEhxLzJnS0V4QmtialU3SC9aSU13RFFZSktvWklodmNOQVFFTEJRQXcKR3pFWk1CY0dBMVVFQXhNUWFHRnlZbTl5TFc1dmRHRnllUzFqWVRBZUZ3MHlNekF4TURZeE1EUXhNRFZhRncweQpOREF4TURZeE1EUXhNRFZhTUJzeEdUQVhCZ05WQkFNVEVHaGhjbUp2Y2kxdWIzUmhjbmt0WTJFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDd0Uxbkc5TzU3MkdHc1NWV2w2WUpJVGp3Y0ZETk0KaStSTCt6bUUwMytEand0bjgzamF2UEJobkhmMEFiemU1dllwVXp5a3dEbzdQb0hvTHVNZjhUVkQ3bmlMczVLRgp2Yk8xTUhKdWpKR0R5OGgyU0Qvb05XRHV4UWwvSEJBR0RrL21DaStHWWtNNWhFeGMwSDQzWmJ6YVo2cElhL3NaCkV4L0RnTU94SlVZdmdFdVcxR2QwWmdCR3U5YnNQMmFDV1kzVFQraVhiSFY5SGpJVkxsVk02ZjJiRXArWWFQUUkKRUVvcmRMZGRmelhCS005NlcramNMOE5sYVVOVnMrYVV5ODQ4QU1yeTVVWEtYNjdRNVg0RVh5Z252WFZKc2IzNwptVjZ6UUdwbmdROFhSS0JOVmhMYnYyS1lnVTlzRXYySjNsbmNOc3NWcHZGT2ZWS2tqQVZFZ3ljdkFnTUJBQUdqCllUQmZNQTRHQTFVZER3RUIvd1FFQXdJQ3BEQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUgKQXdJd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVVBacW1YSHIxVjlNUzduSXNoYWZla0VKaQp5dEl3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUd1MnRmUlBjUTBkTW1GVkcxWjFReTVhVVVSRVdvV2k1T1dTCjhxZDJMUE80T0wveDdzeERka2dlOWkyRHVYVzFzNlJycDdQR2VaRE1lOWQ2bForQmhRZktmVFNmQmtVNzRyMGsKMWE3aGFieEt2czhuK1ZMejRXaWQzNlkrL2VQUWRxVTJIZXBxYUhPbEJrYmNkNU1JOEcyY3dGNDJrTXp6VlluaApjMVBmUnBNbS9lZ3VjQWNzdjFQWkdCSDFPMGtRRnZCQ01TbDliY2JzbXArdXJtdDZHejNISG0xVU85OEJKK2pYCmlWakEzZXJuSitnbmg1RTZIdFpmdXdjaUtsM2pySWMzRC9RdzRZTnY0blhac2JmdDhZcE8zVW9NZVZCb2pIUGQKYU9nTlhLRFFYK3BrTEM0dEFCZE9WN2xVMWtkeCtOSDJPMXdZaVZjTWRjdlU2Q2JXa21NPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - server.json: ewogICJzZXJ2ZXIiOiB7CiAgICAiaHR0cF9hZGRyIjogIjo0NDQzIgogIH0sCiAgInRydXN0X3NlcnZpY2UiOiB7CiAgICAidHlwZSI6ICJyZW1vdGUiLAogICAgImhvc3RuYW1lIjogImhhcmJvci1ub3Rhcnktc2lnbmVyIiwKICAgICJwb3J0IjogIjc4OTkiLAogICAgInRsc19jYV9maWxlIjogIi9ldGMvc3NsL25vdGFyeS9jYS5jcnQiLAogICAgImtleV9hbGdvcml0aG0iOiAiZWNkc2EiCiAgfSwKICAibG9nZ2luZyI6IHsKICAgICJsZXZlbCI6ICJpbmZvIgogIH0sCiAgInN0b3JhZ2UiOiB7CiAgICAiYmFja2VuZCI6ICJwb3N0Z3JlcyIsCiAgICAiZGJfdXJsIjogInBvc3RncmVzOi8vcG9zdGdyZXM6Y2hhbmdlaXRAaGFyYm9yLWRhdGFiYXNlOjU0MzIvbm90YXJ5c2VydmVyP3NzbG1vZGU9ZGlzYWJsZSIKICB9LAogICJhdXRoIjogewogICAgInR5cGUiOiAidG9rZW4iLAogICAgIm9wdGlvbnMiOiB7CiAgICAgICJyZWFsbSI6ICJodHRwczovL2NvcmUuaGFyYm9yLmRvbWFpbi9zZXJ2aWNlL3Rva2VuIiwKICAgICAgInNlcnZpY2UiOiAiaGFyYm9yLW5vdGFyeSIsCiAgICAgICJpc3N1ZXIiOiAiaGFyYm9yLXRva2VuLWlzc3VlciIsCiAgICAgICJyb290Y2VydGJ1bmRsZSI6ICIvcm9vdC5jcnQiCiAgICB9CiAgfQp9 + ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURJVENDQWdtZ0F3SUJBZ0lRYksvOENoRTdlVXc1ckswU2JWbUNxREFOQmdrcWhraUc5dzBCQVFzRkFEQWIKTVJrd0Z3WURWUVFERXhCb1lYSmliM0l0Ym05MFlYSjVMV05oTUI0WERUSXpNREV4TWpBMk5UQTFNVm9YRFRJMApNREV4TWpBMk5UQTFNVm93R3pFWk1CY0dBMVVFQXhNUWFHRnlZbTl5TFc1dmRHRnllUzFqWVRDQ0FTSXdEUVlKCktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQU0vL292QlhuMndINkpiem0zUktFZkZKVHJKSXMxZWMKMEt3VjMyZGdjKzYvM2UrL2F4ZWNxSjhkQlF1bkQ5WlhOa2J6MGttQkgyeTlqVkRoMnNpMnRaektxRTBpN1BpQQpPT0N3M2FyZ0tsVUpZMDgxVFVneUdpT1VIcEVCNzVGMGxrc3ZpQlQ3NWs1VW41dHFKS0x0ZFN0Q3NpZmZGaUZBCnNSSEgvNkxRZ20rb3pkWDV3cGZFWktpMGFsQVJwQVhKclVtT0tkT0ZOMzV0aHYwY2pnL1RQWjdtRGJzejZZRm4KU0hWdy9yZFg3S2xTazVab0gvekN3anpkczVQb3doWlBWOEg5amUzRlBURHJSMnNrMkg0LzFhazdLVkd3KzlNVQpyZUVVSTUzMnl5RStlSkVVMExiQjNxNFZaM3RMNTlTTEllQ0JZWUpLaWx0alIzRS9aekxNclE4Q0F3RUFBYU5oCk1GOHdEZ1lEVlIwUEFRSC9CQVFEQWdLa01CMEdBMVVkSlFRV01CUUdDQ3NHQVFVRkJ3TUJCZ2dyQmdFRkJRY0QKQWpBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJTZnJHR2hnTURpc2pkK3hCS3BuT1lxUTV1eAorVEFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBT0NKS0VRV015NXJranJqeHNpN3IreGprTXB1dUJmNTBVcDFzCjNmUWtPQXdDNnhpWDhrMjVrRWxQODRURDhjYjV3N25WcVhYWDAxT0VsWjA4aWhlU25nNjl3RnAzckcyeHVjMzMKSDZZeFhnTHllQVFTd0I2enFVbDd1MGcxaHljOTArTzQ4dHl2eHVxMlNNZXR3Y0tZaks2M2NMQkc4VXhQaU44RApUWnhldmQ4VVdRdEFTbHdheS9URVlZYzA3ZmwxeWNZY0xmTEFndEhWZUNGZS96elpnbmV6S2tzOXhCR3pGazE4CkhoeHNWaDZIVzhYSDl4N0dhV1hXV3lNKzhPNGs3ZUFIYUhOQ0JqZzZjbS85SG92OGM3dGdXWGJDaGtPR09rZlAKYjBHTVl5cmFRQUx5cm1YVXpWUFVEQXJld2ZuOE95Q3l1aGdrRmtubi9wSkhraEVlTVE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + server.json: ewogICJzZXJ2ZXIiOiB7CiAgICAiaHR0cF9hZGRyIjogIjo0NDQzIgogIH0sCiAgInRydXN0X3NlcnZpY2UiOiB7CiAgICAidHlwZSI6ICJyZW1vdGUiLAogICAgImhvc3RuYW1lIjogImhhcmJvci1ub3Rhcnktc2lnbmVyIiwKICAgICJwb3J0IjogIjc4OTkiLAogICAgInRsc19jYV9maWxlIjogIi9ldGMvc3NsL25vdGFyeS9jYS5jcnQiLAogICAgImtleV9hbGdvcml0aG0iOiAiZWNkc2EiCiAgfSwKICAibG9nZ2luZyI6IHsKICAgICJsZXZlbCI6ICJpbmZvIgogIH0sCiAgInN0b3JhZ2UiOiB7CiAgICAiYmFja2VuZCI6ICJwb3N0Z3JlcyIsCiAgICAiZGJfdXJsIjogInBvc3RncmVzOi8vcG9zdGdyZXM6Y2hhbmdlaXRAaGFyYm9yLWRhdGFiYXNlOjU0MzIvbm90YXJ5c2VydmVyP3NzbG1vZGU9ZGlzYWJsZSIKICB9LAogICJhdXRoIjogewogICAgInR5cGUiOiAidG9rZW4iLAogICAgIm9wdGlvbnMiOiB7CiAgICAgICJyZWFsbSI6ICJodHRwczovL2hhcmJvci5sYWI5LmNsb3VkL3NlcnZpY2UvdG9rZW4iLAogICAgICAic2VydmljZSI6ICJoYXJib3Itbm90YXJ5IiwKICAgICAgImlzc3VlciI6ICJoYXJib3ItdG9rZW4taXNzdWVyIiwKICAgICAgInJvb3RjZXJ0YnVuZGxlIjogIi9yb290LmNydCIKICAgIH0KICB9Cn0= signer.json: ewogICJzZXJ2ZXIiOiB7CiAgICAiZ3JwY19hZGRyIjogIjo3ODk5IiwKICAgICJ0bHNfY2VydF9maWxlIjogIi9ldGMvc3NsL25vdGFyeS90bHMuY3J0IiwKICAgICJ0bHNfa2V5X2ZpbGUiOiAiL2V0Yy9zc2wvbm90YXJ5L3Rscy5rZXkiCiAgfSwKICAibG9nZ2luZyI6IHsKICAgICJsZXZlbCI6ICJpbmZvIgogIH0sCiAgInN0b3JhZ2UiOiB7CiAgICAiYmFja2VuZCI6ICJwb3N0Z3JlcyIsCiAgICAiZGJfdXJsIjogInBvc3RncmVzOi8vcG9zdGdyZXM6Y2hhbmdlaXRAaGFyYm9yLWRhdGFiYXNlOjU0MzIvbm90YXJ5c2lnbmVyP3NzbG1vZGU9ZGlzYWJsZSIsCiAgICAiZGVmYXVsdF9hbGlhcyI6ICJkZWZhdWx0YWxpYXMiCiAgfQp9 - tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURSakNDQWk2Z0F3SUJBZ0lRS0ZESDBuc0s3K3J1cnZaMk9HSGNnVEFOQmdrcWhraUc5dzBCQVFzRkFEQWIKTVJrd0Z3WURWUVFERXhCb1lYSmliM0l0Ym05MFlYSjVMV05oTUI0WERUSXpNREV3TmpFd05ERXdObG9YRFRJMApNREV3TmpFd05ERXdObG93SHpFZE1Cc0dBMVVFQXhNVWFHRnlZbTl5TFc1dmRHRnllUzF6YVdkdVpYSXdnZ0VpCk1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQzBEcHRxLzN5aE1TUVdjcldjMGZwdXFvN2UKdzVCSk1GYWx6bThJaVJZOENFdWxlV2ZBeUliWGZNNmQrSHhGa0piaXVPRG5yZnUrNDljNCtrc3krR3JISjIzcwpJazJrYTN2aXBFQUJXR1FuWWhBUmhBMVR2K3E0MEFMMEdKS05nc0dsOW10dExlMTdudEZka0pMbE5RQzB2eERCCmd5dzZBYkZMZndnVE8za1lIZS9pNnZwMDcyR0pVWHMxU29mTjNBakhEL1RqcEt6Q3VKemhBVGFlb0NlS24rVjQKOVBMcXZUczBKakpuUG9DU2NNRiswNEVtRzJBRmViQUNLUXE1OUN6WG5KQTR0VnU5OVN5VEZ5RWFiSFNkbnNROApWUzFwTEVKeUhJSlNIUGNZam9vV1J2enNNYWF2UGZabkxTZHZMQzR5WUxabC81eHpoR3VGRzd4MHBBUHZBZ01CCkFBR2pnWUV3ZnpBT0JnTlZIUThCQWY4RUJBTUNCYUF3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdFR0NDc0cKQVFVRkJ3TUNNQXdHQTFVZEV3RUIvd1FDTUFBd0h3WURWUjBqQkJnd0ZvQVVQWnFtWEhyMVY5TVM3bklzaGFmZQprRUppeXRJd0h3WURWUjBSQkJnd0ZvSVVhR0Z5WW05eUxXNXZkR0Z5ZVMxemFXZHVaWEl3RFFZSktvWklodmNOCkFRRUxCUUFEZ2dFQkFIMTRraVladkRXdzE5UVExdjVoelBRclI0c1hHS043RGp5aHd6VVlsWjc5dDNkNGhKeVEKT0toS2dZMjJ3U3lGQnplRU9uU0dUZndwVWlJSnNNL1BtWDIrWU1wazZ0OExQNHNURTl5Q1Z1M0dpQUlqQVc0YwpldVlTSEpib0w3MEx6N1lkUXY0RnRhRG1ZczJNVnpFaEVXLzBOZlNVWC9oenNoQkpScXZXT2RQMFZHbjhMTGEzCnBLdFhKVlJQcEx1WHZtNTJucE44SjBleXdHVHN5SUJKYUpVdkg1LzdqSVpDTG1rQ2RXV3FDWEhFNGRJWHFpaTUKb1VEUjk0dmcyU0hhSitjL1ZFR1RFSDhpeWFGNzA0SzhrbUNwNG9YZWs3cFAzN0ZmdDZ0OTRCNlFpWEc3dTdjSQp1eDVINlliQlZMQWFTSlZxWktvalUvaVJtcHNBZy9LcHk0UT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= - tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBdEE2YmF2OThvVEVrRm5LMW5OSDZicXFPM3NPUVNUQldwYzV2Q0lrV1BBaExwWGxuCndNaUcxM3pPbmZoOFJaQ1c0cmpnNTYzN3Z1UFhPUHBMTXZocXh5ZHQ3Q0pOcEd0NzRxUkFBVmhrSjJJUUVZUU4KVTcvcXVOQUM5QmlTallMQnBmWnJiUzN0ZTU3UlhaQ1M1VFVBdEw4UXdZTXNPZ0d4UzM4SUV6dDVHQjN2NHVyNgpkTzloaVZGN05VcUh6ZHdJeHcvMDQ2U3N3cmljNFFFMm5xQW5pcC9sZVBUeTZyMDdOQ1l5Wno2QWtuREJmdE9CCkpodGdCWG13QWlrS3VmUXMxNXlRT0xWYnZmVXNreGNoR214MG5aN0VQRlV0YVN4Q2NoeUNVaHozR0k2S0ZrYjgKN0RHbXJ6MzJaeTBuYnl3dU1tQzJaZitjYzRScmhSdThkS1FEN3dJREFRQUJBb0lCQUFZalFWVUNaSU15STZMSQpRanlZUThzbDhUelN1Y1prNlc4NWZEdDBRTmZIQ0owWmFGbi8rK2k0am1xQUgreFhJMjJURThlUi9MVGpHMkVMCjF5aGpvM0FxZmVyQXVKalVPU0xlcW5maFJYaTZOUVlEMUZoNGdFM1FlV2xNdFNJeHhOd2RiRWdLZXIvdUNBRUMKZnA5bGtTS1lLTUFQOHAvL2tzV2FEUEpxNHBQWjByV3JWWW9HVGovNmpQT3hWRGthSmFCTkovTHNnWEh5Qllvdgo3VnBvSHVValRLTG1JQTRnVWpSQjFYdG52NVV5b0VZSUFud2djVU82eEkyNkJFMEtMNnBmSVN1aHFjczl3dXZZCklQU0FFVVlycHdjbEJYT29jL0VRUlpiUjBpTno1NG85VEZVb1BlSWZoMzVIZ1MrY0hrbUhNSTY4MnRFWkphbFgKcVdydXdMRUNnWUVBNlNvL0JhOUlkZnB4MzhmQU1RdEFYQzU0VVA2cWhsbCsvZXBkK0RGTUZQTWtmQzdXTkVDNgpsa05sdXBET2lKM1B1eVZtSkdGOS9Kb3NLQ2lyRVRkOTBwVnMyMU5Oakx2N05UNzE5clk2aW4wdk9GbjdPNzJpCk1DQUNaUVppTFVUSWFjTHZtZDhvTmtCUWl0aSsxd1JvRVRia3lCL3hvTFVCbEVjNGJnNkVRKzBDZ1lFQXhiRGYKMTcwd29RcFFCODMreGxMejA3eEJjQmJqTUhHSmI3b3hudUExNW5HazYzR3VrRmNBaXpTV0dVVnpoYlorNzlCWApoOWJYNW41U1Q2UjhJMVJYR2tCOXJwN3pPQm1pSzJZZGFETUlPb3NoUWNRWDNzeU5qaUxkaU9OSjYxOGRHbG1wCm1WRFBWZ2tCM0pFUkdOT1ZYd2M3aFJYK09IdlNncDNEMGh6RDQ4c0NnWUVBeisvYkVHakhpRjkzV29pN2Y0RjMKUGo0N0VwQnE1ekc5TFJqc0FNR0dCbERvUXM5S1BJTlZZMWhyeXJ3RlZKVFlneC9SUGJTc05MQVJuU2JYbUowUwpXdERqcVoxYTFaMTNaSDdudjhPMzVYWEt2TWlTWXk2MUM1SWdVSlFtemhRL1h3SjN4NVBhT3JlVW5KNjdZdW9OCkhQMEZmdXZ1QXRJcHZHRGZsRmJoNGVrQ2dZRUFnamx3U3FvNnRXcVlxM3Q3MytMVzhWeHFjczd3MjRGKytsVloKeUlHRG9BaXVqZFgyR3VqazE4NU5MZHA5TGRDNHIzcTduaVRkVmQxU2xWb1IyQ2YvdExCVTJrbWtpQWtDdGJudgpseXMrdVduYS8zcVFDdGtPU2xvWE9zd1dibkRhTi9obWF6TTdVVDVmdG83dEIwQ2hmZGJDMDNsWVhKYmNaZVJOCkVVU1htWjhDZ1lBYjNDSSs4UjNXZUVFc1o4aCtnTkFqaWVwbCtvZUNTMm1aQVJjUEYySjlVNjVJRkgxeWZvNFMKNTZnZnZrMi9FRlcrUndUbDY1YVpuaFdnUFZJZ0F3T1htUmFCVnRXcFBsNHp6VXl3ZjdNaXE1RjZlN2o4RFZqRgp2T294ZnMvL2tmWFR3VFdnQ1V6eWVWU0wyQ2djZnlPdU1OcVNVQ0laa2tPRHRoWDF1bms1Rmc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= + tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURSakNDQWk2Z0F3SUJBZ0lRUU1wUy9rNlk0dWtIZm9MNFlUMW1mekFOQmdrcWhraUc5dzBCQVFzRkFEQWIKTVJrd0Z3WURWUVFERXhCb1lYSmliM0l0Ym05MFlYSjVMV05oTUI0WERUSXpNREV4TWpBMk5UQTFNVm9YRFRJMApNREV4TWpBMk5UQTFNVm93SHpFZE1Cc0dBMVVFQXhNVWFHRnlZbTl5TFc1dmRHRnllUzF6YVdkdVpYSXdnZ0VpCk1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ3gwT3p5aUpJd09JWk55WXR4MDlQRExoZVMKd2NzNk1TQkR6czVudWlFRFdrVnlvZ3F3R3JuZmhxaFNuWjZKYnhubWs1UytLYXBqTEROWXd1QVUwS2JVWitCZQpyaTlxZ0pjNXlSK2R1dUY2V2QyT3ZPaVlBRkw4K29nUUF1V3c5NXhyZWd1TWQzL01zRVlXOEFiZCtOY2t1MUFkCkJxRWdvZDByZklhOWQycDMydjZRU3BCbEE0cWtVUjJDTFdsNXB1TDd3aldkSSs1OUwyTWhONHBvalV0S0c0WTYKTnEvZ1NwRnB0Mmk1cEFqaGdjQ1hpSUFINk52Y3lwRyt6ZHNLVHluMXVoRjhiVnVhM0tlZEU3OFNEckx5YjV6Sgp2alhySVI0VkdSRXhtZzNDUlQ5am5XSE9EaHZsdDYydjFBNlRRaVJ0YVQ2MDFpMWhWbzFjRDBJdlZmT0xBZ01CCkFBR2pnWUV3ZnpBT0JnTlZIUThCQWY4RUJBTUNCYUF3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdFR0NDc0cKQVFVRkJ3TUNNQXdHQTFVZEV3RUIvd1FDTUFBd0h3WURWUjBqQkJnd0ZvQVVuNnhob1lEQTRySTNmc1FTcVp6bQpLa09ic2Zrd0h3WURWUjBSQkJnd0ZvSVVhR0Z5WW05eUxXNXZkR0Z5ZVMxemFXZHVaWEl3RFFZSktvWklodmNOCkFRRUxCUUFEZ2dFQkFMTHVMSkFObVJ3ZjVqaWlUcHltaW04SEFkMjY3aGdZY1BlTHI2Zk1aNXpwaC9RSk9zN2UKUUhmeFBiejcyTExPTGVTZ2oweU1BV0g4SjlvU0h2QjBkY2tDRjBjRnc4ZzVLZFovRHdSd1B5Z3BaeHFJTkU5cApSYnRwK2pyL2NQVkFSMXNaRG9ZUHYrNWRYQjRRbGFNU0lPVTVGTTBtS0Z5cnQ5N0FaU3RDZGFTM2xqMTJHOXZyCnB2dDB0Rnd2SFc2cmVHZzdXeXVMUVJMWmZKdkpwekdWVDdlR2FRV0IxZ2ZjcldKVnFZWTNFWHBxdW1jSkFpYVYKT0pjL05TWnF4TUdOT1BIUUtyZ2RvS2g5TERHSG5OeXV4TFU4Sno1UkJYTUo4RW4vbENUY1Y4RklQczNVTnNCSwpVR0R3Y0wxZS94NG5sRVVDVGg2aGM5Z1h5cGVGeUhUKzhBcz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcGdJQkFBS0NBUUVBc2REczhvaVNNRGlHVGNtTGNkUFR3eTRYa3NITE9qRWdRODdPWjdvaEExcEZjcUlLCnNCcTUzNGFvVXAyZWlXOFo1cE9VdmltcVl5d3pXTUxnRk5DbTFHZmdYcTR2YW9DWE9ja2ZuYnJoZWxuZGpyem8KbUFCUy9QcUlFQUxsc1BlY2Ezb0xqSGQvekxCR0Z2QUczZmpYSkx0UUhRYWhJS0hkSzN5R3ZYZHFkOXIra0VxUQpaUU9LcEZFZGdpMXBlYWJpKzhJMW5TUHVmUzlqSVRlS2FJMUxTaHVHT2phdjRFcVJhYmRvdWFRSTRZSEFsNGlBCkIramIzTXFSdnMzYkNrOHA5Ym9SZkcxYm10eW5uUk8vRWc2eThtK2N5YjQxNnlFZUZSa1JNWm9Od2tVL1k1MWgKemc0YjViZXRyOVFPazBJa2JXayt0Tll0WVZhTlhBOUNMMVh6aXdJREFRQUJBb0lCQVFDa0gxeTB0MDJIYUlTKwpBNHJMczJLL3dpbEw4Y2Rzbks5Vkp1cm9YcW5kK0ZJbGJsOURFRWdEZ3J5V0ZKbWg3SVFSaUtJL3F5RnppL2FRCnRMNHpPQ3JqM2tULzN2SXc4U09qMkhsd0VtL1BpR2F4T3JmTXBHLzB4Q0VWOWphZlVzeHpmeUJ0dEZhblRRUkUKWTZOUytqMUowQUl2NkZDTVdCcFY2d2hLbEpBV3N1ZGplT1hoVlBhdTd0T0dUMGUwTCtKdXRvSVY5RG9KMXZXQQp5QVh3c0hlRjVtTHZxSTlsd0Z3aHN1QWp3VGk1SlV2UXZvcnpZUG1VN2hjaWRZa043V3RyRDdkWWVQWk5FTzYyCmRtMzdEVStzeWFPRmpKWWZ6c2hDK3dqdzdsaVJXa3Q0OTB4b3FCU1pSV2NjOTJGY0YzaXRUZklTcjE0dzlKVFEKZ2NtbzdUVnhBb0dCQU5ndEVlV3JlZWsyV29CQmN2cG1ZdE1PVmRFQk1mUUM5U2cyNkl1Z25WRjZFQ0NNSEd6VwpRcmVlMTQrWFAwbytuN0tSRFlmSXRJWmh1Mmt2N1pIR0NMSG5DQjlmYldXRXFSTms3dzNveWxRcTJlOFh0SHFxCmRYZHFieE8xSXliWXY3elRKTk5YSTFWNU5ZOER3M1lOK3U5L3Z3aE0reTFlWEZWYU9WZFdKWDBmQW9HQkFOS1MKeWZ1eFFZeWYvU2U0OVgwVjlaQUJYSEZzQ1ZiMUJhQzdlbVdLdlV5NS9MZDZYeGpJMXlHYVFwdjRKSlY5ZlBJYwpOTnArMndoTjhCcGNmb3NuaFRWZHFVOS9nM01Sc1h3cXBZUHlsVE5LUkRuaUZKVjkrejFkUzdEVm52bERqVG5UCmVHZ2poby9mOFhLclhEYXhpdDNMWmk0S1ZqZmg2K0dpUHl0S3QxQVZBb0dCQU5YcW80ODJSSWsydEErK3RGeDgKL01ZRnBYNFJSTEZHUy9yamV2TFFtVnlMQVhKenM1MHYyUTJETGFSMThyY3hpUzVXdzZEZVIyWERTSVVxWEZpbwpNdXA0eUZ6alBZbjc0S1BFZVpxMkJhR01WZVIyL0sxMkNJK0d6eXdkVHcrZDVQNmhvZ3RRYXpLbG93NUdseUUzCmJGMmJlQnBxc3hPT0VLaVZnN0NkR3JQWkFvR0JBS3h1YTF2aG9NMm96VUxUNEtLWGNzaURkTkdrS0ZtK3R1Y1IKM241OEI5dG1pWjB0WmVZRHdMYlJmUzMvR3VZWEpsT1Q2V3ZxYVMzNXRGM0IxQlhiUE9lZ1ZONjJpa3VWOTRLMwo0V1dWSmJ3a1dvNFRwY3RzcUdsdGxtZXQ1a296bU5mN1pTUFJ3NFRaV3Z3TmVxdUc0eklRTnhJSWdPV3Q2TnlSCllhenZ1QUNwQW9HQkFNZTdSamdnMHJVUU13aXl0RGNYcWlFU01zeXErVGlqalk4MUxpVXRPV2FZdkJTTW1HaksKWDUrVlNWUnJRYk1NVStHWkhvWnFReHBsRDZ2Y0dXdXJQdm55dW1lc2Y0d2pMTHZaZG9QYktWbjZ3Z0syYWRuOApDb1JhbkE5eU1tcG42QUl6RHlSZUZGQVdOQUFPTGRYRWxpdnFBMXRwcTF5ZVh0TythVkJ6cUg3KwotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= type: Opaque --- apiVersion: v1 @@ -110,7 +94,7 @@ metadata: name: harbor-registry namespace: harbor data: - REGISTRY_HTTP_SECRET: dHRUZ0dBTFl2bVRJa0dEaw== + REGISTRY_HTTP_SECRET: bmVSbTVVWDRUZWF4eVdSMA== REGISTRY_REDIS_PASSWORD: "" type: Opaque --- @@ -125,7 +109,7 @@ metadata: name: harbor-registry-htpasswd namespace: harbor data: - REGISTRY_HTPASSWD: aGFyYm9yX3JlZ2lzdHJ5X3VzZXI6JDJhJDEwJDNhdlJ1UU5maHJSQ2VVT1VaRFdMME93LlMyYVFRLmNrWVc3RFRTL0lnenRkbVkyaDMwV1hD + REGISTRY_HTPASSWD: aGFyYm9yX3JlZ2lzdHJ5X3VzZXI6JDJhJDEwJFJzUGg4YWp3ek1iNEZYaUI5aW92L3U4QWV2ZE9FeDM1LkdLdE5TTms5Z0hFU1g1NlpINEp1 type: Opaque --- apiVersion: v1 @@ -206,7 +190,7 @@ data: CORE_LOCAL_URL: http://127.0.0.1:8080 CORE_URL: http://harbor-core:80 DATABASE_TYPE: postgresql - EXT_ENDPOINT: https://core.harbor.domain + EXT_ENDPOINT: https://harbor.lab9.cloud HTTPS_PROXY: "" HTTP_PROXY: "" JOBSERVICE_URL: http://harbor-jobservice @@ -721,7 +705,7 @@ spec: annotations: checksum/configmap: 3a145cb777903ca8ff8fcfcb3c25ed9ee7a426a8b01cf024d6e52d92458b4564 checksum/secret: a656851d5f972f5f6dd05a5c13a5a0b21527971b9ec7dd91ce85b5699d41790a - checksum/secret-core: 69d800cd38adb0a4b65b4129362cf04b0e44c9661bbe06673a5b4deddfa94faa + checksum/secret-core: 0d0f06f7c2760e0d933a9182deacd0a0c4d4fbc1dbbfef989747535f89217893 labels: app: harbor chart: harbor @@ -796,9 +780,9 @@ spec: template: metadata: annotations: - checksum/configmap: 24aaa083b7f838fdfd213e9dbc51045412433480648dfe20268f90e9b7927064 - checksum/secret: ba540b9d56d917e14975f8b409b6c30e4c69729eefedd5631fd0a85ad8f1f2d3 - checksum/secret-jobservice: 4622bc90eb5b491e8f8a2ac8ef3388a55a5ab4e55960a00643bead42bc13d654 + checksum/configmap: 6c44700003d090140872c2c92522a38351d5d23cba07570f3dbc258b6123063f + checksum/secret: 166e023f9400034bca7d03df6dc4209c5de30baccabe54e1fc97c8780f7f0b56 + checksum/secret-jobservice: dcc95d8f3008890f896cc592017efd5fabf958162a733a367b900fc7ffeef45f labels: app: harbor component: core @@ -884,8 +868,6 @@ spec: secret: secretName: harbor-core - name: ca-download - secret: - secretName: harbor-ingress - emptyDir: {} name: psc --- @@ -915,8 +897,8 @@ spec: annotations: checksum/configmap: 41138a089428e6776014e59b1a37c5e69bedc9331ccdb1f382f1950882ec1b7e checksum/configmap-env: 5c0e2cf333f81a4f19f13c25cb45f2b2f5353c9bd05f59e8cbb6b59cc0eb7195 - checksum/secret: dc775f9ccc2f0ebba35dcc4f0b243e95c838c855e5eb7b3ef89739da4c46acf4 - checksum/secret-core: 15c996b0994235840bf9770513ce4774672af7236550aed60888cc334ed40a9b + checksum/secret: d9a9eb5e6a85e6c40c79dc11c567b58908c99d14598db2c4b175213ec542cb36 + checksum/secret-core: c02f02b9fd552df44f0c971d781035c107bb37ea793363b64c4d51697bff08b8 labels: app: harbor chart: harbor @@ -1000,8 +982,8 @@ spec: template: metadata: annotations: - checksum/secret: 3c1a8818db854f614e632a68bbb5196f0b1211e732e72038e0ea4b90dc869a8d - checksum/secret-core: 46e5643e8b1e334868b5683a646b97ef10f8eee22147f999d0ea614b4d319593 + checksum/secret: 427d2934880e5f42e787b8e743068d90e332b1f66ac027790ff4e39d3b5a2507 + checksum/secret-core: 70883457ea7b83aa4c9787055a9dc2a0ccaba443ae9922c6b441dfb8f592160d labels: app: harbor chart: harbor @@ -1081,7 +1063,7 @@ spec: template: metadata: annotations: - checksum/secret: 4280c2bf63791e3088598707da18dd5855ad3228b6da83481cd1c7aa0785223d + checksum/secret: 633e3a9f82df3bfd035bb7a4e79434a90e687b99281d10863e2ad3043ef9e037 labels: app: harbor chart: harbor @@ -1223,9 +1205,9 @@ spec: metadata: annotations: checksum/configmap: 1dd422c1f80f9b0e00e1a2297e956c1da3fb1d6bc24892179accf38bc1e3be96 - checksum/secret: 48e158aa965e46ec3dda082614548b4b1cd6def83bb1495d9d23e2e19c9e8aa1 - checksum/secret-core: bb68a9ab27705188d5c1f4606cf9fc8c965fb3dcf8713fb3ee164930798f3249 - checksum/secret-jobservice: 414aa208fbbca9cf9579f1a8ce684e2eb15fdcf91965a4d2b76b9fa1985f0943 + checksum/secret: 7f2bb92b1b022a50e4bdaa1d511654e4ec72cf912011b0c3ed83c5c434737a53 + checksum/secret-core: d4dc279cfe0634b04b7b339c4abb56830bea1a3dafbbdb9b55d7a7abcb8a795e + checksum/secret-jobservice: 4e48a123386954389fa74893bb38f0cd6ce60323e322ef6fce3eed13fb415947 labels: app: harbor chart: harbor @@ -1714,7 +1696,7 @@ spec: tls: - hosts: - harbor.lab9.cloud - secretName: harbor-ingress + secretName: harbor-tls --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -1734,7 +1716,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: harbor-notary.lab9.cloud + - host: notary.lab9.cloud http: paths: - backend: @@ -1746,5 +1728,5 @@ spec: pathType: Prefix tls: - hosts: - - harbor-notary.lab9.cloud - secretName: harbor-ingress + - notary.lab9.cloud + secretName: harbor-tls diff --git a/chart/manifest/construct-metadata.json b/chart/manifest/construct-metadata.json index 74f1c83..59de7cd 100644 --- a/chart/manifest/construct-metadata.json +++ b/chart/manifest/construct-metadata.json @@ -1 +1 @@ -{"version":"1.0.0","resources":{"l2-lb-metallb-controller":{"path":"metallb/metallb-metallb/l2-lb-metallb-controller-deployment"},"l2-lb-metallb-speaker":{"path":"metallb/metallb-metallb/l2-lb-metallb-speaker-daemonset"},"webhook-server-cert":{"path":"metallb/metallb-metallb/webhook-server-cert-secret"},"addresspools.metallb.io":{"path":"metallb/metallb-metallb/addresspools.metallb.io-customresourcedefinition"},"bfdprofiles.metallb.io":{"path":"metallb/metallb-metallb/bfdprofiles.metallb.io-customresourcedefinition"},"bgpadvertisements.metallb.io":{"path":"metallb/metallb-metallb/bgpadvertisements.metallb.io-customresourcedefinition"},"bgppeers.metallb.io":{"path":"metallb/metallb-metallb/bgppeers.metallb.io-customresourcedefinition"},"ipaddresspools.metallb.io":{"path":"metallb/metallb-metallb/ipaddresspools.metallb.io-customresourcedefinition"},"l2advertisements.metallb.io":{"path":"metallb/metallb-metallb/l2advertisements.metallb.io-customresourcedefinition"},"communities.metallb.io":{"path":"metallb/metallb-metallb/communities.metallb.io-customresourcedefinition"},"l2-lb-metallb:controller":{"path":"metallb/metallb-metallb/l2-lb-metallb:controller-clusterrolebinding"},"l2-lb-metallb:speaker":{"path":"metallb/metallb-metallb/l2-lb-metallb:speaker-clusterrolebinding"},"l2-lb-metallb-pod-lister":{"path":"metallb/metallb-metallb/l2-lb-metallb-pod-lister-rolebinding"},"metallb-webhook-service":{"path":"metallb/metallb-metallb/metallb-webhook-service-service"},"metallb-webhook-configuration":{"path":"metallb/metallb-metallb/metallb-webhook-configuration-validatingwebhookconfiguration"},"local-ip":{"path":"metallb/metallb-ip-address-pool"},"ingress-nginx":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-rolebinding-ingress-nginx"},"ingress-nginx-tcp":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-tcp-configmap-ingress-nginx"},"ingress-nginx-udp":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-udp-configmap-ingress-nginx"},"ingress-nginx-controller":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-controller-deployment-ingress-nginx"},"ingress-nginx-controller-admission":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-controller-admission-service-ingress-nginx"},"nginx":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/nginx-ingressclass"},"ingress-nginx-admission":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-admission-rolebinding-ingress-nginx"},"ingress-nginx-admission-create":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-admission-create-job-ingress-nginx"},"ingress-nginx-admission-patch":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-admission-patch-job-ingress-nginx"},"etcd":{"path":"dns/dns-etcd-sts"},"core-dns-coredns":{"path":"dns/dns-coredns/core-dns-coredns-deployment"},"external-dns":{"path":"dns/dns-external-dns/external-dns-deployment-dns"},"external-dns-viewer":{"path":"dns/dns-external-dns/external-dns-viewer-clusterrolebinding"},"cert-manager-cainjector":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-cainjector-deployment-cert-manager"},"cert-manager":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-deployment-cert-manager"},"cert-manager-webhook":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-webhook-validatingwebhookconfiguration"},"clusterissuers.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/clusterissuers.cert-manager.io-customresourcedefinition"},"challenges.acme.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/challenges.acme.cert-manager.io-customresourcedefinition"},"certificaterequests.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/certificaterequests.cert-manager.io-customresourcedefinition"},"issuers.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/issuers.cert-manager.io-customresourcedefinition"},"certificates.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/certificates.cert-manager.io-customresourcedefinition"},"orders.acme.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/orders.acme.cert-manager.io-customresourcedefinition"},"cert-manager-controller-issuers":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-issuers-clusterrolebinding"},"cert-manager-controller-clusterissuers":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-clusterissuers-clusterrolebinding"},"cert-manager-controller-certificates":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-certificates-clusterrolebinding"},"cert-manager-controller-orders":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-orders-clusterrolebinding"},"cert-manager-controller-challenges":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-challenges-clusterrolebinding"},"cert-manager-controller-ingress-shim":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-ingress-shim-clusterrolebinding"},"cert-manager-view":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-view-clusterrole"},"cert-manager-edit":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-edit-clusterrole"},"cert-manager-controller-approve:cert-manager-io":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-approve:cert-manager-io-clusterrolebinding"},"cert-manager-controller-certificatesigningrequests":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-certificatesigningrequests-clusterrolebinding"},"cert-manager-webhook:subjectaccessreviews":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-webhook:subjectaccessreviews-clusterrolebinding"},"cert-manager-cainjector:leaderelection":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-cainjector:leaderelection-rolebinding-kube-system"},"cert-manager:leaderelection":{"path":"cert-manager/cert-manager-cert-manager/cert-manager:leaderelection-rolebinding-kube-system"},"cert-manager-webhook:dynamic-serving":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-webhook:dynamic-serving-rolebinding-cert-manager"},"cert-manager-startupapicheck":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-startupapicheck-job-cert-manager"},"cert-manager-startupapicheck:create-cert":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-startupapicheck:create-cert-rolebinding-cert-manager"},"cloudflare-api-key":{"path":"cert-manager/cert-manager-api-key"},"cert-manager-cert-manager-cluster-issuer-0-c82e973c":{"path":"cert-manager/cert-manager-cluster-issuer-0"},"argocd-application-controller":{"path":"argo/argo-argocd/argocd-application-controller-serviceaccount"},"argo-argocd-applicationset-controller":{"path":"argo/argo-argocd/argo-argocd-applicationset-controller-deployment"},"argocd-notifications-controller":{"path":"argo/argo-argocd/argocd-notifications-controller-serviceaccount"},"argo-argocd-repo-server":{"path":"argo/argo-argocd/argo-argocd-repo-server-deployment"},"argocd-server":{"path":"argo/argo-argocd/argocd-server-serviceaccount"},"argocd-dex-server":{"path":"argo/argo-argocd/argocd-dex-server-serviceaccount"},"argocd-notifications-secret":{"path":"argo/argo-argocd/argocd-notifications-secret-secret"},"argocd-secret":{"path":"argo/argo-argocd/argocd-secret-secret"},"argocd-cm":{"path":"argo/argo-argocd/argocd-cm-configmap"},"argocd-cmd-params-cm":{"path":"argo/argo-argocd/argocd-cmd-params-cm-configmap"},"argocd-gpg-keys-cm":{"path":"argo/argo-argocd/argocd-gpg-keys-cm-configmap"},"argocd-notifications-cm":{"path":"argo/argo-argocd/argocd-notifications-cm-configmap"},"argocd-rbac-cm":{"path":"argo/argo-argocd/argocd-rbac-cm-configmap"},"argocd-ssh-known-hosts-cm":{"path":"argo/argo-argocd/argocd-ssh-known-hosts-cm-configmap"},"argocd-tls-certs-cm":{"path":"argo/argo-argocd/argocd-tls-certs-cm-configmap"},"applications.argoproj.io":{"path":"argo/argo-argocd/applications.argoproj.io-customresourcedefinition"},"applicationsets.argoproj.io":{"path":"argo/argo-argocd/applicationsets.argoproj.io-customresourcedefinition"},"appprojects.argoproj.io":{"path":"argo/argo-argocd/appprojects.argoproj.io-customresourcedefinition"},"argo-argocd-application-controller":{"path":"argo/argo-argocd/argo-argocd-application-controller-statefulset"},"argo-argocd-server":{"path":"argo/argo-argocd/argo-argocd-server-ingress"},"argo-argocd-notifications-controller":{"path":"argo/argo-argocd/argo-argocd-notifications-controller-deployment"},"argo-argocd-dex-server":{"path":"argo/argo-argocd/argo-argocd-dex-server-deployment"},"argo-argocd-redis":{"path":"argo/argo-argocd/argo-argocd-redis-deployment"},"harbor-chartmuseum":{"path":"harbor/harbor-harbor/harbor-chartmuseum-deployment"},"harbor-core":{"path":"harbor/harbor-harbor/harbor-core-deployment"},"harbor-database":{"path":"harbor/harbor-harbor/harbor-database-statefulset"},"harbor-ingress":{"path":"harbor/harbor-harbor/harbor-ingress-ingress"},"harbor-jobservice":{"path":"harbor/harbor-harbor/harbor-jobservice-deployment"},"harbor-notary-server":{"path":"harbor/harbor-harbor/harbor-notary-server-deployment"},"harbor-registry":{"path":"harbor/harbor-harbor/harbor-registry-deployment"},"harbor-registry-htpasswd":{"path":"harbor/harbor-harbor/harbor-registry-htpasswd-secret"},"harbor-registryctl":{"path":"harbor/harbor-harbor/harbor-registryctl-configmap"},"harbor-trivy":{"path":"harbor/harbor-harbor/harbor-trivy-statefulset"},"harbor-jobservice-env":{"path":"harbor/harbor-harbor/harbor-jobservice-env-configmap"},"harbor-portal":{"path":"harbor/harbor-harbor/harbor-portal-deployment"},"harbor-jobservice-scandata":{"path":"harbor/harbor-harbor/harbor-jobservice-scandata-persistentvolumeclaim"},"harbor-notary-signer":{"path":"harbor/harbor-harbor/harbor-notary-signer-deployment"},"harbor-redis":{"path":"harbor/harbor-harbor/harbor-redis-statefulset"},"harbor-ingress-notary":{"path":"harbor/harbor-harbor/harbor-ingress-notary-ingress"}}} \ No newline at end of file +{"version":"1.0.0","resources":{"l2-lb-metallb-controller":{"path":"metallb/metallb-metallb/l2-lb-metallb-controller-deployment"},"l2-lb-metallb-speaker":{"path":"metallb/metallb-metallb/l2-lb-metallb-speaker-daemonset"},"webhook-server-cert":{"path":"metallb/metallb-metallb/webhook-server-cert-secret"},"addresspools.metallb.io":{"path":"metallb/metallb-metallb/addresspools.metallb.io-customresourcedefinition"},"bfdprofiles.metallb.io":{"path":"metallb/metallb-metallb/bfdprofiles.metallb.io-customresourcedefinition"},"bgpadvertisements.metallb.io":{"path":"metallb/metallb-metallb/bgpadvertisements.metallb.io-customresourcedefinition"},"bgppeers.metallb.io":{"path":"metallb/metallb-metallb/bgppeers.metallb.io-customresourcedefinition"},"ipaddresspools.metallb.io":{"path":"metallb/metallb-metallb/ipaddresspools.metallb.io-customresourcedefinition"},"l2advertisements.metallb.io":{"path":"metallb/metallb-metallb/l2advertisements.metallb.io-customresourcedefinition"},"communities.metallb.io":{"path":"metallb/metallb-metallb/communities.metallb.io-customresourcedefinition"},"l2-lb-metallb:controller":{"path":"metallb/metallb-metallb/l2-lb-metallb:controller-clusterrolebinding"},"l2-lb-metallb:speaker":{"path":"metallb/metallb-metallb/l2-lb-metallb:speaker-clusterrolebinding"},"l2-lb-metallb-pod-lister":{"path":"metallb/metallb-metallb/l2-lb-metallb-pod-lister-rolebinding"},"metallb-webhook-service":{"path":"metallb/metallb-metallb/metallb-webhook-service-service"},"metallb-webhook-configuration":{"path":"metallb/metallb-metallb/metallb-webhook-configuration-validatingwebhookconfiguration"},"local-ip":{"path":"metallb/metallb-ip-address-pool"},"ingress-nginx":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-rolebinding-ingress-nginx"},"ingress-nginx-tcp":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-tcp-configmap-ingress-nginx"},"ingress-nginx-udp":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-udp-configmap-ingress-nginx"},"ingress-nginx-controller":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-controller-deployment-ingress-nginx"},"ingress-nginx-controller-admission":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-controller-admission-service-ingress-nginx"},"nginx":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/nginx-ingressclass"},"ingress-nginx-admission":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-admission-rolebinding-ingress-nginx"},"ingress-nginx-admission-create":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-admission-create-job-ingress-nginx"},"ingress-nginx-admission-patch":{"path":"ingress-nginx/ingress-nginx-ingress-nginx/ingress-nginx-admission-patch-job-ingress-nginx"},"etcd":{"path":"dns/dns-etcd-sts"},"core-dns-coredns":{"path":"dns/dns-coredns/core-dns-coredns-deployment"},"external-dns":{"path":"dns/dns-external-dns/external-dns-deployment-dns"},"external-dns-viewer":{"path":"dns/dns-external-dns/external-dns-viewer-clusterrolebinding"},"cert-manager-cainjector":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-cainjector-deployment-cert-manager"},"cert-manager":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-deployment-cert-manager"},"cert-manager-webhook":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-webhook-validatingwebhookconfiguration"},"clusterissuers.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/clusterissuers.cert-manager.io-customresourcedefinition"},"challenges.acme.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/challenges.acme.cert-manager.io-customresourcedefinition"},"certificaterequests.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/certificaterequests.cert-manager.io-customresourcedefinition"},"issuers.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/issuers.cert-manager.io-customresourcedefinition"},"certificates.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/certificates.cert-manager.io-customresourcedefinition"},"orders.acme.cert-manager.io":{"path":"cert-manager/cert-manager-cert-manager/orders.acme.cert-manager.io-customresourcedefinition"},"cert-manager-controller-issuers":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-issuers-clusterrolebinding"},"cert-manager-controller-clusterissuers":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-clusterissuers-clusterrolebinding"},"cert-manager-controller-certificates":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-certificates-clusterrolebinding"},"cert-manager-controller-orders":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-orders-clusterrolebinding"},"cert-manager-controller-challenges":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-challenges-clusterrolebinding"},"cert-manager-controller-ingress-shim":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-ingress-shim-clusterrolebinding"},"cert-manager-view":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-view-clusterrole"},"cert-manager-edit":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-edit-clusterrole"},"cert-manager-controller-approve:cert-manager-io":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-approve:cert-manager-io-clusterrolebinding"},"cert-manager-controller-certificatesigningrequests":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-controller-certificatesigningrequests-clusterrolebinding"},"cert-manager-webhook:subjectaccessreviews":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-webhook:subjectaccessreviews-clusterrolebinding"},"cert-manager-cainjector:leaderelection":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-cainjector:leaderelection-rolebinding-kube-system"},"cert-manager:leaderelection":{"path":"cert-manager/cert-manager-cert-manager/cert-manager:leaderelection-rolebinding-kube-system"},"cert-manager-webhook:dynamic-serving":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-webhook:dynamic-serving-rolebinding-cert-manager"},"cert-manager-startupapicheck":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-startupapicheck-job-cert-manager"},"cert-manager-startupapicheck:create-cert":{"path":"cert-manager/cert-manager-cert-manager/cert-manager-startupapicheck:create-cert-rolebinding-cert-manager"},"cloudflare-api-key":{"path":"cert-manager/cert-manager-api-key"},"acme-issuer":{"path":"cert-manager/cluster-issuer-0"},"argocd-application-controller":{"path":"argo/argo-argocd/argocd-application-controller-serviceaccount"},"argo-argocd-applicationset-controller":{"path":"argo/argo-argocd/argo-argocd-applicationset-controller-deployment"},"argocd-notifications-controller":{"path":"argo/argo-argocd/argocd-notifications-controller-serviceaccount"},"argo-argocd-repo-server":{"path":"argo/argo-argocd/argo-argocd-repo-server-deployment"},"argocd-server":{"path":"argo/argo-argocd/argocd-server-serviceaccount"},"argocd-dex-server":{"path":"argo/argo-argocd/argocd-dex-server-serviceaccount"},"argocd-notifications-secret":{"path":"argo/argo-argocd/argocd-notifications-secret-secret"},"argocd-secret":{"path":"argo/argo-argocd/argocd-secret-secret"},"argocd-cm":{"path":"argo/argo-argocd/argocd-cm-configmap"},"argocd-cmd-params-cm":{"path":"argo/argo-argocd/argocd-cmd-params-cm-configmap"},"argocd-gpg-keys-cm":{"path":"argo/argo-argocd/argocd-gpg-keys-cm-configmap"},"argocd-notifications-cm":{"path":"argo/argo-argocd/argocd-notifications-cm-configmap"},"argocd-rbac-cm":{"path":"argo/argo-argocd/argocd-rbac-cm-configmap"},"argocd-ssh-known-hosts-cm":{"path":"argo/argo-argocd/argocd-ssh-known-hosts-cm-configmap"},"argocd-tls-certs-cm":{"path":"argo/argo-argocd/argocd-tls-certs-cm-configmap"},"applications.argoproj.io":{"path":"argo/argo-argocd/applications.argoproj.io-customresourcedefinition"},"applicationsets.argoproj.io":{"path":"argo/argo-argocd/applicationsets.argoproj.io-customresourcedefinition"},"appprojects.argoproj.io":{"path":"argo/argo-argocd/appprojects.argoproj.io-customresourcedefinition"},"argo-argocd-application-controller":{"path":"argo/argo-argocd/argo-argocd-application-controller-statefulset"},"argo-argocd-server":{"path":"argo/argo-argocd/argo-argocd-server-certificate"},"argo-argocd-notifications-controller":{"path":"argo/argo-argocd/argo-argocd-notifications-controller-deployment"},"argo-argocd-dex-server":{"path":"argo/argo-argocd/argo-argocd-dex-server-deployment"},"argo-argocd-redis":{"path":"argo/argo-argocd/argo-argocd-redis-deployment"},"harbor-tls":{"path":"harbor/harbor-certificate"},"harbor-chartmuseum":{"path":"harbor/harbor-harbor/harbor-chartmuseum-deployment"},"harbor-core":{"path":"harbor/harbor-harbor/harbor-core-deployment"},"harbor-database":{"path":"harbor/harbor-harbor/harbor-database-statefulset"},"harbor-jobservice":{"path":"harbor/harbor-harbor/harbor-jobservice-deployment"},"harbor-notary-server":{"path":"harbor/harbor-harbor/harbor-notary-server-deployment"},"harbor-registry":{"path":"harbor/harbor-harbor/harbor-registry-deployment"},"harbor-registry-htpasswd":{"path":"harbor/harbor-harbor/harbor-registry-htpasswd-secret"},"harbor-registryctl":{"path":"harbor/harbor-harbor/harbor-registryctl-configmap"},"harbor-trivy":{"path":"harbor/harbor-harbor/harbor-trivy-statefulset"},"harbor-jobservice-env":{"path":"harbor/harbor-harbor/harbor-jobservice-env-configmap"},"harbor-portal":{"path":"harbor/harbor-harbor/harbor-portal-deployment"},"harbor-jobservice-scandata":{"path":"harbor/harbor-harbor/harbor-jobservice-scandata-persistentvolumeclaim"},"harbor-notary-signer":{"path":"harbor/harbor-harbor/harbor-notary-signer-deployment"},"harbor-redis":{"path":"harbor/harbor-harbor/harbor-redis-statefulset"},"harbor-ingress":{"path":"harbor/harbor-harbor/harbor-ingress-ingress"},"harbor-ingress-notary":{"path":"harbor/harbor-harbor/harbor-ingress-notary-ingress"}}} \ No newline at end of file diff --git a/chart/src/app.ts b/chart/src/app.ts index a39f3ea..513846d 100644 --- a/chart/src/app.ts +++ b/chart/src/app.ts @@ -251,22 +251,45 @@ export class KubeOpsApp extends App { argocd.addDependency(dnsChart) const harborHost = 'harbor.lab9.cloud' - const harborNotaryHost = 'harbor-notary.lab9.cloud' + const harborNotaryHost = 'notary.lab9.cloud' + const harborTlsSecretName = 'harbor-tls' const scopeHarborHelmParam = scope>(harborDefaultValues) { - scopeHarborHelmParam - .z('expose') - .z('ingress') - .merge({ + scopeHarborHelmParam.z('expose').set({ + ingress: { className: 'nginx', hosts: { core: harborHost, notary: harborNotaryHost } - }) + }, + tls: { + enabled: true, + secret: { + notarySecretName: harborTlsSecretName, + secretName: harborTlsSecretName + }, + certSource: 'secret' + } + }) + scopeHarborHelmParam.z('harborAdminPassword').set('admin') + scopeHarborHelmParam.z('externalURL').set(`https://${harborHost}`) } const harbor = new HarborChart(this, 'harbor', { namespace: 'harbor', + certificate: { + metadata: { + name: 'harbor-tls' + }, + spec: { + issuerRef: { + name: 'acme-issuer', + kind: 'ClusterIssuer' + }, + secretName: harborTlsSecretName, + dnsNames: [harborHost, harborNotaryHost] + } + }, harbor: { releaseName: 'harbor', values: scopeHarborHelmParam.get() as any, diff --git a/chart/src/charts/harbor.chart.ts b/chart/src/charts/harbor.chart.ts index 07e70f9..ac643b6 100644 --- a/chart/src/charts/harbor.chart.ts +++ b/chart/src/charts/harbor.chart.ts @@ -2,15 +2,19 @@ import { AbsChart, HelmProps } from '@package/cdk8s-loader' import { PartialRecursive, scope } from '@package/common' import { ChartProps, Helm } from 'cdk8s' import { HarborHelmParam } from '../types' +import { Certificate, CertificateProps } from '@package/k8s-generated/generated' interface HarborChartProps extends ChartProps { harbor: Omit>, 'chart'> + certificate?: CertificateProps } export class HarborChart extends AbsChart { protected loadChildren(id: string, props: HarborChartProps): void { - const { harbor, namespace } = props - + const { harbor, namespace, certificate: certificateProps } = props + if (certificateProps != null) { + new Certificate(this, `${id}-certificate`, certificateProps) + } const scopeHarborHelmParam = scope>({ chart: 'harbor/harbor', namespace