Merge pull request #80 from replicatedhq/additional-ports

Add port mapping to application crd

Author: marccampbell

kotskinds/apis/kots/v1beta1/application_types.go

@@ -20,10 +20,18 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+type ApplicationPort struct {
+	ServiceName    string `json:"serviceName"`
+	ServicePort    int    `json:"servicePort"`
+	LocalPort      int    `json:"localPort,omitempty"`
+	ApplicationURL string `json:"applicationUrl,omitempty"`
+}
+
 // ApplicationSpec defines the desired state of ApplicationSpec
 type ApplicationSpec struct {
-	Title string `json:"title"`
-	Icon  string `json:"icon,omitempty"`
+	Title            string            `json:"title"`
+	Icon             string            `json:"icon,omitempty"`
+	ApplicationPorts []ApplicationPort `json:"ports,omitempty"`
 }
 
 // ApplicationStatus defines the observed state of Application

kotskinds/apis/kots/v1beta1/zz_generated.deepcopy.go

@@ -29,7 +29,7 @@ func (in *Application) DeepCopyInto(out *Application) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
+	in.Spec.DeepCopyInto(&out.Spec)
 	out.Status = in.Status
 }
 
@@ -83,9 +83,29 @@ func (in *ApplicationList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationPort) DeepCopyInto(out *ApplicationPort) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationPort.
+func (in *ApplicationPort) DeepCopy() *ApplicationPort {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationPort)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) {
 	*out = *in
+	if in.ApplicationPorts != nil {
+		in, out := &in.ApplicationPorts, &out.ApplicationPorts
+		*out = make([]ApplicationPort, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationSpec.

pkg/base/base.go

@@ -39,6 +39,11 @@ func (f BaseFile) ShouldBeIncludedInBaseKustomization(excludeKotsKinds bool) boo
 		if o.APIVersion == "troubleshoot.replicated.com/v1beta1" {
 			return false
 		}
+
+		// In addition to kotskinds, we exclude the application crd for now
+		if o.APIVersion == "app.k8s.io/v1beta1" {
+			return false
+		}
 	}
 
 	return true
@@ -65,6 +70,10 @@ func (f BaseFile) ShouldBeIncludedInBaseFilesystem(excludeKotsKinds bool) bool {
 		if o.APIVersion == "troubleshoot.replicated.com/v1beta1" {
 			return false
 		}
+
+		if o.APIVersion == "app.k8s.io/v1beta1" {
+			return false
+		}
 	}
 
 	return true

pkg/upstream/replicated.go

@@ -28,10 +28,10 @@ import (
 const DefaultMetadata = `apiVersion: kots.io/v1beta1
 kind: Application
 metadata:
-  name: "Application"
+  name: "default-application"
 spec:
-  title: "Application"
-  icon: https://cdn1.iconfinder.com/data/icons/ninja-things-1/1772/ninja-simple-512.png`
+  title: "the application"
+  icon: https://cdn2.iconfinder.com/data/icons/mixd/512/16_kubernetes-512.png`
 
 type ReplicatedUpstream struct {
 	Channel      *string