add TLS cert test

go.mod

@@ -16,7 +16,7 @@ require (
 	cuelang.org/go v0.4.3
 	github.com/AlecAivazis/survey/v2 v2.3.4
 	github.com/Masterminds/sprig v2.22.0+incompatible
-	github.com/acorn-io/baaah v0.0.0-20220519155208-f18a5cb8b58f
+	github.com/acorn-io/baaah v0.0.0-20220524223350-b2d78c8fc733
 	github.com/cheggaaa/pb/v3 v3.0.8
 	github.com/containerd/console v1.0.3
 	github.com/containerd/containerd v1.6.3-0.20220401172941-5ff8fce1fcc6

go.sum

@@ -129,8 +129,8 @@ github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdc
 github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
 github.com/acorn-io/apiserver v0.23.6-ot-1 h1:kC3VGOg6qMpNu2Y1M/pmQJqkFqo9JBV9N5VAlYizNFg=
 github.com/acorn-io/apiserver v0.23.6-ot-1/go.mod h1:o9OQj+ocR0onRxWMDtPTB6b106zDDKx7Q7f9l9LEwvY=
-github.com/acorn-io/baaah v0.0.0-20220519155208-f18a5cb8b58f h1:oeQiqm1QFGGUsVILNQf2E1XMB/RDcGiA0LmGgniMZdE=
-github.com/acorn-io/baaah v0.0.0-20220519155208-f18a5cb8b58f/go.mod h1:9FvNcgPq6o0x8Z8Nfq9EvG6tTvw7yVkagoNcMjvcm10=
+github.com/acorn-io/baaah v0.0.0-20220524223350-b2d78c8fc733 h1:KrDQmbsQ20fSPN0aCWK0GrQJCqHlDXxE3exZq4b4uqU=
+github.com/acorn-io/baaah v0.0.0-20220524223350-b2d78c8fc733/go.mod h1:9FvNcgPq6o0x8Z8Nfq9EvG6tTvw7yVkagoNcMjvcm10=
 github.com/acorn-io/component-base v0.23.6-ot-1 h1:h2KhdnVjqSYf7WuJHvM7J+4SK6tfvi+zfSOg7yBUlro=
 github.com/acorn-io/component-base v0.23.6-ot-1/go.mod h1:3Cpp8qJzRasPHxbe3Ae5r0wOeS2s/yL5/Wuim3zFkPc=
 github.com/acorn-io/etcd/server/v3 v3.5.0-ot-1 h1:ENMjSuyJrdQ2aBAId7otAcyRLYAskXj5ZIN2qz3n3Iw=

pkg/controller/appdefinition/testdata/ingress/existing.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+data:
+  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR6ekNDQXJlZ0F3SUJBZ0lVZWtRUWRTNXluTTUwUVVDZjBMOHVtd1lOUUJRd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1R6RUxNQWtHQTFVRUJoTUNWVk14RGpBTUJnTlZCQWdUQlZSbGJYQmxNUkF3RGdZRFZRUUhFd2RCY21sNgpiMjVoTVE0d0RBWURWUVFLRXdWQlkyOXliakVPTUF3R0ExVUVBeE1GUTBrZ1EwRXdIaGNOTWpJd05USTBNakUwCk5UQXdXaGNOTWpNd05USTBNakUwTlRBd1dqQlNNUXN3Q1FZRFZRUUdFd0pWVXpFT01Bd0dBMVVFQ0JNRlZHVnQKY0dVeEVEQU9CZ05WQkFjVEIwRnlhWHB2Ym1FeERqQU1CZ05WQkFvVEJVRmpiM0p1TVJFd0R3WURWUVFERXdoQgpZMjl5YmlCRFNUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUtaOVNSMURyQmtPCm1LeUVnT1l4a0pnRnFGNWlSS05JWUJmN3hrTHI3cWN6aHQ1YkVxZFRUa3pNL1RlMHc3RGZzeUlYMWFIZ21NdE0KUk53TnBvY013ZmpRTElHbmJWNE1waVNQV204cnRQQTl6NURhNEdPeVkyUGFkSkV1d1NsRUVuV2d2enN1eGJ2SQpLMUQ1aWdKdUp0eHJuZUo3VktablpMTzRQWGhoL0dIVmEvODhwVnM5NlJ0YzIzSDh6emdNK2Fjazk0V0lBUi9XClBVbThTYW50eDJzR2JrRTNxNTYwejBLdmxsT2x0WXVUZUIydUduZUEycm5KWExQK0c4M2s2Y3NLMW9Yb2t4UmIKTTdLMmpwZHRlcmdOczFRRG1HTGVHbHJLR0swZnRmSVk3d2trckg3NEx4c29aSzB3T3VsM3psKzRJYnR4d0JMYwpvZWdXb0pSYzBrY0NBd0VBQWFPQm56Q0JuREFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJCkt3WUJCUVVIQXdFd0RBWURWUjBUQVFIL0JBSXdBREFkQmdOVkhRNEVGZ1FVbWZ1aFpjbEpkcU5PTHBSTHVPVVgKYUZQbHpFTXdId1lEVlIwakJCZ3dGb0FVamEzWTlnQU5vZGJ5WnhyZllpaUZOYjRqTkZNd0p3WURWUjBSQkNBdwpIb0lOWTJreExtRmpiM0p1TG01dmRJSU5ZMmt5TG1GamIzSnVMbTV2ZERBTkJna3Foa2lHOXcwQkFRc0ZBQU9DCkFRRUF0Wno2SEhMc1kzdjlKK0dQbEpickFuRDNFUURwMmdiaklSSmVFcEVlNnd4ZGdjOUxtc0djR3dCSVBpaHQKN2tEanBjNmJNdG5HTmFNUlBabWkrZXhZU3BGZVQyMVFrVVZsUlhwKzlpcG94OW8rNDFJb1B4Mm9xeHBRRGpLbwpxaDJpQ2FUT21PZkpkRGdzbkZZTTh5V1hkU1R4Z0pEandrblRaRmlSVG84c1JPc3FDSklOVGVIclhHaVRiVTUyCkJGUDMyQWp4bk82U1FZYSswNnJlT0hqaUdkc1dwUzllMTJmRzh4T0IzNDY4b2gwRC9NTjhITUE1SlZlWEE4K04KTklqT0NNb1FUZjFYbzRTVnV6bGQxNzlMV0p2SjJSNWdkZGFHZjZMNkovSXE2NlFtTFljckhMUkRRSEdBVWdIVApHbStOZWFaK3EyREJjSGVaQlVoK3FmVTR1UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBcG4xSkhVT3NHUTZZcklTQTVqR1FtQVdvWG1KRW8waGdGL3ZHUXV2dXB6T0czbHNTCnAxTk9UTXo5TjdURHNOK3pJaGZWb2VDWXkweEUzQTJtaHd6QitOQXNnYWR0WGd5bUpJOWFieXUwOEQzUGtOcmcKWTdKalk5cDBrUzdCS1VRU2RhQy9PeTdGdThnclVQbUtBbTRtM0d1ZDRudFVwbWRrczdnOWVHSDhZZFZyL3p5bApXejNwRzF6YmNmelBPQXo1cHlUM2hZZ0JIOVk5U2J4SnFlM0hhd1p1UVRlcm5yVFBRcStXVTZXMWk1TjRIYTRhCmQ0RGF1Y2xjcy80YnplVHB5d3JXaGVpVEZGc3pzcmFPbDIxNnVBMnpWQU9ZWXQ0YVdzb1lyUisxOGhqdkNTU3MKZnZndkd5aGtyVEE2NlhmT1g3Z2h1M0hBRXR5aDZCYWdsRnpTUndJREFRQUJBb0lCQUhwaGNkTXZJVnd4M0l4RAp3alJ6anFRUTFKaThoMU8zS2R1M1dSOXNLanVCcHN2Z0NqQXhEa2RxRDJCWllkZXNPQk1CamltMTNOcmpyMkpLCkxuVHJMZEpsdzdGeWp2UXBQQjkzdUxRclhvK1IvL2VzekhDOGVrNjJFQ1dBUnNDOHB3ME1Ja1d3dGV5NDBRNXUKdjhIVmtuOUlKQUNOUThZbURtSUZOam85WExYVWFoaEhHQVpvSnBsVzR2WkpRelhIMWRjK3dLSGY0cjhjZ0laRgppMmh5TkdzRUEyRFBOemNCNHQzaitEZXNrUzNIOW1PSTVld1V2c1BUdStFWVdMbjhEOTRKOUlNNlZ5QW8vcFRaCjhNS2orTUxTUkFnNGJjMUVZbUM0VVg2dVl2VVpZSmkvY3QyMWtrRFc3ZEtlZU9OdjEwVkV2VkIrMUlES3krMGkKN0t5alZ1RUNnWUVBMW9OMUIxeTUvWEZnV1hZTHZGb3ovY0NKdFJjSnNxUWRxRXRoZG9BYUdVRTJBU3BCL3lHNgpQR3M1UXdsRjhTUmdERXRKRzlOMEU4TXBtaXplTWc0MFI3cDJoZ2lXN0xQWWM4VE84Y0I1SDdNMzFOTGNVL0VaCm9qTEVPOUVYdlJBTThVVmJ0TUQzdXpJbTFJckRBdGI1dnJ6MmF3SFd6VG9TVm1WZDFxR3A4RDhDZ1lFQXhyQW8KMTM2K0xiM3F0dkxWQ2hKUzVBanVwZ1pLMTRHdithTlFVM0h3M0ZDYXhlL0NpcXNUN0NFOUFkbFc4N0pOeWVlaQpJWEZab3FwTS9VN0RMdnFPRjZkcU0rb3daempRWW1SU0dSbk5OeHpocHJiK08yUU9ZUnZSYnRlaHVJV1BHZ09DCjJHZC9QRzNhQUdia1BFMSsrS21YTFVaOXVmKzVqVVJ0QUNka20va0NnWUVBcjhDdTNxUlRZbHBFNWFjNUFFNHIKY01rU1NvT2dsM090Tk5qbDlwQUlVZzdDcjN1dTdOajJYRkJCYnpJbTB1YkpwdWo3OGtkeVFFclRTQlZneTBRbQpBMnE3ZHgrTWdFenRtQlIwdFUvTUxYUEoxNTRYbE5MaC9LbDVhOFRwblNhTVpCVStpTDdkZWNzaVUxdUpZVWMvCkFjNlNXcVA4R05OdWVNaStkSDZwM0VNQ2dZQmFnNllYaGdYZGtNZDgwT044MHh3d0JtR3lBT3ZYZ1oxSmZMejcKUnMwVGtTVHhSMmk1QTNidis3UnZRelA1a1NFZStnZENkUUVBdWRTWkVXaVoza3NkTzRlR1h3bnQvRlB5ZndGbgpyZmx2UWhrS2VoTVh1MTFSbi9xcEpGTG9YTy8wU2VVeDhQUmw4eVY5U1dKd2xsMWhxdURVSDJqbmN6aDB3dGRsCldvemJBUUtCZ1FDMWJEaTVJV1dDODhBcmNVa0hZcmVKdHQyWGQ5dGczY2RKcjJTMkNCT2RKNkt1T2xvMml4c0oKWDBtZ25HbGpLb1JrTjhScWc1anlBK29tOVN6TWlmZzF4dGQ4cHp1VlJ2QVFnMXRua3RJNTFoV1pQOXpvdklESwpBK3lTQVE0dG1zb0lrRW9URXE0Zkxva0ZvSGRpcTl6bi9TamJRamNhUmxiZlFUVFFDQzhNd2c9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+kind: Secret
+metadata:
+  name: test-tls
+  namespace: app-namespace
+  uid: 1234567890abc
+type: kubernetes.io/tls

pkg/controller/appdefinition/testdata/ingress/expected.yaml

@@ -219,7 +219,7 @@ metadata:
     "acorn.io/managed": "true"
   annotations:
     acorn.io/container-name: oneimage
-    acorn.io/hostnames: localhost
+    acorn.io/hostnames: localhost,ci1.acorn.not
     acorn.io/port-number: "81"
 spec:
   rules:
@@ -233,6 +233,16 @@ spec:
                   number: 80
             path: /
             pathType: Prefix
+    - host: ci1.acorn.not
+      http:
+        paths:
+          - backend:
+              service:
+                name: oneimage
+                port:
+                  number: 80
+            path: /
+            pathType: Prefix
     - host: oneimage.app-name.app-namespace.localhost
       http:
         paths:
@@ -243,6 +253,10 @@ spec:
                   number: 80
             path: /
             pathType: Prefix
+  tls:
+  - hosts:
+    - ci1.acorn.not
+    secretName: test-tls-12345678
 ---
 kind: Ingress
 apiVersion: networking.k8s.io/v1
@@ -283,6 +297,8 @@ spec:
   endpoints:
     - target: oneimage
       hostname: localhost
+    - target: oneimage
+      hostname: ci1.acorn.not
 status:
   namespace: app-created-namespace
   appSpec:
@@ -322,3 +338,20 @@ status:
   conditions:
     defined:
       success: true
+---
+apiVersion: v1
+data:
+  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR6ekNDQXJlZ0F3SUJBZ0lVZWtRUWRTNXluTTUwUVVDZjBMOHVtd1lOUUJRd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1R6RUxNQWtHQTFVRUJoTUNWVk14RGpBTUJnTlZCQWdUQlZSbGJYQmxNUkF3RGdZRFZRUUhFd2RCY21sNgpiMjVoTVE0d0RBWURWUVFLRXdWQlkyOXliakVPTUF3R0ExVUVBeE1GUTBrZ1EwRXdIaGNOTWpJd05USTBNakUwCk5UQXdXaGNOTWpNd05USTBNakUwTlRBd1dqQlNNUXN3Q1FZRFZRUUdFd0pWVXpFT01Bd0dBMVVFQ0JNRlZHVnQKY0dVeEVEQU9CZ05WQkFjVEIwRnlhWHB2Ym1FeERqQU1CZ05WQkFvVEJVRmpiM0p1TVJFd0R3WURWUVFERXdoQgpZMjl5YmlCRFNUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUtaOVNSMURyQmtPCm1LeUVnT1l4a0pnRnFGNWlSS05JWUJmN3hrTHI3cWN6aHQ1YkVxZFRUa3pNL1RlMHc3RGZzeUlYMWFIZ21NdE0KUk53TnBvY013ZmpRTElHbmJWNE1waVNQV204cnRQQTl6NURhNEdPeVkyUGFkSkV1d1NsRUVuV2d2enN1eGJ2SQpLMUQ1aWdKdUp0eHJuZUo3VktablpMTzRQWGhoL0dIVmEvODhwVnM5NlJ0YzIzSDh6emdNK2Fjazk0V0lBUi9XClBVbThTYW50eDJzR2JrRTNxNTYwejBLdmxsT2x0WXVUZUIydUduZUEycm5KWExQK0c4M2s2Y3NLMW9Yb2t4UmIKTTdLMmpwZHRlcmdOczFRRG1HTGVHbHJLR0swZnRmSVk3d2trckg3NEx4c29aSzB3T3VsM3psKzRJYnR4d0JMYwpvZWdXb0pSYzBrY0NBd0VBQWFPQm56Q0JuREFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJCkt3WUJCUVVIQXdFd0RBWURWUjBUQVFIL0JBSXdBREFkQmdOVkhRNEVGZ1FVbWZ1aFpjbEpkcU5PTHBSTHVPVVgKYUZQbHpFTXdId1lEVlIwakJCZ3dGb0FVamEzWTlnQU5vZGJ5WnhyZllpaUZOYjRqTkZNd0p3WURWUjBSQkNBdwpIb0lOWTJreExtRmpiM0p1TG01dmRJSU5ZMmt5TG1GamIzSnVMbTV2ZERBTkJna3Foa2lHOXcwQkFRc0ZBQU9DCkFRRUF0Wno2SEhMc1kzdjlKK0dQbEpickFuRDNFUURwMmdiaklSSmVFcEVlNnd4ZGdjOUxtc0djR3dCSVBpaHQKN2tEanBjNmJNdG5HTmFNUlBabWkrZXhZU3BGZVQyMVFrVVZsUlhwKzlpcG94OW8rNDFJb1B4Mm9xeHBRRGpLbwpxaDJpQ2FUT21PZkpkRGdzbkZZTTh5V1hkU1R4Z0pEandrblRaRmlSVG84c1JPc3FDSklOVGVIclhHaVRiVTUyCkJGUDMyQWp4bk82U1FZYSswNnJlT0hqaUdkc1dwUzllMTJmRzh4T0IzNDY4b2gwRC9NTjhITUE1SlZlWEE4K04KTklqT0NNb1FUZjFYbzRTVnV6bGQxNzlMV0p2SjJSNWdkZGFHZjZMNkovSXE2NlFtTFljckhMUkRRSEdBVWdIVApHbStOZWFaK3EyREJjSGVaQlVoK3FmVTR1UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBcG4xSkhVT3NHUTZZcklTQTVqR1FtQVdvWG1KRW8waGdGL3ZHUXV2dXB6T0czbHNTCnAxTk9UTXo5TjdURHNOK3pJaGZWb2VDWXkweEUzQTJtaHd6QitOQXNnYWR0WGd5bUpJOWFieXUwOEQzUGtOcmcKWTdKalk5cDBrUzdCS1VRU2RhQy9PeTdGdThnclVQbUtBbTRtM0d1ZDRudFVwbWRrczdnOWVHSDhZZFZyL3p5bApXejNwRzF6YmNmelBPQXo1cHlUM2hZZ0JIOVk5U2J4SnFlM0hhd1p1UVRlcm5yVFBRcStXVTZXMWk1TjRIYTRhCmQ0RGF1Y2xjcy80YnplVHB5d3JXaGVpVEZGc3pzcmFPbDIxNnVBMnpWQU9ZWXQ0YVdzb1lyUisxOGhqdkNTU3MKZnZndkd5aGtyVEE2NlhmT1g3Z2h1M0hBRXR5aDZCYWdsRnpTUndJREFRQUJBb0lCQUhwaGNkTXZJVnd4M0l4RAp3alJ6anFRUTFKaThoMU8zS2R1M1dSOXNLanVCcHN2Z0NqQXhEa2RxRDJCWllkZXNPQk1CamltMTNOcmpyMkpLCkxuVHJMZEpsdzdGeWp2UXBQQjkzdUxRclhvK1IvL2VzekhDOGVrNjJFQ1dBUnNDOHB3ME1Ja1d3dGV5NDBRNXUKdjhIVmtuOUlKQUNOUThZbURtSUZOam85WExYVWFoaEhHQVpvSnBsVzR2WkpRelhIMWRjK3dLSGY0cjhjZ0laRgppMmh5TkdzRUEyRFBOemNCNHQzaitEZXNrUzNIOW1PSTVld1V2c1BUdStFWVdMbjhEOTRKOUlNNlZ5QW8vcFRaCjhNS2orTUxTUkFnNGJjMUVZbUM0VVg2dVl2VVpZSmkvY3QyMWtrRFc3ZEtlZU9OdjEwVkV2VkIrMUlES3krMGkKN0t5alZ1RUNnWUVBMW9OMUIxeTUvWEZnV1hZTHZGb3ovY0NKdFJjSnNxUWRxRXRoZG9BYUdVRTJBU3BCL3lHNgpQR3M1UXdsRjhTUmdERXRKRzlOMEU4TXBtaXplTWc0MFI3cDJoZ2lXN0xQWWM4VE84Y0I1SDdNMzFOTGNVL0VaCm9qTEVPOUVYdlJBTThVVmJ0TUQzdXpJbTFJckRBdGI1dnJ6MmF3SFd6VG9TVm1WZDFxR3A4RDhDZ1lFQXhyQW8KMTM2K0xiM3F0dkxWQ2hKUzVBanVwZ1pLMTRHdithTlFVM0h3M0ZDYXhlL0NpcXNUN0NFOUFkbFc4N0pOeWVlaQpJWEZab3FwTS9VN0RMdnFPRjZkcU0rb3daempRWW1SU0dSbk5OeHpocHJiK08yUU9ZUnZSYnRlaHVJV1BHZ09DCjJHZC9QRzNhQUdia1BFMSsrS21YTFVaOXVmKzVqVVJ0QUNka20va0NnWUVBcjhDdTNxUlRZbHBFNWFjNUFFNHIKY01rU1NvT2dsM090Tk5qbDlwQUlVZzdDcjN1dTdOajJYRkJCYnpJbTB1YkpwdWo3OGtkeVFFclRTQlZneTBRbQpBMnE3ZHgrTWdFenRtQlIwdFUvTUxYUEoxNTRYbE5MaC9LbDVhOFRwblNhTVpCVStpTDdkZWNzaVUxdUpZVWMvCkFjNlNXcVA4R05OdWVNaStkSDZwM0VNQ2dZQmFnNllYaGdYZGtNZDgwT044MHh3d0JtR3lBT3ZYZ1oxSmZMejcKUnMwVGtTVHhSMmk1QTNidis3UnZRelA1a1NFZStnZENkUUVBdWRTWkVXaVoza3NkTzRlR1h3bnQvRlB5ZndGbgpyZmx2UWhrS2VoTVh1MTFSbi9xcEpGTG9YTy8wU2VVeDhQUmw4eVY5U1dKd2xsMWhxdURVSDJqbmN6aDB3dGRsCldvemJBUUtCZ1FDMWJEaTVJV1dDODhBcmNVa0hZcmVKdHQyWGQ5dGczY2RKcjJTMkNCT2RKNkt1T2xvMml4c0oKWDBtZ25HbGpLb1JrTjhScWc1anlBK29tOVN6TWlmZzF4dGQ4cHp1VlJ2QVFnMXRua3RJNTFoV1pQOXpvdklESwpBK3lTQVE0dG1zb0lrRW9URXE0Zkxva0ZvSGRpcTl6bi9TamJRamNhUmxiZlFUVFFDQzhNd2c9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+kind: Secret
+metadata:
+  name: test-tls-12345678
+  namespace: app-created-namespace
+  labels:
+    acorn.io/app-name: app-name
+    acorn.io/app-namespace: app-namespace
+    acorn.io/app-uid: 1234567890abc
+    acorn.io/managed: "true"
+    acorn.io/secret-generated: "true"
+    acorn.io/secret-name: test-tls
+type: kubernetes.io/tls

pkg/controller/appdefinition/testdata/ingress/input.yaml

@@ -10,6 +10,8 @@ spec:
   endpoints:
   - target: oneimage
     hostname: localhost
+  - target: oneimage
+    hostname: ci1.acorn.not
 status:
   namespace: app-created-namespace
   appSpec:
@@ -45,4 +47,4 @@ status:
         image: "sha256:build-image"
         build:
           dockerfile: "custom-dockerfile"
-          context: "."
+          context: "."