@@ -725,11 +725,63 @@ volumes:
725725 // NOTE: `creationTimestamp: null` appears in the resulting pod,
726726 // but it does not affect the PVC or reconciliation events;
727727 // possibly https://pr.k8s.io/100032
728- assert .Assert (t , cmp .MarshalContains (pod .Spec .Volumes , `
728+ assert .Assert (t , cmp .MarshalContains (pod .Spec .Volumes , `- name: cert-volume
729+ projected:
730+ defaultMode: 384
731+ sources:
732+ - secret:
733+ items:
734+ - key: tls.crt
735+ path: tls.crt
736+ - key: tls.key
737+ path: tls.key
738+ - key: ca.crt
739+ path: ca.crt
740+ name: srv-secret
741+ - secret:
742+ items:
743+ - key: tls.crt
744+ path: replication/tls.crt
745+ - key: tls.key
746+ path: replication/tls.key
747+ name: repl-secret
748+ - name: postgres-data
749+ persistentVolumeClaim:
750+ claimName: datavol
751+ - downwardAPI:
752+ items:
753+ - path: cpu_limit
754+ resourceFieldRef:
755+ containerName: database
756+ divisor: "0"
757+ resource: limits.cpu
758+ - path: cpu_request
759+ resourceFieldRef:
760+ containerName: database
761+ divisor: "0"
762+ resource: requests.cpu
763+ - path: mem_limit
764+ resourceFieldRef:
765+ containerName: database
766+ divisor: "0"
767+ resource: limits.memory
768+ - path: mem_request
769+ resourceFieldRef:
770+ containerName: database
771+ divisor: "0"
772+ resource: requests.memory
773+ - fieldRef:
774+ apiVersion: v1
775+ fieldPath: metadata.labels
776+ path: labels
777+ - fieldRef:
778+ apiVersion: v1
779+ fieldPath: metadata.annotations
780+ path: annotations
781+ name: database-containerinfo
729782- ephemeral:
730783 volumeClaimTemplate:
731- metadata:
732- creationTimestamp: null
784+ metadata: {}
733785 spec:
734786 resources:
735787 requests:
@@ -746,13 +798,65 @@ volumes:
746798 InstancePod (ctx , cluster , instance ,
747799 serverSecretProjection , clientSecretProjection , dataVolume , nil , nil , annotated )
748800
749- assert .Assert (t , cmp .MarshalContains (annotated .Spec .Volumes , `
801+ assert .Assert (t , cmp .MarshalContains (annotated .Spec .Volumes , `- name: cert-volume
802+ projected:
803+ defaultMode: 384
804+ sources:
805+ - secret:
806+ items:
807+ - key: tls.crt
808+ path: tls.crt
809+ - key: tls.key
810+ path: tls.key
811+ - key: ca.crt
812+ path: ca.crt
813+ name: srv-secret
814+ - secret:
815+ items:
816+ - key: tls.crt
817+ path: replication/tls.crt
818+ - key: tls.key
819+ path: replication/tls.key
820+ name: repl-secret
821+ - name: postgres-data
822+ persistentVolumeClaim:
823+ claimName: datavol
824+ - downwardAPI:
825+ items:
826+ - path: cpu_limit
827+ resourceFieldRef:
828+ containerName: database
829+ divisor: "0"
830+ resource: limits.cpu
831+ - path: cpu_request
832+ resourceFieldRef:
833+ containerName: database
834+ divisor: "0"
835+ resource: requests.cpu
836+ - path: mem_limit
837+ resourceFieldRef:
838+ containerName: database
839+ divisor: "0"
840+ resource: limits.memory
841+ - path: mem_request
842+ resourceFieldRef:
843+ containerName: database
844+ divisor: "0"
845+ resource: requests.memory
846+ - fieldRef:
847+ apiVersion: v1
848+ fieldPath: metadata.labels
849+ path: labels
850+ - fieldRef:
851+ apiVersion: v1
852+ fieldPath: metadata.annotations
853+ path: annotations
854+ name: database-containerinfo
750855- ephemeral:
751856 volumeClaimTemplate:
752857 metadata:
753858 annotations:
754859 n1: etc
755- creationTimestamp: null
756860 labels:
757861 gg: asdf
758862 spec:
0 commit comments