Merge branch 'main' into release-please--branches--main

validator-labs · Sep 10, 2024 · f1ab838 · f1ab838
2 parents 753f92c + e6968ba
commit f1ab838
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 39 deletions.
diff --git a/...ig/samples/vsphere-validator-compute.yaml → .../vsphere-validator-compute-resources.yaml b/...ig/samples/vsphere-validator-compute.yaml → .../vsphere-validator-compute-resources.yaml
@@ -10,6 +10,8 @@ metadata:
   name: vspherevalidator-compute
   namespace: validator
 spec:
+  auth:
+    secretName: vsphere-creds
   datacenter: "Datacenter"
   computeResourceRules:
    - name: "rp-cluster2-palette-advanced-projects check resources"
@@ -26,6 +28,4 @@ spec:
          numberOfNodes: 2
          cpu: "2GHz"
          memory: 8Gi
-         diskSpace: 100Gi
-  auth:
-    secretName: vsphere-creds
+         diskSpace: 100Gi
diff --git a/config/samples/vsphere-validator-explicit-auth.yaml b/config/samples/vsphere-validator-explicit-auth.yaml
@@ -10,13 +10,13 @@ metadata:
   name: vspherevalidator-explicit-auth
   namespace: validator
 spec:
-  datacenter: "Datacenter"
   auth:
-    cloudAccount:
+    account:
       insecure: true
       username: "user@vsphere.local"
       password: "password"
-      vcenterServer: "vcenter.example.com"
+      host: "vcenter.example.com"
+  datacenter: "Datacenter"
   tagValidationRules:
     - name: "Folder tag validation"
       clusterName: "Cluster2"

diff --git a/...s/vsphere-validator-entity-privilege.yaml → ...samples/vsphere-validator-privileges.yaml b/...s/vsphere-validator-entity-privilege.yaml → ...samples/vsphere-validator-privileges.yaml
@@ -10,14 +10,18 @@ metadata:
   name: vspherevalidator-entity-privilege
   namespace: validator
 spec:
-  datacenter: "Datacenter"
   auth:
     secretName: vsphere-creds
-  entityPrivilegeValidationRules:
+  datacenter: "Datacenter"
+  privilegeValidationRules:
     - name: "Deploy VM to vapp test-vapp"
-      username: prakash@vsphere.local
       entityName: "sp-prakash"
-      entityType: "folder"
+      entityType: "Folder"
       privileges:
       - "VirtualMachine.Config.AddExistingDisk"
       - "VirtualMachine.Config.AddNewDisk"
+      propagation:
+        enabled: true
+        groupPrincipals:
+        - VSPHERE.LOCAL\my-group
+        propagated: true
diff --git a/config/samples/vsphere-validator-role-privilege.yaml b/config/samples/vsphere-validator-role-privilege.yaml
diff --git a/config/samples/vsphere-validator-tag.yaml b/config/samples/vsphere-validator-tag.yaml
@@ -10,12 +10,12 @@ metadata:
   name: vspherevalidator
   namespace: validator
 spec:
-  datacenter: "Datacenter"
   auth:
     secretName: vsphere-creds
+  datacenter: "Datacenter"
   tagValidationRules:
     - name: "Folder tag validation"
       clusterName: "Cluster2"
-      entityType: "folder"
+      entityType: "Folder"
       entityName: "sp-prakash"
-      tag: "owner"
+      tag: "owner"