Merge branch 'main' into fix/compute_e2e_tests

ionos-cloud · Oct 4, 2024 · 93e59f9 · 93e59f9
2 parents f20ea20 + 13b490c
commit 93e59f9
Show file tree

Hide file tree

Showing 16 changed files with 681 additions and 18 deletions.
diff --git a/apis/asg/v1alpha1/zz_autoscalinggroup_types.go b/apis/asg/v1alpha1/zz_autoscalinggroup_types.go
diff --git a/apis/asg/v1alpha1/zz_generated.deepcopy.go b/apis/asg/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/asg/v1alpha1/zz_generated.resolvers.go b/apis/asg/v1alpha1/zz_generated.resolvers.go
diff --git a/config/alb/config.go b/config/alb/config.go
@@ -2,6 +2,7 @@ package alb
 
 import (
 	"github.com/crossplane/upjet/pkg/config"
+	"github.com/ionos-cloud/provider-upjet-ionoscloud/config/common"
 )
 
 // Configure configures individual resources by adding custom ResourceConfigurators.
@@ -32,5 +33,6 @@ func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("ionoscloud_target_group", func(r *config.Resource) {
 		r.Kind = "TargetGroup"
 		r.ShortGroup = "alb"
+		r.TerraformCustomDiff = common.IgnoreEmptyDiffForComputed([]string{"http_health_check.#", "health_check.#", "target.#"})
 	})
 }
diff --git a/config/asg/config.go b/config/asg/config.go
@@ -12,11 +12,11 @@ func Configure(p *config.Provider) {
 		r.References["datacenter_id"] = config.Reference{
 			TerraformName: "ionoscloud_datacenter",
 		}
-		r.References["nic[0].target_group"] = config.Reference{
+		r.References["replica_configuration.nic.target_group.target_group_id"] = config.Reference{
 			TerraformName: "ionoscloud_target_group",
 		}
 
-		r.References["nic[*].lan"] = config.Reference{
+		r.References["replica_configuration.nic.lan"] = config.Reference{
 			TerraformName: "ionoscloud_lan",
 		}
 	})

diff --git a/config/mongodb/config.go b/config/mongodb/config.go
@@ -2,6 +2,7 @@ package mongodb
 
 import (
 	"github.com/crossplane/upjet/pkg/config"
+	"github.com/ionos-cloud/provider-upjet-ionoscloud/config/common"
 )
 
 // Configure configures individual resources by adding custom ResourceConfigurators.
@@ -24,6 +25,7 @@ func Configure(p *config.Provider) {
 			r.LateInitializer = config.LateInitializer{
 				IgnoredFields: []string{"template_id", "ram", "storage_size", "cores"},
 			}
+			r.TerraformCustomDiff = common.IgnoreEmptyDiffForComputed([]string{"bi_connector.#"})
 		},
 	)
 

diff --git a/examples/alb/loadbalancer.yaml b/examples/alb/loadbalancer.yaml
@@ -8,7 +8,6 @@ metadata:
   name: example
 spec:
   forProvider:
-    centralLogging: true
     datacenterIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example
@@ -19,8 +18,6 @@ spec:
     listenerLanSelector:
       matchLabels:
         testing.upbound.io/example-name: example_1
-    loggingFormat: '%{+Q}o %{-Q}ci - - [%trg] %r %ST %B "" "" %cp %ms %ft %b %s %TR
-      %Tw %Tc %Tr %Ta %tsc %ac %fc %bc %sc %rc %sq %bq %CC %CS %hrl %hsl'
     name: ALB Example
     targetLanSelector:
       matchLabels:
@@ -59,7 +56,7 @@ spec:
       matchLabels:
         testing.upbound.io/example-name: example
     name: Lan Example
-    public: true
+    public: false
 
 ---
 
@@ -77,4 +74,4 @@ spec:
       matchLabels:
         testing.upbound.io/example-name: example
     name: Lan Example
-    public: true
+    public: false
diff --git a/examples/alb/group.yaml → examples/alb/targetgroup.yaml b/examples/alb/group.yaml → examples/alb/targetgroup.yaml
@@ -1,8 +1,8 @@
 apiVersion: alb.ionoscloud.io/v1alpha1
-kind: Group
+kind: TargetGroup
 metadata:
   annotations:
-    meta.upbound.io/example-id: alb/v1alpha1/group
+    meta.upbound.io/example-id: alb/v1alpha1/targetgroup
   labels:
     testing.upbound.io/example-name: example
   name: example

diff --git a/examples/kafka/cluster.yaml b/examples/kafka/cluster.yaml
@@ -0,0 +1,60 @@
+apiVersion: kafka.ionoscloud.io/v1alpha1
+kind: Kafka
+metadata:
+  annotations:
+    meta.upbound.io/example-id: kafka/v1alpha1/kafka
+  labels:
+    testing.upbound.io/example-name: example
+  name: example
+spec:
+  forProvider:
+    connections:
+      brokerAddresses:
+        - 192.168.1.101/24
+        - 192.168.1.102/24
+        - 192.168.1.103/24
+      datacenterIdSelector:
+        matchLabels:
+          testing.upbound.io/example-name: example
+      lanIdSelector:
+        matchLabels:
+          testing.upbound.io/example-name: example
+    locationSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example
+    name: example-kafka-cluster
+    size: S
+    version: 3.7.0
+
+---
+
+apiVersion: compute.ionoscloud.io/v1alpha1
+kind: Datacenter
+metadata:
+  annotations:
+    meta.upbound.io/example-id: kafka/v1alpha1/kafka
+  labels:
+    testing.upbound.io/example-name: example
+  name: example
+spec:
+  forProvider:
+    location: de/fra
+    name: example-kafka-datacenter
+
+---
+
+apiVersion: compute.ionoscloud.io/v1alpha1
+kind: Lan
+metadata:
+  annotations:
+    meta.upbound.io/example-id: kafka/v1alpha1/kafka
+  labels:
+    testing.upbound.io/example-name: example
+  name: example
+spec:
+  forProvider:
+    datacenterIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example
+    name: example-kafka-lan
+    public: false