Skip to content

Commit ffbf154

Browse files
committed
chore(dns): bump etcd version
On-behalf-of: @SAP christopher.junk@sap.com Signed-off-by: Christopher Junk <christopher.junk@sap.com>
1 parent c3e2d17 commit ffbf154

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

‎pkg/setup/dns/cluster.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
name: cluster-admin
4242
`
4343

44-
type ClusterRequest struct {
44+
type clusterRequest struct {
4545
Name string
4646
Namespace string
4747
Purpose string
@@ -53,7 +53,7 @@ type accessRequest struct {
5353
RequestName string
5454
}
5555

56-
func createCluster(ctx context.Context, config *envconf.Config, cr ClusterRequest) error {
56+
func createCluster(ctx context.Context, config *envconf.Config, cr clusterRequest) error {
5757
klog.Info("create dns cluster")
5858
crObj, err := resources.CreateObjectFromTemplate(ctx, config, clusterRequestTemplate, cr)
5959
if err != nil {

‎pkg/setup/dns/deployer.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ import (
99
corev1 "k8s.io/api/core/v1"
1010
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1111
"k8s.io/apimachinery/pkg/runtime/schema"
12-
"k8s.io/apimachinery/pkg/util/runtime"
1312
"k8s.io/klog/v2"
1413
"sigs.k8s.io/e2e-framework/klient/wait"
1514
"sigs.k8s.io/e2e-framework/pkg/envconf"
1615
"sigs.k8s.io/e2e-framework/pkg/features"
17-
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
18-
gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
1916

2017
"github.com/openmcp-project/openmcp-testing/internal"
2118
"github.com/openmcp-project/openmcp-testing/pkg/clusterutils"
@@ -29,7 +26,7 @@ const (
2926
defaultDNSClusterName = "dns"
3027
defaultDNSClusterPurpose = "dns"
3128
defaultDNSZone = "open-control-plane.dev"
32-
defaultEtcdVersion = "v3.5.15"
29+
defaultEtcdVersion = "v3.7.1"
3330
defaultExternalDNSChartVersion = "v0.21.0"
3431
defaultNamespace = "openmcp-system"
3532
defaultPlatformServiceDNSVersion = "v0.1.0"
@@ -160,10 +157,8 @@ func CreateExternalService(opts ...Option) features.Func {
160157
// Deploy deploys CoreDNS + etcd to a dedicated "dns" cluster together with platform service DNS to resemble a production like external DNS service.
161158
func (d *Deployer) Deploy(ctx context.Context, c *envconf.Config) error {
162159
klog.Info("deploy dns service...")
163-
runtime.Must(gatewayv1.Install(c.Client().Resources().GetScheme()))
164-
runtime.Must(gatewayv1alpha2.Install(c.Client().Resources().GetScheme()))
165160
// create dns cluster
166-
if err := createCluster(ctx, c, ClusterRequest{
161+
if err := createCluster(ctx, c, clusterRequest{
167162
Name: d.clusterName,
168163
Namespace: d.namespace,
169164
Purpose: d.clusterPurpose,
@@ -206,7 +201,6 @@ func (d *Deployer) Deploy(ctx context.Context, c *envconf.Config) error {
206201
if err != nil {
207202
return fmt.Errorf("failed to retrieve etcd IP: %w", err)
208203
}
209-
210204
if err := d.createPlatformServiceDNS(ctx, c, etcdIP); err != nil {
211205
return fmt.Errorf("failed to create platform service dns config: %w", err)
212206
}

0 commit comments

Comments
 (0)