Merge pull request #1660 from ibuildthecloud/dev-ports

Make service default a bit more explicit
acorn-io · May 25, 2023 · c44ac8e · c44ac8e
2 parents 000c93c + ff24fa0
commit c44ac8e
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 50 deletions.
diff --git a/pkg/controller/appdefinition/testdata/acorn/labels/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/acorn/labels/expected.yaml.d/service.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   appName: app-name
   appNamespace: app-namespace
-  default: true
+  default: false
   external: app-name.acorn-name
   annotations:
     allacornsa: value

diff --git a/...inition/testdata/computeclass/all-set-overwrite-computeclass/expected.yaml.d/service.yaml b/...inition/testdata/computeclass/all-set-overwrite-computeclass/expected.yaml.d/service.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   appName: app-name
   appNamespace: app-namespace
-  default: true
+  default: false
   labels:
     "acorn.io/app-namespace": "app-namespace"
     "acorn.io/app-name": "app-name"

diff --git a/pkg/controller/appdefinition/testdata/computeclass/all-set/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/computeclass/all-set/expected.yaml.d/service.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   appName: app-name
   appNamespace: app-namespace
-  default: true
+  default: false
   container: oneimage
   labels:
     "acorn.io/app-namespace": "app-namespace"

diff --git a/pkg/controller/appdefinition/testdata/computeclass/container/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/computeclass/container/expected.yaml.d/service.yaml
@@ -10,7 +10,7 @@ metadata:
     "acorn.io/container-name": "oneimage"
     "acorn.io/public-name": "app-name.oneimage"
 spec:
-  default: true
+  default: false
   appName: app-name
   appNamespace: app-namespace
   labels:

diff --git a/...ition/testdata/computeclass/overwrite-acornfile-computeclass/expected.yaml.d/service.yaml b/...ition/testdata/computeclass/overwrite-acornfile-computeclass/expected.yaml.d/service.yaml
@@ -10,7 +10,7 @@ metadata:
     "acorn.io/container-name": "oneimage"
     "acorn.io/public-name": "app-name.oneimage"
 spec:
-  default: true
+  default: false
   appName: app-name
   appNamespace: app-namespace
   labels:

diff --git a/...definition/testdata/computeclass/with-acornfile-computeclass/expected.yaml.d/service.yaml b/...definition/testdata/computeclass/with-acornfile-computeclass/expected.yaml.d/service.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   appName: app-name
   appNamespace: app-namespace
-  default: true
+  default: false
   container: oneimage
   labels:
     "acorn.io/app-namespace": "app-namespace"

diff --git a/pkg/controller/appdefinition/testdata/deployspec/basic/expected.yaml b/pkg/controller/appdefinition/testdata/deployspec/basic/expected.yaml
@@ -145,7 +145,7 @@ spec:
     "acorn.io/app-name": "app-name"
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
-  default: true
+  default: false
   container: oneimage
   type: ClusterIP
   ports:

diff --git a/pkg/controller/appdefinition/testdata/globalenv/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/globalenv/expected.yaml.d/service.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   appName: app-name
   appNamespace: app-namespace
-  default: true
+  default: false
   external: app-name.acorn-name
   labels:
     "acorn.io/app-namespace": "app-namespace"

diff --git a/pkg/controller/appdefinition/testdata/ingress/clusterdomainport/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/ingress/clusterdomainport/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/container-name": "oneimage"
     "acorn.io/managed": "true"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/pkg/controller/appdefinition/testdata/ingress/labels/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/ingress/labels/expected.yaml.d/service.yaml
@@ -28,7 +28,7 @@ spec:
     "cona3": "value"
     "globala1": "value"
     "globala2": "value"
-  default: true
+  default: false
   container: con1
   ports:
     - port: 80

diff --git a/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-1/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-1/expected.yaml.d/service.yaml
@@ -28,7 +28,7 @@ spec:
     "cona3": "value"
     "globala1": "value"
     "globala2": "value"
-  default: true
+  default: false
   container: con1
   ports:
     - port: 80

diff --git a/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-2/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-2/expected.yaml.d/service.yaml
@@ -10,7 +10,7 @@ metadata:
     "acorn.io/managed": "true"
     "acorn.io/public-name": "app-name.con1"
 spec:
-  default: true
+  default: false
   appName: app-name
   appNamespace: app-namespace
   labels:

diff --git a/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/pkg/controller/appdefinition/testdata/memory/all-set/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/memory/all-set/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/pkg/controller/appdefinition/testdata/memory/container/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/memory/container/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/...ler/appdefinition/testdata/memory/overwrite-acornfile-memory/expected.yaml.d/service.yaml b/...ler/appdefinition/testdata/memory/overwrite-acornfile-memory/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/pkg/controller/appdefinition/testdata/memory/sidecar/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/memory/sidecar/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/...ntroller/appdefinition/testdata/memory/with-acornfile-memory/expected.yaml.d/service.yaml b/...ntroller/appdefinition/testdata/memory/with-acornfile-memory/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/pkg/controller/appdefinition/testdata/permissions/both/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/permissions/both/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "twoimage"
   container: twoimage
-  default: true
+  default: false
   type: ClusterIP
   ports:
     - port: 80

diff --git a/...ler/appdefinition/testdata/permissions/bothwithnopermissions/expected.yaml.d/service.yaml b/...ler/appdefinition/testdata/permissions/bothwithnopermissions/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "twoimage"
   container: twoimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/pkg/controller/appdefinition/testdata/permissions/container/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/permissions/container/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/...er/appdefinition/testdata/permissions/containerwithnamespace/expected.yaml.d/service.yaml b/...er/appdefinition/testdata/permissions/containerwithnamespace/expected.yaml.d/service.yaml
@@ -18,7 +18,7 @@ spec:
     "acorn.io/managed": "true"
     "acorn.io/container-name": "oneimage"
   container: oneimage
-  default: true
+  default: false
   ports:
     - port: 80
       targetPort: 81

diff --git a/pkg/controller/appdefinition/testdata/router/expected.yaml.d/service.yaml b/pkg/controller/appdefinition/testdata/router/expected.yaml.d/service.yaml
@@ -56,7 +56,7 @@ spec:
   appName: app-name
   appNamespace: app-namespace
   publishMode: all
-  default: false
+  default: true
   labels:
     acorn.io/app-name: app-name
     acorn.io/app-namespace: app-namespace

diff --git a/pkg/controller/service/testdata/router/expected.yaml.d/service.yaml b/pkg/controller/service/testdata/router/expected.yaml.d/service.yaml
@@ -1,24 +1,3 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: app-name
-  namespace: app-namespace
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/managed: "true"
-    acorn.io/router-name: router-name
-spec:
-  ports:
-    - appProtocol: HTTP
-      name: "80"
-      port: 80
-      protocol: TCP
-      targetPort: 8080
-  type: ExternalName
-  externalName: router-name.app-created-namespace.svc.cluster.local
----
-
 kind: Service
 apiVersion: v1
 metadata:

diff --git a/pkg/controller/service/testdata/router/input.yaml b/pkg/controller/service/testdata/router/input.yaml
@@ -13,7 +13,7 @@ spec:
   publishMode: all
   appName: app-name
   appNamespace: app-namespace
-  default: true
+  default: false
   routes:
   - pathType: exact
     path: /foo

diff --git a/pkg/services/acorn.go b/pkg/services/acorn.go
@@ -284,6 +284,19 @@ func ToAcornServices(ctx context.Context, c kclient.Client, appInstance *v1.AppI
 	if err != nil {
 		return nil, err
 	}
+
+	defaultFound := false
+	for _, obj := range objs {
+		if defaultFound {
+			obj.(*v1.ServiceInstance).Spec.Default = false
+		} else if obj.(*v1.ServiceInstance).Spec.Default {
+			defaultFound = true
+		}
+	}
+	if !defaultFound && len(objs) > 0 {
+		objs[0].(*v1.ServiceInstance).Spec.Default = true
+	}
+
 	result = append(result, objs...)
 	result = append(result, forAcorns(appInstance)...)
 	result = append(result, forContainers(appInstance)...)
@@ -294,11 +307,6 @@ func ToAcornServices(ctx context.Context, c kclient.Client, appInstance *v1.AppI
 	}
 	result = append(result, routers...)
 
-	// determine default before adding linked services
-	if len(result) == 1 {
-		result[0].(*v1.ServiceInstance).Spec.Default = true
-	}
-
 	result = append(result, forLinkedServices(appInstance)...)
 	return
 }