update 07/08/24 09:25:53

Qovery · Jul 8, 2024 · 8c82a05 · 8c82a05
1 parent aace257
commit 8c82a05
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 18 deletions.
diff --git a/...ery/charts/qovery-cluster-agent/templates/admission-controller-webhook-configuration.yaml b/...ery/charts/qovery-cluster-agent/templates/admission-controller-webhook-configuration.yaml
@@ -3,12 +3,17 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: {{ include "qovery-cluster-agent.fullname" . }}-webhook
   namespace: qovery
+  {{- if not .Values.useSelfSignCertificate }}
   annotations:
     cert-manager.io/inject-ca-from: qovery/{{ include "qovery-cluster-agent.fullname" . }}-tls
+  {{- end }}
 
 webhooks:
   - name: {{ include "qovery-cluster-agent.fullname" . }}-service.qovery.svc
     clientConfig:
+      {{- if .Values.useSelfSignCertificate }}
+      caBundle: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNVENDQWhtZ0F3SUJBZ0lVQVZKdEc5SDRiYng4bExUNGRJWFBpQW4yUlNBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0p6RWxNQ01HQTFVRUF3d2NjVzkyWlhKNUxXTnNkWE4wWlhJdFlXZGxiblF0ZDJWaWFHOXZhekFnRncweQpOREEzTURNeE5UVXdOVFZhR0E4ek1ERXdNREl5TlRFMU5UQTFOVm93SnpFbE1DTUdBMVVFQXd3Y2NXOTJaWEo1CkxXTnNkWE4wWlhJdFlXZGxiblF0ZDJWaWFHOXZhekNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0MKQVFvQ2dnRUJBTGFsNUU1NmxZSXVOb01OUVBxOW9xYlQwc0xLdWh4alNicUlOQi92N1BRMlFjWEpoUmVNTXI3dQo3VjRVUmorWkxYRHRWUU93NFAzQmVYT25PV0REOFRETVZ5TnI5V3k1VVlWZzRWclJyeDUvSnBRdEdUUHFIZFByCk5wbDBBMkpiR1h1NVU5SlNhR1owNGdpOFNBemdYSS9zQTZ5RlE2SjR1eFZzSVZIbFFCWGY3YnBXTkdhazNNR1cKWVJzSzBhaHhDMlloRm16RjNjUmNKNUVXWnFkekpDd2x6RCtsNEQvUDZFcWN4ai8zUTZpMGl0L2tHWlJ1YXFCbwp2TlZWbmE1SzJtbG11MHNsQlBHTXhRWkpNRVNSSlVBTzZSbWtoYUMzaUhkVVJTTitpN09YTk5tSEhQRW5YTXBECnJGRjJ3WW5tL0tlOWFTd0NlMyt2L1VlNHBaZWFjeDhDQXdFQUFhTlRNRkV3SFFZRFZSME9CQllFRkgzUk00ZjEKZ0pzeGRQNnBmSk9hNlVyVHlDOWNNQjhHQTFVZEl3UVlNQmFBRkgzUk00ZjFnSnN4ZFA2cGZKT2E2VXJUeUM5YwpNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRmNCRWpZaFlzSWZtYXBzCit6Mjh6aGpSYXMrbGhBQW0yV1BseEZkbE5zbXFua2R2eEJRcmlBRmJEQm51RUxVdElCUGxPdHozMlhnRzV0MjcKSExXd2pWWkFRNmRERjJJWVQzeWJDaExnYkdycVR6UFNCYTdrNm1WZUZ6cmZEVmNKTVhGdHJ3TUVqODgvT3pGaQpOQjhXdjNabGFxUGtsS1FyR2IrWDBCYVhKckswWEIrY0l5R1FCZ2QxR0tXcGIycEJWejRvc1FHMUN5ZHpuTllYCkp0ekxHb2NwdTljbHNpcmxjVVVYNjlHUVBNZldyS0hIRGtrejQ3NWFnT2pkSWI5TUFjZWwxWENsQmdlWHJuMkwKNkFGaGNYYnhVRVIzUjNTQlJtM3d6ZVowMllUYVpMVS9XOVYxam1hbVIwSDVsSzEwOU9CM2VPTmdVeC9uTjlBUApvU2VhN0djPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg=="
+      {{- end}}
       service:
         name: {{ include "qovery-cluster-agent.fullname" . }}-service
         namespace: qovery

