Merge pull request #132 from SAP/fix_cf_secret_key

fix[113]: fixing the key property for the credentialsSecretRef

Author: mpechkurov

apis/resources/v1alpha1/serviceinstance_types.go

@@ -0,0 +1,42 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: my-credentials
+  namespace: default
+type: Opaque
+stringData:
+  login: |
+    {
+      "username": "admin",
+      "password": "secret"
+    }
+  config: |
+    {
+      "database": {
+        "host": "localhost",
+        "port": 5432
+      }
+    }
+
+---
+# UPS with service credentials from a secret ref
+apiVersion: cloudfoundry.crossplane.io/v1alpha1
+kind: ServiceInstance
+metadata:
+  name: my-ups
+spec:
+  forProvider:
+    type: user-provided
+    name: my-ups
+    routeServiceUrl: https://my-route-service.example.com
+    syslogDrainUrl: syslog-tls://example.log-aggregator.com:6514
+    spaceRef: 
+      name: my-space
+      policy:
+        resolve: Always
+    credentialsSecretRef: 
+        key: login
+        name: my-credentials
+        namespace: default
+

apis/resources/v1alpha1/zz_generated.deepcopy.go

@@ -0,0 +1,41 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: my-credentials
+  namespace: default
+type: Opaque
+stringData:
+  login: |
+    {
+      "username": "admin",
+      "password": "secret"
+    }
+  config: |
+    {
+      "database": {
+        "host": "localhost",
+        "port": 5432
+      }
+    }
+
+---
+# UPS with service credentials from a secret ref
+apiVersion: cloudfoundry.crossplane.io/v1alpha1
+kind: ServiceInstance
+metadata:
+  name: my-ups
+spec:
+  forProvider:
+    type: user-provided
+    name: my-ups
+    routeServiceUrl: https://my-route-service.example.com
+    syslogDrainUrl: syslog-tls://example.log-aggregator.com:6514
+    spaceRef: 
+      name: my-space
+      policy:
+        resolve: Always
+    credentialsSecretRef: 
+        name: my-credentials
+        namespace: default
+

examples/serviceinstance/ups-dynatrace-stringdata-key.yaml

@@ -309,7 +309,9 @@ func extractCredentialSpec(ctx context.Context, kube k8s.Client, spec v1alpha1.S
 			return []byte(*spec.JSONParams), nil
 		}
 
-		return clients.ExtractSecret(ctx, kube, spec.ParametersSecretRef, "")
+		if spec.ParametersSecretRef != nil {
+			return clients.ExtractSecret(ctx, kube, spec.ParametersSecretRef.SecretReference, spec.ParametersSecretRef.Key)
+		}
 	}
 
 	if spec.Type == v1alpha1.UserProvidedService {
@@ -320,7 +322,9 @@ func extractCredentialSpec(ctx context.Context, kube k8s.Client, spec v1alpha1.S
 		if spec.JSONCredentials != nil {
 			return []byte(*spec.JSONCredentials), nil
 		}
-		return clients.ExtractSecret(ctx, kube, spec.CredentialsSecretRef, "")
+		if spec.CredentialsSecretRef != nil {
+			return clients.ExtractSecret(ctx, kube, spec.CredentialsSecretRef.SecretReference, spec.CredentialsSecretRef.Key)
+		}
 	}
 	return nil, nil
 }

examples/serviceinstance/ups-dynatrace-stringdata.yaml

@@ -97,6 +97,9 @@ spec:
                       Secret reference. Ignored if `credentials` or `jsonCredentials`
                       is set.
                     properties:
+                      key:
+                        description: The key to select.
+                        type: string
                       name:
                         description: Name of the secret.
                         type: string
@@ -145,6 +148,9 @@ spec:
                       Secret reference. Ignored if `parameters` or `jsonParams` is
                       set.
                     properties:
+                      key:
+                        description: The key to select.
+                        type: string
                       name:
                         description: Name of the secret.
                         type: string