Merge branch 'feat/v1.29.2' into feat/certificates-renewal

sighupio · Aug 1, 2024 · af5e8aa · af5e8aa
2 parents 2c5a43f + eb81a59
commit af5e8aa
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/defaults/ekscluster-kfd-v1alpha2.yaml b/defaults/ekscluster-kfd-v1alpha2.yaml
@@ -201,6 +201,11 @@ data:
       overrides:
         nodeSelector: null
         tolerations: null
+        ingresses:
+          hubble:
+            disableAuth: false
+            host: ""
+            ingressClass: ""
       cilium:
         podCidr: "dummy" # cilium not used yet on EKS
         maskSize: "dummy" # cilium not used yet on EKS

diff --git a/templates/distribution/manifests/dr/patches/infra-nodes.yml.tpl b/templates/distribution/manifests/dr/patches/infra-nodes.yml.tpl
@@ -31,8 +31,6 @@ spec:
       tolerations:
         {{ template "tolerations" $veleroArgs }}
 
-{{- end }}
-
 {{- if eq .spec.distribution.modules.dr.velero.backend "minio" }}
 ---
 apiVersion: apps/v1
@@ -63,3 +61,4 @@ spec:
         {{ template "tolerations" $veleroArgs }}
 
 {{- end }}
+{{- end }}
diff --git a/templates/distribution/terraform/cluster-autoscaler.tf.tpl b/templates/distribution/terraform/cluster-autoscaler.tf.tpl
@@ -6,7 +6,8 @@ module "cluster_autoscaler_iam_role" {
   source       = "{{ print .spec.distribution.common.relativeVendorPath "/modules/aws/modules/iam-for-cluster-autoscaler" }}"
   cluster_name = "{{ .metadata.name }}"
   region       = "{{ .spec.toolsConfiguration.terraform.state.s3.region }}"
-  {{- if and (hasKeyAny .spec.distribution.modules.aws "clusterAutoscaler")
+  {{- if and (hasKeyAny .spec.distribution.modules "aws")
+   (hasKeyAny .spec.distribution.modules.aws "clusterAutoscaler")
    (hasKeyAny .spec.distribution.modules.aws.clusterAutoscaler "overrides")
    (hasKeyAny .spec.distribution.modules.aws.clusterAutoscaler.overrides "iamRoleName") }}
   autoscaler_iam_role_name_override = "{{ .spec.distribution.modules.aws.clusterAutoscaler.overrides.iamRoleName }}"

diff --git a/templates/distribution/terraform/ebs-csi-driver.tf.tpl b/templates/distribution/terraform/ebs-csi-driver.tf.tpl
@@ -5,7 +5,8 @@
 module "ebs_csi_driver_iam_role" {
   source       = "{{ print .spec.distribution.common.relativeVendorPath "/modules/aws/modules/iam-for-ebs-csi-driver" }}"
   cluster_name = "{{ .metadata.name }}"
-  {{- if and (hasKeyAny .spec.distribution.modules.aws "ebsCsiDriver")
+  {{- if and (hasKeyAny .spec.distribution.modules "aws")
+   (hasKeyAny .spec.distribution.modules.aws "ebsCsiDriver")
    (hasKeyAny .spec.distribution.modules.aws.ebsCsiDriver "overrides")
    (hasKeyAny .spec.distribution.modules.aws.ebsCsiDriver.overrides "iamRoleName") }}
   ebs_iam_role_name_override = "{{ .spec.distribution.modules.aws.ebsCsiDriver.overrides.iamRoleName }}"

diff --git a/templates/distribution/terraform/load-balancer-controller.tf.tpl b/templates/distribution/terraform/load-balancer-controller.tf.tpl
@@ -5,7 +5,8 @@
 module "load_balancer_controller_iam_role" {
   source       = "{{ print .spec.distribution.common.relativeVendorPath "/modules/aws/modules/iam-for-load-balancer-controller" }}"
   cluster_name = "{{ .metadata.name }}"
-  {{- if and (hasKeyAny .spec.distribution.modules.aws "loadBalancerController")
+  {{- if and (hasKeyAny .spec.distribution.modules "aws")
+   (hasKeyAny .spec.distribution.modules.aws "loadBalancerController")
    (hasKeyAny .spec.distribution.modules.aws.loadBalancerController "overrides")
    (hasKeyAny .spec.distribution.modules.aws.loadBalancerController.overrides "iamRoleName") }}
   lb_iam_role_name_override = "{{ .spec.distribution.modules.aws.loadBalancerController.overrides.iamRoleName }}"

diff --git a/tests/e2e/kfddistribution/furyctl-7-migrate-from-basicAuth-to-sso.yaml b/tests/e2e/kfddistribution/furyctl-7-migrate-from-basicAuth-to-sso.yaml
@@ -83,6 +83,7 @@ spec:
             COOKIE_SECRET: "qKjzogH4/syhMfKipwByMrG6eVm9lXL7rF4TtTChKJU="
             IDP_CLIENT_SECRET: "iebee2Xohs7giongaihuch8iu5shie0O"
             SHARED_SECRET: "LEjtmaKtiCB2qA5rtFSHWiWAzkdFftADf/q2xWT64dg="
+            SIGNING_KEY: "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU9DMHBBQmx4ZS84bjRQcHBBVUE1QnRxam96Z3dDZVpvRDI2c056TGRiS1hvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFRUpDc253MHlXODRLZXhVSjQ5M21MMG9tNFN5dzJBeGtWOGFpRkxDZFdKaVBYamtUMDE1QwowclJsV2tqNVdlQUhqYmVncmRNL2QyejZTbzY3MWs3TVpRPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
         baseDomain: fury.sighup.cc
 
         dex: