diff --git a/spring-cloud-kubernetes-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-kubernetes-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 00000000..a56a2ec8
--- /dev/null
+++ b/spring-cloud-kubernetes-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,124 @@
+{
+	"properties": [
+		{
+			"name": "spring.cloud.kubernetes.client.trustCerts",
+			"type": "java.lang.Boolean",
+			"description": "Kubernetes API Trust Certificates",
+			"defaultValue": false
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.masterUrl",
+			"type": "java.lang.String",
+			"description": "Kubernetes API Master Node URL",
+			"defaultValue": "https://kubernetes.default.svc"
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.apiVersion",
+			"type": "java.lang.String",
+			"description": "Kubernetes API Version",
+			"defaultValue": "v1"
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.namespace",
+			"type": "java.lang.String",
+			"description": "Kubernetes Namespace",
+			"defaultValue": true
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.username",
+			"type": "java.lang.String",
+			"description": "Kubernetes API Username",
+			"defaultValue": ""
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.password",
+			"type": "java.lang.String",
+			"description": "Kubernetes API Password",
+			"defaultValue": ""
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.caCertFile",
+			"type": "java.lang.String",
+			"description": "Kubernetes API CACertFile",
+			"defaultValue": ""
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.caCertData",
+			"type": "java.lang.String",
+			"description": "Kubernetes API CACertData",
+			"defaultValue": ""
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.clientCertFile",
+			"type": "java.lang.String",
+			"description": "Kubernetes API ClientCertFile",
+			"defaultValue": ""
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.clientCertData",
+			"type": "java.lang.String",
+			"description": "Kubernetes API ClientCertData",
+			"defaultValue": ""
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.clientKeyFile",
+			"type": "java.lang.String",
+			"description": "Kubernetes API ClientKeyFile",
+			"defaultValue": ""
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.clientKeyData",
+			"type": "java.lang.String",
+			"description": "Kubernetes API ClientKeyData",
+			"defaultValue": ""
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.clientKeyAlgo",
+			"type": "java.lang.String",
+			"description": "Kubernetes API ClientKeyAlgo",
+			"defaultValue": "RSA"
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.clientKeyPassphrase",
+			"type": "java.lang.String",
+			"description": "Kubernetes API ClientKeyPassphrase",
+			"defaultValue": "changeit"
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.watchReconnectInterval",
+			"type": "java.lang.Integer",
+			"description": "Reconnect Interval in milliseconds",
+			"defaultValue": 1000
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.watchReconnectLimit",
+			"type": "java.lang.Integer",
+			"description": "Reconnect Interval limit retries",
+			"defaultValue": -1
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.connectionTimeout",
+			"type": "java.lang.Integer",
+			"description": "Connection timeout in milliseconds",
+			"defaultValue": 10000
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.requestTimeout",
+			"type": "java.lang.Integer",
+			"description": "Request timeout in milliseconds",
+			"defaultValue": 10000
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.rollingTimeout",
+			"type": "java.lang.Long",
+			"description": "Rolling timeout in milliseconds",
+			"defaultValue": 900000
+		},
+		{
+			"name": "spring.cloud.kubernetes.client.loggingInterval",
+			"type": "java.lang.Integer",
+			"description": "Logging interval",
+			"defaultValue": 20000
+		}
+	]
+}