Merge pull request #190 from lmilleri/fix-typo-replicas-config

Fix typo for trustee replicas configuration

Author: lmilleri

README.md

@@ -74,7 +74,7 @@ type KbsConfigSpec struct {
   kbsLocalCertCacheSpec kbsLocalCertCacheSpec `json:"kbsLocalCertCacheSpec,omitempty"`  
 
 	// KbsDeploymentSpec is the struct for trustee deployment options
-	KbsDeploymentSpec KbsDeploymentSpec `json:"KksDeploymentSpec,omitempty"`
+	KbsDeploymentSpec KbsDeploymentSpec `json:"KbsDeploymentSpec,omitempty"`
 }
 
 // IbmSEConfigSpec defines the desired state for IBMSE configuration

api/v1alpha1/kbsconfig_types.go

@@ -141,7 +141,7 @@ type KbsConfigSpec struct {
 	KbsLocalCertCacheSpec KbsLocalCertCacheSpec `json:"kbsLocalCertCacheSpec,omitempty"`
 
 	// KbsDeploymentSpec is the struct for trustee deployment options
-	KbsDeploymentSpec KbsDeploymentSpec `json:"KksDeploymentSpec,omitempty"`
+	KbsDeploymentSpec KbsDeploymentSpec `json:"KbsDeploymentSpec,omitempty"`
 }
 
 // KbsConfigStatus defines the observed state of KbsConfig

bundle/manifests/confidentialcontainers.org_kbsconfigs.yaml

@@ -39,14 +39,7 @@ spec:
           spec:
             description: KbsConfigSpec defines the desired state of KbsConfig
             properties:
-              KbsEnvVars:
-                additionalProperties:
-                  type: string
-                description: |-
-                  KbsEnvVars injects environment variables in the trustee pods
-                  For example, RUST_LOG=debug enables logging with DEBUG severity
-                type: object
-              KksDeploymentSpec:
+              KbsDeploymentSpec:
                 description: KbsDeploymentSpec is the struct for trustee deployment
                   options
                 properties:
@@ -57,6 +50,13 @@ spec:
                     format: int32
                     type: integer
                 type: object
+              KbsEnvVars:
+                additionalProperties:
+                  type: string
+                description: |-
+                  KbsEnvVars injects environment variables in the trustee pods
+                  For example, RUST_LOG=debug enables logging with DEBUG severity
+                type: object
               ibmSEConfigSpec:
                 description: IbmSEConfigSpec is the struct that hosts the IBMSE specific
                   configuration

config/crd/bases/confidentialcontainers.org_kbsconfigs.yaml

@@ -39,14 +39,7 @@ spec:
           spec:
             description: KbsConfigSpec defines the desired state of KbsConfig
             properties:
-              KbsEnvVars:
-                additionalProperties:
-                  type: string
-                description: |-
-                  KbsEnvVars injects environment variables in the trustee pods
-                  For example, RUST_LOG=debug enables logging with DEBUG severity
-                type: object
-              KksDeploymentSpec:
+              KbsDeploymentSpec:
                 description: KbsDeploymentSpec is the struct for trustee deployment
                   options
                 properties:
@@ -57,6 +50,13 @@ spec:
                     format: int32
                     type: integer
                 type: object
+              KbsEnvVars:
+                additionalProperties:
+                  type: string
+                description: |-
+                  KbsEnvVars injects environment variables in the trustee pods
+                  For example, RUST_LOG=debug enables logging with DEBUG severity
+                type: object
               ibmSEConfigSpec:
                 description: IbmSEConfigSpec is the struct that hosts the IBMSE specific
                   configuration

tests/e2e/sample-attester/08-assert.yaml

@@ -4,4 +4,4 @@ metadata:
   name: trustee-deployment
   namespace: trustee-operator-system
 status:
-  readyReplicas: 1
+  readyReplicas: 2

tests/e2e/sample-attester/08-kbsconfig_sample.yaml

@@ -23,3 +23,6 @@ spec:
   kbsLocalCertCacheSpec:
     secretName: vcek-secret
     mountPath: "/etc/kbs/snp/ek"
+  KbsDeploymentSpec:
+    replicas: 2
+