diff --git a/charts/qovery/charts/qovery-cluster-agent/templates/certificate.yaml b/charts/qovery/charts/qovery-cluster-agent/templates/certificate.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.useSelfSignCertificate }}
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
@@ -40,3 +41,4 @@ spec:
   # Issuer references are always required.
   issuerRef:
     name: {{ include "qovery-cluster-agent.fullname" . }}-issuer
+{{- end }}
diff --git a/charts/qovery/charts/qovery-cluster-agent/templates/deployment.yaml b/charts/qovery/charts/qovery-cluster-agent/templates/deployment.yaml
@@ -71,7 +71,11 @@ spec:
       volumes:
         - name: tls-certs
           secret:
+          {{- if .Values.useSelfSignCertificate }}
+            secretName: {{ include "qovery-cluster-agent.fullname" . }}-self-signed-tls
+          {{- else }}
             secretName: {{ include "qovery-cluster-agent.fullname" . }}-tls
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/qovery/charts/qovery-cluster-agent/templates/secret-tls.yaml b/charts/qovery/charts/qovery-cluster-agent/templates/secret-tls.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.useSelfSignCertificate }}
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  # Set a different name for self-signed secret to avoid conflicts with previous installation
+  name: {{ include "qovery-cluster-agent.fullname" . }}-self-signed-tls
+  namespace: qovery
+data:
+  tls.crt: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURWRENDQWp5Z0F3SUJBZ0lVYnNzbXB1bHZJWlRLWHQzdGNpZTREejNhQkZ3d0RRWUpLb1pJaHZjTkFRRUwKQlFBd0p6RWxNQ01HQTFVRUF3d2NjVzkyWlhKNUxXTnNkWE4wWlhJdFlXZGxiblF0ZDJWaWFHOXZhekFnRncweQpOREEzTURNeE5UVTFNalphR0E4ek1ERXdNREl5TlRFMU5UVXlObG93SnpFbE1DTUdBMVVFQXd3Y2NXOTJaWEo1CkxXTnNkWE4wWlhJdFlXZGxiblF0ZDJWaWFHOXZhekNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0MKQVFvQ2dnRUJBTG5UZCtEMzVCRWZ0SWpUNTdRUjMxS2FaQmlpMUNLOFdOVVJsOFFhM1A5dEtkUEdOUWRiRE9yeApseWxveHIxTWt3SXFaSHkwZXA0cU54UVVZWm1KTUdOK1NpMmtKMEM3VWk5K1hLUHJGelZCbnh6TVNwR2czSFArCndaNmZDenF3OWd3cVBRRVRFbjczbFJDVzJtTUxzbk9jbFJRRmRpdFVkc25DN21wa2FSUUZhZTY2MG9SaTdUV1YKZ1RGZDhqR2c4ZGViTjgyTWNsUTZ3OUQvZzRoVU9OdGV6NjNBNGluZ3U1UUtmNFMrcmhHdXh3V1ZXWFFoWGoyMQo3QTFpWmFQODdMeFRXTStkVnZMR1lrNUJaYTZLMTU1N2FWMHl6OWM1Qm5QVFdFTU9vZEFPbXpIUm0wZ2JZdmVZCkdDTXBJM0R6ZlpIVVo5RTBrYm1qcFkrQWNXTThSOU1DQXdFQUFhTjJNSFF3TWdZRFZSMFJCQ3N3S1lJbmNXOTIKWlhKNUxXTnNkWE4wWlhJdFlXZGxiblF0YzJWeWRtbGpaUzV4YjNabGNua3VjM1pqTUIwR0ExVWREZ1FXQkJRagpVNU91ZlBzeFBZc0VJbUJOekppSXdmV2kwekFmQmdOVkhTTUVHREFXZ0JSOTBUT0g5WUNiTVhUK3FYeVRtdWxLCjA4Z3ZYREFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBczQraUNQeVZSOEM4UGt5UUZWTHZ3dkFVS1ZuSnYwN2QKVzQ0R1QyaWo0OXdKSVpXc1ZhbEhXSE5CajBaSGlPYWFTbkNlaTJ3cEFtUW5SQWJHMjhyZWxBTUZRVTczdUN4UApJa3NiUGsrRTlzUVR1NVpYVFZoeHYwQVpMOWkrWVc5ZnRzQW9YUU42L1VCMkg1ZWZHSU1yaktYcTFRTDYwRVlrCmxMK2xUSnFXcjRPY3BXNStucmljbTMrYlA0QTYyMVlXVS9JZVBUTVlwUEV3UkN3cTBZZFg5ODFIblFlNmlIMTkKaHkwajZLUHY4RlY3L1R6dWVGbk5Va2ZvM1dRWTVxZzNDeTNVb2Z2M1dMdGNjVGFsTnNHT05pMGVMQ2tudTQvSQpqUUh5WWY2K0laa2lnbVdoR0JuQXd5VEtCZWxYVlhkc1FiRDdsL1VjaTA3U0I0NHNOM0ltbVE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg=="
+  tls.key: "LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQzUwM2ZnOStRUkg3U0kKMCtlMEVkOVNtbVFZb3RRaXZGalZFWmZFR3R6L2JTblR4alVIV3d6cThaY3BhTWE5VEpNQ0ttUjh0SHFlS2pjVQpGR0daaVRCamZrb3RwQ2RBdTFJdmZseWo2eGMxUVo4Y3pFcVJvTnh6L3NHZW53czZzUFlNS2owQkV4Sis5NVVRCmx0cGpDN0p6bkpVVUJYWXJWSGJKd3U1cVpHa1VCV251dXRLRVl1MDFsWUV4WGZJeG9QSFhtemZOakhKVU9zUFEKLzRPSVZEamJYcyt0d09JcDRMdVVDbitFdnE0UnJzY0ZsVmwwSVY0OXRld05ZbVdqL095OFUxalBuVmJ5eG1KTwpRV1d1aXRlZWUybGRNcy9YT1FaejAxaEREcUhRRHBzeDBadElHMkwzbUJnaktTTnc4MzJSMUdmUk5KRzVvNldQCmdIRmpQRWZUQWdNQkFBRUNnZ0VBQmxXdHRDdDduaFFMWkFqdFFwZW5LRWgvVHdyTkV2TmwzU3l5ZUJrTWoyQVoKMlVJeGZwYVdWNWNmTnA4cVVRTE9zbHRzdHFNa1p2RjFQdjAxL1RWYzBVSWdpZVNwT2xmTDltK2YvWU5weWVhbApWVjl1WFkyazFqL2xrRVB5SjM4TFNZdUxFWUhBMDFQaC9SM0pKOXFNajFwaDZ4RWtKdVkxNG5QL2ZWSWJMdWttClZSMzk4UlhhdEU2V0VISm9aeWdabWpKdWliRUZUSEs5dWpuaXhKTUpVZFVheXJxc3JxWEZlbFo4bTZyUUpCME4KRkdQdExsS09lYXc4WGZhWnVNdUtVSGtUTnQxVDYwNE5UNFlWc2FkZHpjYW5RZHdXV3NSOCt6cU5RZ0NRV2ZDMwpXN0Jsemw0VGFoZnQwd21yai90aXpEZTVVN2NHR0Q5ampJM0h0OWc4VVFLQmdRRG1GN0hrQ0x1MXZuWXkxVm43CnJURjVObkZCZjlGTEFBbzFYNzU5eEErR0o0N29JTnZseVNlQlNqYkoyZUQ3LzgyblpDaU0vdlNCWTI4Y2NEcU0KcExTbk1PMkNmOVNZTFlmaWJvU2pCUXdGVktERzNPdWVndDdrK3lzVDdweER2ZTVBQVYyVXZ4cDJQU05JVVFMUgpab1l6Q0hLOHY0S3RGWDlwdStqSkJta3gyUUtCZ1FET3Y5QWRldk5xWmx2N1hvVS9PbVNQNkZnT2RHSjlhMGZmCnMzZEdGaHNhTndRNWd3WlZuZXkydXVQaXBPK0VTQnVoUVJVRjg2dlBYbWNydnBTZ2NxRHNpTTZLdERPN0JMcUcKMHNHbVk1cG84UGluR2llRVJOWlNJN20zcmxEcklod2lHcDdjelM4RGY3K1lkMnFpZUQ3T2pFME9ldlhKNHNjbQpFd1hzUGJhUGl3S0JnQnJaQXZISHJ4ZHF6T0hya1I5VHV5VVluQ2gzWUpWdXdNSXZsTXVaOS9IQVplVmlDQ2FNCnpTWkI0WmkxNnBHYzdJTXVwYWltQ3lPWjFab3M0amdNOCtOYVN5eGgvQTF4cXB4YUp2SGFvZWR4VTMxQXcrRncKQmRBVUdwZXR6Ti8rcG5FamQ2Ym1rWkRnVzJDUnkxRmh0Q0Q2U0dFTHU1UzBvSFJXNzdlZEh1TXBBb0dCQUxFNApxSHRzdGhUQmN4MHdzNFUwVjVrbnI3dU1OaFNPRGtrSi9EYWVvbExCVUNUQVZJQzFZNEJyQ1FaeEhVTEYwTEZVCktXSTFzbE9KOTJQKzlFWG9uRnJGRms2OUV3Ni9pZWdoNW83ckdDUFdVejVoNC9lMFRnYVF5eFJSSHRtL0htQjUKY3kyUDBEbnVtbHhtR0lqMkM5aGZXWG9OR24wWW9GN1p0WjBBZFduckFvR0FWeTFnODU2ajl5N3NoWHRrL1RMbApJay9xR0xVMnVPcytkZjBhaGc5d2xpaHVyZUFJVGVEak83SDRjYXpMRUVvKzJDaFNQa0lQZmYrSGp6Mkt0QkQ3CitYYTlFazlPWVpxRnRETkpiZFdWWnBTazRENmw4VFN1VDdDeEZuMkNhOGlHelQ2SnFqdy9EWFE5NnJSTEYzWWIKZnU3TDJOMFFMdjBkbXZ5bmNqTFFTRnc9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K"
+{{- end}}
diff --git a/charts/qovery/charts/qovery-cluster-agent/values.yaml b/charts/qovery/charts/qovery-cluster-agent/values.yaml
@@ -82,3 +82,6 @@ rbac:
   create: true
   clusterRole: true
   apiVersion: v1
