outputResources -> targetKind

Author: sbernauer

deploy/helm/secret-operator/crds/crds.yaml

@@ -392,7 +392,10 @@ spec:
                     - kerberos
                   nullable: true
                   type: string
-                outputResource:
+                secretClassName:
+                  description: The name of the SecretClass that the request concerns.
+                  type: string
+                targetKind:
                   default: ConfigMap
                   description: |-
                     Which Kubernetes resource should be used to output the requested information to.
@@ -404,9 +407,6 @@ spec:
                     - Secret
                     - ConfigMap
                   type: string
-                secretClassName:
-                  description: The name of the SecretClass that the request concerns.
-                  type: string
               required:
                 - secretClassName
               type: object

rust/operator-binary/src/crd.rs

@@ -526,7 +526,7 @@ pub struct TrustStoreSpec {
     ///
     /// Can be either `ConfigMap` or `Secret`, defaults to `ConfigMap`.
     #[serde(default)]
-    pub output_resource: TrustStoreOutputType,
+    pub target_kind: TrustStoreOutputType,
 
     /// The [format](DOCS_BASE_URL_PLACEHOLDER/secret-operator/secretclass#format) that the data should be converted into.
     pub format: Option<SecretFormat>,

rust/operator-binary/src/truststore_controller.rs

@@ -305,7 +305,7 @@ async fn reconcile(
         .context(BuildOwnerReferenceSnafu)?
         .build();
 
-    match truststore.spec.output_resource {
+    match truststore.spec.target_kind {
         TrustStoreOutputType::ConfigMap => {
             let trust_cm = ConfigMap {
                 metadata: trust_metadata,

tests/templates/kuttl/tls-truststore/02-assert.yaml.j2

@@ -4,18 +4,18 @@ kind: TestAssert
 timeout: 5
 ---
 apiVersion: v1
-kind: {{ test_scenario['values']['truststore-output-resource'] }}
+kind: {{ test_scenario['values']['truststore-target-kind'] }}
 metadata:
   name: truststore-pem
 # data is validated in 03-assert.yaml
 ---
 apiVersion: v1
-kind: {{ test_scenario['values']['truststore-output-resource'] }}
+kind: {{ test_scenario['values']['truststore-target-kind'] }}
 metadata:
   name: truststore-pkcs12
 # data is validated in 03-assert.yaml
 ---
-{% if test_scenario['values']['truststore-output-resource'] == 'ConfigMap' %}
+{% if test_scenario['values']['truststore-target-kind'] == 'ConfigMap' %}
 apiVersion: v1
 kind: ConfigMap
 metadata:

tests/templates/kuttl/tls-truststore/02_truststore.yaml.j2

@@ -7,7 +7,7 @@ metadata:
 spec:
   secretClassName: tls-$NAMESPACE
   format: tls-pem
-  outputResource: {{ test_scenario['values']['truststore-output-resource'] }}
+  targetKind: {{ test_scenario['values']['truststore-target-kind'] }}
 ---
 apiVersion: secrets.stackable.tech/v1alpha1
 kind: TrustStore
@@ -16,12 +16,12 @@ metadata:
 spec:
   secretClassName: tls-$NAMESPACE
   format: tls-pkcs12
-  outputResource: {{ test_scenario['values']['truststore-output-resource'] }}
+  targetKind: {{ test_scenario['values']['truststore-target-kind'] }}
 ---
 apiVersion: secrets.stackable.tech/v1alpha1
 kind: TrustStore
 metadata:
   name: truststore-k8ssearch
 spec:
   secretClassName: k8ssearch-$NAMESPACE
-  outputResource: {{ test_scenario['values']['truststore-output-resource'] }}
+  targetKind: {{ test_scenario['values']['truststore-target-kind'] }}

tests/templates/kuttl/tls-truststore/03-assert.yaml.j2

@@ -4,7 +4,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 10
 commands:
-{% if test_scenario['values']['truststore-output-resource'] == 'ConfigMap' %}
+{% if test_scenario['values']['truststore-target-kind'] == 'ConfigMap' %}
   - script: kubectl --namespace=$NAMESPACE get configmap/truststore-pem --output=jsonpath='{.data.ca\.crt}' | openssl x509 -noout
   - script: kubectl --namespace=$NAMESPACE get configmap/truststore-pkcs12 --output=jsonpath='{.binaryData.truststore\.p12}' | base64 --decode | openssl pkcs12 -noout -passin 'pass:' -legacy
 {% else %}

tests/test-definition.yaml

@@ -19,7 +19,7 @@ dimensions:
     values:
       - false
       - true
-  - name: truststore-output-resource
+  - name: truststore-target-kind
     values:
       - ConfigMap
       - Secret
@@ -44,7 +44,7 @@ tests:
   - name: tls-truststore
     dimensions:
       - openshift
-      - truststore-output-resource
+      - truststore-target-kind
   - name: cert-manager-tls
     dimensions:
       - openshift