Merge pull request #8 from kloeckner-i/METAL-1656_publicip_spec_for_g…

…eneral_instance

include generic instance public ip into instance info

integration/mysql/templates/instance.yaml

@@ -10,6 +10,7 @@ spec:
   generic:
     host: {{ .Values.mysql.serviceName }}.{{ .Release.Namespace }}
     port: 3306
+    publicIp: "1.2.3.4"
 ---
 apiVersion: v1
 kind: Secret

pkg/apis/kci/v1alpha1/dbinstance_types.go

@@ -41,8 +41,9 @@ type GoogleInstance struct {
 // and describes necessary informations to use instance
 // generic instance can be any backend, it must be reachable by described address and port
 type GenericInstance struct {
-	Host string `json:"host"`
-	Port int32  `json:"port"`
+	Host     string `json:"host"`
+	Port     int32  `json:"port"`
+	PublicIP string `json:"publicIp,omitempty"`
 }
 
 // DbInstanceBackup defines name of google bucket to use for storing database dumps for backup when backup is enabled

pkg/controller/dbinstance/reconcileDbInstance.go

@@ -46,6 +46,7 @@ func (r *ReconcileDbInstance) create(dbin *kciv1alpha1.DbInstance) error {
 		instance = &dbinstance.Generic{
 			Host:     dbin.Spec.Generic.Host,
 			Port:     dbin.Spec.Generic.Port,
+			PublicIP: dbin.Spec.Generic.PublicIP,
 			Engine:   dbin.Spec.Engine,
 			User:     cred.Username,
 			Password: cred.Password,