+
+# Either we rely on cert-manager, or we use a self signed certificate
+useSelfSignCertificate: false
diff --git a/charts/qovery/values-aws.yaml b/charts/qovery/values-aws.yaml
@@ -57,16 +57,17 @@ qovery:
   shellAgentVersion: &shellAgentVersion set-by-customer
   clusterAgentVersion: &clusterAgentVersion set-by-customer
 qovery-cluster-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *clusterAgentVersion
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
+  useSelfSignCertificate: true
 qovery-shell-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *shellAgentVersion
   environmentVariables:
@@ -167,7 +168,21 @@ ingress-nginx:
         topologyKey: kubernetes.io/hostname
         maxSkew: 1
         whenUnsatisfiable: DoNotSchedule
-
+    {%- if enable_karpenter %}
+    tolerations:
+      - effect: NoSchedule
+        key: nodepool/stable
+        operator: Exists
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+              - key: karpenter.sh/nodepool
+                operator: In
+                values:
+                  - stable
+    {%- endif %}
 external-dns:
   # set the provider to use
   provider: set-by-customer

diff --git a/charts/qovery/values-demo-aws.yaml b/charts/qovery/values-demo-aws.yaml
@@ -57,16 +57,17 @@ qovery:
   shellAgentVersion: &shellAgentVersion set-by-customer
   clusterAgentVersion: &clusterAgentVersion set-by-customer
 qovery-cluster-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *clusterAgentVersion
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
+  useSelfSignCertificate: true
 qovery-shell-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *shellAgentVersion
   environmentVariables:
