diff --git a/harbor/application.yml b/harbor/application.yml index 05e19f9..e76efea 100644 --- a/harbor/application.yml +++ b/harbor/application.yml @@ -4,6 +4,7 @@ apiVersion: v1 kind: Secret metadata: name: harbor-core + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -13,22 +14,23 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" type: Opaque data: secretKey: "bm90LWEtc2VjdXJlLWtleQ==" - secret: "ZW92VFRmU3RSNGR4R2FPYg==" - tls.key: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBdm96RWMrWEJ2RVkvbVgxaVlLOXk5MjhoQ2V5VXBiVTRwUWY0VHZQUzE4alFObklqClNUNnJNUS96ejdRR2hvSHpPci90YjNDQnE1ZjY1NjdQd3VscVpjcUxKK1FydzlZZEJyQlhFMnRzWHhwei81UGcKT1pWdG05b2lUVDJJRUw1N0xVYVhlNjRheG5GbkVHTTdmY3JOdlFyZzhGWU1BdGJhV3puMHUyWUNQS0xKWG0wRwpIQlUrWXcxOHM2Q2o2ZG5uRUtITVBSNDF3VTNSU01aTlAxcWovc1dlVDFWMWZGdlV6OFNlOFJLOGZHUE9CQjBsClhHVDd1U0wzZTZUc1N1ZHZMMDV0cmR4QzJhbjNpMTBvM2FtMkh4d1EramRWZUx2cXNrU2daWnBGck9lZUxTc08KdmR4SFJ0azNIRlY4UFlwMVBHZWR3NFlNSDFiU1ZkTDgxZ1JBbFFJREFRQUJBb0lCQVFDb3hjZXZHNTVZSXlScgp6OG1WOTNCdHhrbE9IL1NkUFFENTh6QTB4Zk5HMnYvSWFabmxZeE4vOWpBdUZMYis1aFRJUVh5TkN1cGZVTktUCjZKcnVlWTJhc1NaRjQrdjduaWJCYU9rSE0wdWVoTENmZTV2TGhSVzdTQjYvcVROZUdVakNsbGJQM2lxcS80Q1kKM0R1eU5ERzhNZW1BRmNhM3NSTmdYOW5yTGZQblBZU0s5d3NFbkhSS0N1ZldBeGJBZEw3QTZYemFEM3k2Qy9uUApTSEtzSHprM3hNcXVaeFBRTUIvR3dvSWo1RXRMUmZjcGRBbjYzNE9GdG5KNG1JaVJnM3E4WXNSSThSNFRlbkExCjdmMzBWaHB4djd4cFRhZjJoNGRhKzNnS0RqR0U0aEhyOVVNUWVKYnUzTGJVeno1Q2Rtck1HQUYyczFDdWlKOTQKbUpwRjIxUGhBb0dCQU5ZTkhhRlFSRTFoVHhiMFY3ajc5RStKY1NtajNtMnNKUk9WWWRrMG5DOHJ3QjF0amMycQozTE0rV3hJZlBMcmRuMXU0SzBnUGlLVW1lcnNWQzVaVk80M3IxT2dTVXBUanFteXBJdkNOdHBjQXVTeDA1RkYzClhGVXFxL3JhYWNGcmg3Rzh0cVpWNFRFa3QxQXRvb3ZOQmJTT0Z2UDVicEFwWHRRY2FrM0dXRUo5QW9HQkFPUGsKbUh2LzllVWxRaVQ3eHBhQ3lKMm54OHJEdFpEMCs4WnFDVHlteVd4TnhXWWYwY3hQempsaU93T040c09uY3krdQp6K3ZuSWVUNEV5QW9WTUJ4dG9pdlZtNWwydGM1aDVYKzdzSFpFNDRtcWRvMW8rQTNNcXZDWThKYmxzaGNyMEZtCjYwUit0Q3NZOXhObkcwRDY4WXdXT0lHSjVLVmNOc0pnYVo2UGdQbjVBb0dBZjFOOTlKOFNnaFVJUHRkSjl6ZW8KdEVkRmtVZHc0RHd1TWVBQ1BIb1hEZGd3aDFETHNUT1o1T1dLdHRUdUF4b2gyU1ZNV2FrajExbDBXQ1RFcDhBNwpsTWhiOVZBdzMzQXR5RVUwQzNQQTBVSVU1R1VFQzVHODBzeDNVTmpyWDZyZkpOTGtzejBTbjNEL3VpbnJMczNlClB2RG1wbW9SWXArNVVPTTJPTjFyVXVFQ2dZQXl1d2VLeXY3MUpLY2x6bnAxdE9WdDJ4U3B1WWxvbkhDVHliVUcKc0dZMFd0ZXZsVFBCMUo0bXZndy9EVTNHbWpjVkRVZ3h6b0VJRklWRmFsVDdoaFRKTnFiNTZtaWQ4cXVSSTNBSQo3UWJpWlE3NGlXcFNsbGNNVHppZjRuMmRXcXlVMVpGWDdSQzBhMWxORTIzSXVGUWZDQzlKL3VWTVBrdmVWMUlMCnZ3eEtHUUtCZ0JvcFJCMHhUalJtY0tiN2FGeVFub2tycUNoWE5rd0phNTFaekRUNU10Wm1kUUdYTTZ2WkxwTnkKb3IvUENnVXBoRVRKWjFJVEZEUDNrZkJOUk83TzRlQ3kvWVdtZVROZ3M4VlJvZXpiNUFWVnNURHdyVWdJeUc2SQpGdG9CQmgrOGZvcUdaQXlxN3BLR3JNc201RVd4aXZiOStYVHc0UldhaWFXZWdOK20weUJxCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==" - tls.crt: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURIekNDQWdlZ0F3SUJBZ0lRUFJDbFZlWlV1bTRrWklGOUxNb21HVEFOQmdrcWhraUc5dzBCQVFzRkFEQWEKTVJnd0ZnWURWUVFERXc5b1lYSmliM0l0ZEc5clpXNHRZMkV3SGhjTk1qUXdPVEE0TWpFeE5UUXdXaGNOTWpVdwpPVEE0TWpFeE5UUXdXakFhTVJnd0ZnWURWUVFERXc5b1lYSmliM0l0ZEc5clpXNHRZMkV3Z2dFaU1BMEdDU3FHClNJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUMrak1SejVjRzhSaitaZldKZ3IzTDNieUVKN0pTbHRUaWwKQi9oTzg5TFh5TkEyY2lOSlBxc3hEL1BQdEFhR2dmTTZ2KzF2Y0lHcmwvcm5ycy9DNldwbHlvc241Q3ZEMWgwRwpzRmNUYTJ4ZkduUC9rK0E1bFcyYjJpSk5QWWdRdm5zdFJwZDdyaHJHY1djUVl6dDl5czI5Q3VEd1Znd0MxdHBiCk9mUzdaZ0k4b3NsZWJRWWNGVDVqRFh5em9LUHAyZWNRb2N3OUhqWEJUZEZJeGswL1dxUCt4WjVQVlhWOFc5VFAKeEo3eEVyeDhZODRFSFNWY1pQdTVJdmQ3cE94SzUyOHZUbTJ0M0VMWnFmZUxYU2pkcWJZZkhCRDZOMVY0dStxeQpSS0JsbWtXczU1NHRLdzY5M0VkRzJUY2NWWHc5aW5VOFo1M0RoZ3dmVnRKVjB2eldCRUNWQWdNQkFBR2pZVEJmCk1BNEdBMVVkRHdFQi93UUVBd0lDcERBZEJnTlZIU1VFRmpBVUJnZ3JCZ0VGQlFjREFRWUlLd1lCQlFVSEF3SXcKRHdZRFZSMFRBUUgvQkFVd0F3RUIvekFkQmdOVkhRNEVGZ1FVOElIQ01yTENBdEtUMHd4ZnZxS21sR1NzZ0UwdwpEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQ2NsTXpUYmNreHlRMWEwNWFjRS8xbTlNQm5RV2sxQ2NPVitEeVRuCjR3S1RpZFg2NG5lT1Z5aUUrVzM1REtzZWpEYUpWekZpOFR6aUlsanFSbDYzVk15OWxTMFdPUUdQOWdhRVZ1NWYKR2VJemlqT1NKQXhwZ1RUcmZpQTRtbUllTTFqbVVpTml6bGxTa2s2b0NoNWRsQzNBaU1QTHpSbnNXT200VXlwLwpER0o4d0NmbGhxREd2Z3YrTEV5OUNUNVI2SFBmdVE0RGVlSHJDa1FuenhySlJZankrSTRmR3liSTdtSlYrb3dtCnNObnoxUlRzTmJqY2JldnV5a0RTaUNRdnRvMmtxU0l1MDdIRHpXVGVkbk9KamRvekpLU002UEZ1ZlJneDRhVVIKOEhtT25tckp5V0Zjem8yUlFXdTVHVCt1RFZEL3RVWXJTZzBOdjBDZEtrazBPWFU9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K" + secret: "dU0wN0trdmV1MTduU3BFOA==" + tls.key: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBeFN6Z252L25kM2Q4ay9LVkNydXRxZmVBTElVcXF0aUlQeCtYVlRFMUNhR3gwcWY5CkpVaVFhOC9oNHZzWDdDRi9PNjNKaHdtdXpwWmxQSGovQzRMeXhDdWJLSHVZdk9EUW5CbWxtbVEwenc2UEdGencKV25lUThtaTNma3ZmYkJpdUVoR2JrYlBsSmQ4dmtIN2lVZ3doOElyZmVYVjRNM2w5bXp3K1pySnNUcWpwUitndQpzMm1qajJHR0ovcWFESHExTGxENEdNMk5mcmRXeTk2RU94YVJ3a3BrU0V4MTJMMEZjcldBRlBDZVZsVHJYdkJWCmJPUkg5dldmUi8zMTJ6MnJmY05YMlE4cCtRQjlWMVNDTlVFbU96Zy9IbzZpM1BRM1AyRm1uNmI3N3lPNGVsUU8KcVNndGJUZWhXT3FXdCtNUVpRUSszVC9ONFRrcVZhZGxNRDdRNHdJREFRQUJBb0lCQURsanBZRkIxSm9tRWdGeAowc1dMK0xFRzA2eWhtZGllSzVITDNSMHp0RTg0Vyt5SGJwdmljZjZmUkF6dnJuZlJEQnBQcTk5OUJ2OGtNUlVYCjFvd0FNaTY4em0xTEJCcTlpSnBXc0tldVVOeVBUVUQzRkJJUXlRUjFUQ3NiWkUwdkpjTW1rdFFtdXlSNXdIdGIKSXY1a2Y2Qm1tMExiMlArS2RlK3Y2aTJ6OHVnMXAvOTV2ZGV0QlRBc1hDbk8rZE5uMUluR09XYW4yNHVuUmVEVwowM041ZkV1b2d1MHY4OWx4b09DT20zVFVxRGxScythUVUxK3VjUW40NXpsU2lSVmZZS0ZMYWprbVVOSkpyQVEyCnVDSlJlSmFmTjF1Vld4NTdVOFJsOGt0ZzRoQ1Y3aSs4R0hXcUttWFY5Z2RuV2UzTklmV1RNdWkzOEZNNDlKVDcKMzdNdHE2a0NnWUVBL0RJWHNDQ3pXZjlHOUhmMmYvZk85VVpWZmkyWTBSSTFpMm1ZczhLVjdpaThyMFhWUlNvdwpHM21oUVJYdVM5STlxSW9VSXRSbThRYU1RM0ZONFl3b0trYnNOZnZJRWtJZDllMFUvYldRNkRUTko2RDZESC9xCnM2TGVQMmRyS1h0bUdNR0E3eStDeUxQVElOQjVJMUlBWWxJcFFqeUgzd1VoaS9qSUlLUmdmTmNDZ1lFQXlDWlAKM2JobU5UTjY2VzROSnYvd3hla1pkS3hDYUxaSWQ2MXJVa0lpMU5hbHJwazhSZFBhaFllbmVKZUlyU0lHMkRhNwovU0NodWhYek5xL2tTenBLQlJxYVF5NHZGVmdneUpabjRlU2FvdDMxSDc4NWxlVllaYzdEWnZvaU9Rd1EyVW15CmpGeFFQUHhHemNxRmlYLzJDUzFtUXF2dFJDKzU4ZGNrWUE3Z1h0VUNnWUEyWnJQWGFXWm0zbnMyMXYzVVl1ZEEKMzNnbnJMeFBOU2RadUdDWlBqdExVWHhLTHIwdm0wY2ZWaUJqd3RCUmlMdUdOS3JkVElZY0xmWnB3Zkl6MmlENwo1YXFraG5pRS84QW93WWlLcGZUcE1pS2pEc1dCbHNKUkY2dnJiMnFkV3lJTjZ3ZmVFSmljcExYQldWY1lPR01lCjBteFYvbXFzd0JXWmRRUHVqcWJGcHdLQmdCbG93N3JpTGhlUzhZZXc4UHFDZzQ2Y2lSN0d2NmVMZktlMDNHc1UKK2xjSzZQM0JkbVZtLzliejRjN3RiZXlNNVZHTm9WQUJWSWJMUXBVdXYwek5tWmdNU0lrKzA3dGg5TWVDVUszYwoxOFRWYU1rZS9iQ0o3Uzcva004QjhsWkxzZGZrQTBiT2NXRk1wYkI2aFhsdlJVems5cGFBUFI3cThEQkRuOXFTCkNPb0JBb0dBQmNOcCtmb21jQWZOZkY4c0ZBT0pqdTh5OEZPd1pjSzV1SzJiN0FFOTBGaHduU05UampyZXJ1Z2oKbFBhWG9MTmZ4MmIxVlJvbzFtTjF1WU1aR1hpVDlZM2FRRkcrS0dMY3NuOG1uK2wxcVBhWkw2NnloYThaVm9VdwpxQWV2eXRzUlRsQWhFcXI1akdYMlVsQzNEbW5MaVJmVFBDVEtTclkzZ0trc29tMjlpdWM9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==" + tls.crt: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURIekNDQWdlZ0F3SUJBZ0lRUWJUbTFCZlRNOHpQRkxHM3ZSZlExREFOQmdrcWhraUc5dzBCQVFzRkFEQWEKTVJnd0ZnWURWUVFERXc5b1lYSmliM0l0ZEc5clpXNHRZMkV3SGhjTk1qVXdOREU0TVRrd05UVTRXaGNOTWpZdwpOREU0TVRrd05UVTRXakFhTVJnd0ZnWURWUVFERXc5b1lYSmliM0l0ZEc5clpXNHRZMkV3Z2dFaU1BMEdDU3FHClNJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUURGTE9DZS8rZDNkM3lUOHBVS3U2MnA5NEFzaFNxcTJJZy8KSDVkVk1UVUpvYkhTcC8wbFNKQnJ6K0hpK3hmc0lYODdyY21IQ2E3T2xtVThlUDhMZ3ZMRUs1c29lNWk4NE5DYwpHYVdhWkRUUERvOFlYUEJhZDVEeWFMZCtTOTlzR0s0U0VadVJzK1VsM3krUWZ1SlNEQ0h3aXQ5NWRYZ3plWDJiClBENW1zbXhPcU9sSDZDNnphYU9QWVlZbitwb01lclV1VVBnWXpZMSt0MWJMM29RN0ZwSENTbVJJVEhYWXZRVnkKdFlBVThKNVdWT3RlOEZWczVFZjI5WjlIL2ZYYlBhdDl3MWZaRHluNUFIMVhWSUkxUVNZN09EOGVqcUxjOURjLwpZV2FmcHZ2dkk3aDZWQTZwS0MxdE42Rlk2cGEzNHhCbEJEN2RQODNoT1NwVnAyVXdQdERqQWdNQkFBR2pZVEJmCk1BNEdBMVVkRHdFQi93UUVBd0lDcERBZEJnTlZIU1VFRmpBVUJnZ3JCZ0VGQlFjREFRWUlLd1lCQlFVSEF3SXcKRHdZRFZSMFRBUUgvQkFVd0F3RUIvekFkQmdOVkhRNEVGZ1FVZWdSMWFiRzg5L1VRUlFibWwxRXAwZVpGMXVjdwpEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSFpwWVBkQ1AxeWxmUFE3NE5HWTNSMURxaDFITWErYTdwd0c3VCsvCkc4MllLRnM4THRCcnJ6RDVvUSt0NnI4YTRZU2ZkaldTVVQ0WkI2Z0RDZFVQeVRJNWxCTnNvYjk4RnVjc0t6VmwKTHFHYUh1ZGFZL2ZTenArVkhIWmt3ZU1hVzY0TmFON1RVdWFWdCtEcXQ1cUwvenV6aW42b0trb1A1YTQvdjltWgp3c1NkUk5odC92UkFZMllma054bGpXNzR1MlpOaml0OG1tL2xwRjVteWNrVnFST1VweGowMXUvUUJyRmk2YUR6CkJjZ3FRajlkc2ZXVHVQUFk2VlAvdzVWOFFLS1NuaTkzcFN1N3FzU2tGaEJIQ1FJQmpXaGxWTTYwMWVWYkhsQ1QKeE1kM2x2Y3JpNlgrU3J1bjhSUytrTVhoY1orNEZZWHN2MHAvZ0YzZElMSDVMSXM9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K" HARBOR_ADMIN_PASSWORD: "SGFyYm9yMTIzNDU=" REGISTRY_CREDENTIAL_PASSWORD: "aGFyYm9yX3JlZ2lzdHJ5X3Bhc3N3b3Jk" - CSRF_KEY: "Vlk1MFNhMFp4N3lNUUlOWXlZcVR3c0l4cDBCMUhhdWM=" + CSRF_KEY: "V3ZHVTlmaDdSQkJkc0FXVjNiVFVselpCYUJtMUZDUks=" --- # Source: harbor/templates/exporter/exporter-secret.yaml apiVersion: v1 kind: Secret metadata: name: harbor-exporter + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -38,7 +40,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" type: Opaque data: HARBOR_ADMIN_PASSWORD: "SGFyYm9yMTIzNDU=" @@ -48,6 +50,7 @@ apiVersion: v1 kind: Secret metadata: name: "harbor-jobservice" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -57,10 +60,10 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" type: Opaque data: - JOBSERVICE_SECRET: "Sk5JU3VIUHViZDYwTjlOUQ==" + JOBSERVICE_SECRET: "SXZTSjVnVHg3aHY1YUhSWg==" REGISTRY_CREDENTIAL_PASSWORD: "aGFyYm9yX3JlZ2lzdHJ5X3Bhc3N3b3Jk" --- # Source: harbor/templates/registry/registry-secret.yaml @@ -68,6 +71,7 @@ apiVersion: v1 kind: Secret metadata: name: "harbor-registry" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -77,10 +81,10 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" type: Opaque data: - REGISTRY_HTTP_SECRET: "ODV4RjZ5TkZlYnh0M3hkZA==" + REGISTRY_HTTP_SECRET: "QmhvSnJoalMyb0tlTElNYQ==" REGISTRY_REDIS_PASSWORD: "TXZZY3VVMFJhSXUxU1g3ZlkxbTFKcmdMVVNhWkpqZ2U=" --- # Source: harbor/templates/registry/registry-secret.yaml @@ -88,6 +92,7 @@ apiVersion: v1 kind: Secret metadata: name: "harbor-registry-htpasswd" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -97,16 +102,17 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" type: Opaque data: - REGISTRY_HTPASSWD: "aGFyYm9yX3JlZ2lzdHJ5X3VzZXI6JDJhJDEwJDJiSTc1ZjlUeXdmYkZ1bnpNQk50NnVOQUNMVko4UjdDWmtrV2M2UzROUnlIMlZiR2RaNXVT" + REGISTRY_HTPASSWD: "aGFyYm9yX3JlZ2lzdHJ5X3VzZXI6JDJhJDEwJHcydGVWR21hNEppSHJqOVJaSXZ4NHVQMG1VRmRTWjJvdTdsV2Zyd0NBcXowRkFrR3pGNkV1" --- # Source: harbor/templates/registry/registryctl-secret.yaml apiVersion: v1 kind: Secret metadata: name: "harbor-registryctl" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -116,7 +122,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" type: Opaque data: --- @@ -125,6 +131,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: harbor-core + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -134,7 +141,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" data: app.conf: |+ appname = Harbor @@ -185,6 +192,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: "harbor-exporter-env" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -194,7 +202,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" data: HTTP_PROXY: "" HTTPS_PROXY: "" @@ -226,6 +234,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: "harbor-jobservice-env" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -235,7 +244,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" data: CORE_URL: "http://harbor-core:80" TOKEN_SERVICE_URL: "http://harbor-core:80/service/token" @@ -245,6 +254,8 @@ data: JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "3" JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "3" + + LOG_LEVEL: "debug" HTTP_PROXY: "" HTTPS_PROXY: "" NO_PROXY: "harbor-core,harbor-jobservice,harbor-database,harbor-registry,harbor-portal,harbor-trivy,harbor-exporter,127.0.0.1,localhost,.local,.internal" @@ -256,6 +267,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: "harbor-jobservice" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -265,7 +277,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" data: config.yml: |+ #Server listening port @@ -306,6 +318,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: "harbor-portal" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -315,7 +328,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" data: nginx.conf: |+ worker_processes auto; @@ -357,6 +370,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: "harbor-registry" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -366,7 +380,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" data: config.yml: |+ version: 0.1 @@ -398,6 +412,7 @@ data: readtimeout: 10s writetimeout: 10s dialtimeout: 10s + enableTLS: false pool: maxidle: 100 maxactive: 500 @@ -433,6 +448,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: "harbor-registryctl" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -442,7 +458,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" data: --- # Source: harbor/templates/jobservice/jobservice-pvc.yaml @@ -450,6 +466,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: harbor-jobservice + namespace: "harbor-operator" annotations: helm.sh/resource-policy: keep labels: @@ -461,7 +478,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: jobservice app.kubernetes.io/component: jobservice spec: @@ -477,6 +494,7 @@ apiVersion: v1 kind: Service metadata: name: harbor-core + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -486,7 +504,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" spec: ports: - name: http-web @@ -504,6 +522,7 @@ apiVersion: v1 kind: Service metadata: name: "harbor-exporter" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -513,7 +532,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" spec: ports: - name: http-metrics @@ -528,6 +547,7 @@ apiVersion: v1 kind: Service metadata: name: "harbor-jobservice" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -537,7 +557,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" spec: ports: - name: http-jobservice @@ -555,6 +575,7 @@ apiVersion: v1 kind: Service metadata: name: "harbor-portal" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -564,7 +585,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" spec: ports: - port: 80 @@ -579,6 +600,7 @@ apiVersion: v1 kind: Service metadata: name: "harbor-registry" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -588,7 +610,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" spec: ports: - name: http-registry @@ -608,6 +630,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: harbor-core + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -617,7 +640,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: core app.kubernetes.io/component: core spec: @@ -639,13 +662,13 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: core app.kubernetes.io/component: core annotations: - checksum/configmap: 459defa5f990e3b5029d62cfdb86ca9a4191544419bdac39dac6eabc20a1d07c - checksum/secret: cb3c7b9ca5ab79bbe000a4fc96165503da4a59cb40edc0e0b75b3f154910e171 - checksum/secret-jobservice: abd218ca34d4473a7f8e1f6ed12b0b5e85e4f0b1ce1f6127afdfc59c9853fe7d + checksum/configmap: 53edfff371caa1358d16dc55ff64ef5bfe6f5ff19c4066ef0e52fe0d29191437 + checksum/secret: 5bce7bc29f9972e5e0c7941ca95359a5a68074e91d327eee63ab2cad9e60a3d6 + checksum/secret-jobservice: fc7154159feb53c4accc9273b50a432527101aae6d5aacb1447c0019527883c9 spec: securityContext: runAsUser: 10000 @@ -654,7 +677,7 @@ spec: terminationGracePeriodSeconds: 120 containers: - name: core - image: goharbor/harbor-core:v2.11.1 + image: goharbor/harbor-core:v2.13.0 imagePullPolicy: IfNotPresent startupProbe: httpGet: @@ -750,6 +773,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: harbor-exporter + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -759,7 +783,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: exporter app.kubernetes.io/component: exporter spec: @@ -781,12 +805,12 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: exporter app.kubernetes.io/component: exporter annotations: - checksum/configmap: 7175588df9aea5ad07381b9e28514d0f3506380b511be090b7d2ddc40beb5ab0 - checksum/secret: be1b09e9e24f666fd357cca51bb49abd966708df0bd2e97078bf88db7ffddf85 + checksum/configmap: d37ae90c0cba9361dd0f112860f5813c4fa7a69929999934c5823acc5872bd57 + checksum/secret: f27e8195cce60fceb547a244386e5537de10e4b5a8d446266dda3f08e7d07aa1 spec: securityContext: runAsUser: 10000 @@ -794,7 +818,7 @@ spec: automountServiceAccountToken: false containers: - name: exporter - image: goharbor/harbor-exporter:v2.11.1 + image: goharbor/harbor-exporter:v2.13.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -842,6 +866,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: "harbor-jobservice" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -851,7 +876,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: jobservice app.kubernetes.io/component: jobservice spec: @@ -875,14 +900,14 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: jobservice app.kubernetes.io/component: jobservice annotations: - checksum/configmap: 5af691ab7fd728ad91fbd355f03ea709d69f58a32e405436cec9056617490bb3 - checksum/configmap-env: f86af5d5cdbf21c00a2721265d7db84c8cda8ef1b2ac4da29aff32dbdf0a875d - checksum/secret: 28c5439858d9583576afb9f6fa5ec06f8cd0ddd5883de3d0bf500e043b1e9f37 - checksum/secret-core: 0fd20ee0eab72090f437861dd69bda563072baddf2c1be9c8ea9adae7cd4450a + checksum/configmap: ab59b1db8f4e515349c53859b33651de8c104235b67af5cd19a83ae46be28446 + checksum/configmap-env: 5fa7cae84a3894baf549f9f50e7e1e529b418a9264ad220a047cdbf7845bc08e + checksum/secret: efbb9ad12811e43b2ad3a85611cc18e37de6220c059511119f80e704ae40c1c3 + checksum/secret-core: a2530b411d3dec989d79c0f8e44a19e5f8a295ab4f9fbccf1bb827b67b130577 spec: securityContext: runAsUser: 10000 @@ -891,7 +916,7 @@ spec: terminationGracePeriodSeconds: 120 containers: - name: jobservice - image: goharbor/harbor-jobservice:v2.11.1 + image: goharbor/harbor-jobservice:v2.13.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -949,6 +974,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: "harbor-portal" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -958,7 +984,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: portal app.kubernetes.io/component: portal spec: @@ -980,11 +1006,11 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: portal app.kubernetes.io/component: portal annotations: - checksum/configmap: 24d858ac32ea0ba10f15274a5dc08a307a5bb9f3577cab5a58d086976c36aee5 + checksum/configmap: 4a8c44b3b4db968155f464771c3ee96c284b82ad21d850701e77748d78c7b1a3 spec: securityContext: runAsUser: 10000 @@ -992,7 +1018,7 @@ spec: automountServiceAccountToken: false containers: - name: portal - image: goharbor/harbor-portal:v2.11.1 + image: goharbor/harbor-portal:v2.13.0 imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false @@ -1033,6 +1059,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: "harbor-registry" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -1042,7 +1069,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: registry app.kubernetes.io/component: registry spec: @@ -1066,14 +1093,14 @@ spec: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" component: registry app.kubernetes.io/component: registry annotations: - checksum/configmap: 275b555209ecc9f8ff34a171d588f4030db27ae049e605ccf3cfa3c75d1acb6d - checksum/secret: 2e37b86bd1c3d83b57d2ed1d80dcbe1fc39a5e241fa8cb776dac29cbccf64448 - checksum/secret-jobservice: b153867cbce5e1d1b9ca0d2f4757c175d79e0f7d439cd472f35f28d764497d0b - checksum/secret-core: 12550e5628a5bb979f1820737ebd09608aee707cfea2596b65edbeedc75d2558 + checksum/configmap: b8975994d732c8c31013f961eec0019e4600aa162dcfd611aeec2d4f1da64e36 + checksum/secret: 3d5fb955519f6a87cec93aca10887013bff60851b8ead4ce898afd4275d2764f + checksum/secret-jobservice: 41630ce132329f2ad93b7e386e4b28b938c80346aa9b4d7971570d25c65f97f4 + checksum/secret-core: ee02b34f2fe5f6c6b4f575aee6fa8ae4bda2977c3a5792501e7158ca18975ef1 spec: securityContext: runAsUser: 10000 @@ -1083,7 +1110,7 @@ spec: terminationGracePeriodSeconds: 120 containers: - name: registry - image: goharbor/registry-photon:v2.11.1 + image: goharbor/registry-photon:v2.13.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1108,7 +1135,6 @@ spec: runAsNonRoot: true seccompProfile: type: RuntimeDefault - args: ["serve", "/etc/registry/config.yml"] envFrom: - secretRef: name: "harbor-registry" @@ -1129,7 +1155,7 @@ spec: mountPath: /etc/registry/config.yml subPath: config.yml - name: registryctl - image: goharbor/harbor-registryctl:v2.11.1 + image: goharbor/harbor-registryctl:v2.13.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -1205,6 +1231,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: "harbor-ingress" + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -1214,7 +1241,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" annotations: cert-manager.io/cluster-issuer: default external-dns.alpha.kubernetes.io/target: traefik.k-space.ee @@ -1227,8 +1254,9 @@ metadata: traefik.ingress.kubernetes.io/router.tls: "true" spec: tls: - - hosts: - - "*.k-space.ee" + - secretName: wildcard-tls + hosts: + - harbor.k-space.ee rules: - http: paths: @@ -1253,13 +1281,6 @@ spec: name: harbor-core port: number: 80 - - path: /chartrepo/ - pathType: Prefix - backend: - service: - name: harbor-core - port: - number: 80 - path: /c/ pathType: Prefix backend: @@ -1281,6 +1302,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: harbor + namespace: "harbor-operator" labels: heritage: Helm release: harbor @@ -1290,7 +1312,7 @@ metadata: app.kubernetes.io/name: harbor app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: harbor - app.kubernetes.io/version: "2.11.1" + app.kubernetes.io/version: "2.13.0" spec: jobLabel: app.kubernetes.io/name endpoints: diff --git a/harbor/values.yaml b/harbor/values.yaml index 5779610..dfa364a 100644 --- a/harbor/values.yaml +++ b/harbor/values.yaml @@ -1,7 +1,11 @@ expose: type: ingress tls: + # harbor helm needs PR to use non-core-host-named tls (wildcard), like *.k-space.ee; currently it gets its own cert (harbor.k-space.ee) enabled: true + certSource: secret + secret: + secretName: wildcard-tls ingress: hosts: core: harbor.k-space.ee @@ -10,7 +14,7 @@ expose: kubernetes.io/ingress.class: traefik traefik.ingress.kubernetes.io/router.entrypoints: websecure traefik.ingress.kubernetes.io/router.tls: "true" - external-dns.alpha.kubernetes.io/target: traefik.k-space.ee + external-dns.alpha.kubernetes.io/target: traefik.k-space.ee labels: {} externalURL: https://harbor.k-space.ee @@ -118,6 +122,8 @@ metrics: trivy: enabled: false +notary: + enabled: false database: type: "external"