@@ -167,7 +168,21 @@ ingress-nginx:
         topologyKey: kubernetes.io/hostname
         maxSkew: 1
         whenUnsatisfiable: DoNotSchedule
-
+    {%- if enable_karpenter %}
+    tolerations:
+      - effect: NoSchedule
+        key: nodepool/stable
+        operator: Exists
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+              - key: karpenter.sh/nodepool
+                operator: In
+                values:
+                  - stable
+    {%- endif %}
 external-dns:
   fullnameOverride: external-dns
   provider: pdns

diff --git a/charts/qovery/values-demo-gcp.yaml b/charts/qovery/values-demo-gcp.yaml
@@ -55,16 +55,17 @@ qovery:
   shellAgentVersion: &shellAgentVersion set-by-customer
   clusterAgentVersion: &clusterAgentVersion set-by-customer
 qovery-cluster-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *clusterAgentVersion
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
+  useSelfSignCertificate: true
 qovery-shell-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *shellAgentVersion
   environmentVariables:

diff --git a/charts/qovery/values-demo-local.yaml b/charts/qovery/values-demo-local.yaml
@@ -57,16 +57,17 @@ qovery:
   shellAgentVersion: &shellAgentVersion set-by-customer
   clusterAgentVersion: &clusterAgentVersion set-by-customer
 qovery-cluster-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *clusterAgentVersion
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     LOKI_URL: ''
     ORGANIZATION_ID: *organizationId
+  useSelfSignCertificate: true
 qovery-shell-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *shellAgentVersion
   environmentVariables:

diff --git a/charts/qovery/values-demo-scaleway.yaml b/charts/qovery/values-demo-scaleway.yaml
@@ -55,16 +55,17 @@ qovery:
   shellAgentVersion: &shellAgentVersion set-by-customer
   clusterAgentVersion: &clusterAgentVersion set-by-customer
 qovery-cluster-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *clusterAgentVersion
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
+  useSelfSignCertificate: true
 qovery-shell-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *shellAgentVersion
   environmentVariables:

diff --git a/charts/qovery/values-gcp.yaml b/charts/qovery/values-gcp.yaml
@@ -55,16 +55,17 @@ qovery:
   shellAgentVersion: &shellAgentVersion set-by-customer
   clusterAgentVersion: &clusterAgentVersion set-by-customer
 qovery-cluster-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *clusterAgentVersion
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
+  useSelfSignCertificate: true
 qovery-shell-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *shellAgentVersion
   environmentVariables:

diff --git a/charts/qovery/values-scaleway.yaml b/charts/qovery/values-scaleway.yaml
@@ -55,16 +55,17 @@ qovery:
   shellAgentVersion: &shellAgentVersion set-by-customer
   clusterAgentVersion: &clusterAgentVersion set-by-customer
 qovery-cluster-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *clusterAgentVersion
   environmentVariables:
     CLUSTER_ID: *clusterId
     CLUSTER_JWT_TOKEN: *jwtToken
     LOKI_URL: *lokiUrl
     ORGANIZATION_ID: *organizationId
+  useSelfSignCertificate: true
 qovery-shell-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: *shellAgentVersion
   environmentVariables:

diff --git a/charts/qovery/values.yaml b/charts/qovery/values.yaml
@@ -57,16 +57,17 @@ qovery:
   shellAgentVersion: '&shellAgentVersion set-by-customer'
   clusterAgentVersion: '&clusterAgentVersion set-by-customer'
 qovery-cluster-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: '*clusterAgentVersion'
   environmentVariables:
     CLUSTER_ID: '*clusterId'
     CLUSTER_JWT_TOKEN: '*jwtToken'
     LOKI_URL: '*lokiUrl'
     ORGANIZATION_ID: '*organizationId'
+  useSelfSignCertificate: true
 qovery-shell-agent:
-  fullNameOverride: qovery-shell-agent
+  fullnameOverride: qovery-shell-agent
   image:
     tag: '*shellAgentVersion'
   environmentVariables: