File tree Expand file tree Collapse file tree 2 files changed +17
-2
lines changed Expand file tree Collapse file tree 2 files changed +17
-2
lines changed Original file line number Diff line number Diff line change 87
87
value : quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder@sha256:a35214a970ce7ff2729adbdad5aa7caf202bf131fafa702dd1b006f102779f07
88
88
- name : RELATED_IMAGE_PODVM_PAYLOAD
89
89
value : quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-payload@sha256:c282c01cb7b7d9984c5b5a4a2b434a9dff4b5b63c125bc2ae129d818696c0e29
90
+ - name : RELATED_IMAGE_PODVM_OCI
91
+ value : registry.redhat.io/openshift-sandboxed-containers/osc-podvm-oci-rhel9:1.9.0
92
+ - name : OSC_SIGNATURE_DATABASE_KEY
93
+ value: "MIIFITCCAwmgAwIBAgIUPQq9lQi9U3XCw+W7Fr9q5XMRuAkwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UEAwwVTXkgY3VzdG9tIGNlcnRpZmljYXRlMB4XDTI1MDQyOTA4NDAyNloXDTI1MDUyOTA4NDAyNlowIDEeMBwGA1UEAwwVTXkgY3VzdG9tIGNlcnRpZmljYXRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmZ8jwAOUmkY8nDtZb+jt8gw59JyTMfrgUJ2Kan2T3wHNASASGVQZqu8GWAec4hz0aBx6tFhv/smV842TybqHayPQNiVvzisERzdTSrjYdIQqM6oQa58C5s9yIbUyiiVny4etFIrsqB14fGKCdz/Yskg3laU2vfIhNiJkukofHDmadPGo8yijzdQXXN3BeCtC5ER1WR029MbegN+LNoRnN28YOGp9YaUsM0ey/L2nGgh3g7hkxtg1pxKMHywR5+4S5lT93YE9fO4iMmhq+9j3BpoAmQ7S0+bged6Qy/MdKZw76RDw8kVbVBA7hiq8obn+TZ+OZ/fXbsG4dlBMgttPK7KGtrd/95oRiLESQ3IHfqm/HXdhiXtMXlbpVBgMmW3zSeA0iBsZiO5n9240ljgY3QebtF7t3WlwBzVQaE1mro0+QUAIOih0ua5guVzGnQ1QFCQgchoPdd01zqUlXLTEIPJop4AQn9y3jV0RjE53d7c5l/F2Oj+HAAiUEeJ3EiFrqK2z8LUqSkLIlw42Ixp57B/O0/yTWyLzhM4AoHH/mhNrIbz9Dc3KohWn8+iiced0jqEnxFw4fxPfUOvNk6ZvFjz4N+WpCDWCrsRzOuS0gJd7pNRGGmJVyc4mk7FbtzgXgI/wBvLOuGhpGa+zlI5cnoLBqMxNN/wHTMkBRkHlBKECAwEAAaNTMFEwHQYDVR0OBBYEFMdJlU45cIgremkk+qeAUpk2b2pPMB8GA1UdIwQYMBaAFMdJlU45cIgremkk+qeAUpk2b2pPMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAA18dX5s4uRsYDZVaglMWjRbCReoRLHy+HDIgz3pp/THpYNDm3ItQDyN7OgFhcfjoHhiA6OwD3BmF20KUD13HZNc01KgWSNLghZZKDy9pcIMM/vM+5WKwbP9QLbQg5MobUmW9nuWDQJ3/3MYzy754jEvzBPipi+d/AA1ml83TmnXDXTE00/ml5yis1t7lqZdNcqlfVxzmyn8E5t0Wlz7UqE7D6gykst+mQhIjs/C4WWuYdGEIzZQVALnSj3iexnJSZZ0S1szFuk3Tx3rqbxlutOipNg79kiREKnaP3L3++IkIY2oOc8gY2LKWSbqLPqtBwq+HrWEfu6WGJAKOUtEBvdOGmQR/di4u7qY+NG8xuGSdWiKLzeUDd6+7ipjWv4Bj9WJq1LLdqCZ8rpwzYKmXorp5w9h75YZLa2zPkP2WeDllEvOuRDmH2upvDGqlxsc2HMAR/2ux2OuzxsJWABx6Zf93xkdkjBDxEWAgEmnsRkjlDNkIhXbf3xI2zyKS4INpBHbQs41vKXJvr15FZ5DsWz0Rus1P8/IYfYYQFQofwUHbsn79vfqvNinSbdHA4K+gtoT+SKSMPKqw2aJ27z46ku3CQFajibY81E+fAq0mzbjnRZqa2gpsznEbQElEooevJrf0UVrDOVWyQSC1PPeMXgX51Ue/cGfw1Z33FEUIHhR"
90
94
imagePullPolicy : Always
91
95
resources :
92
96
limits :
Original file line number Diff line number Diff line change @@ -834,12 +834,23 @@ func (r *ImageGenerator) updateImageConfigMap() error {
834
834
// Update the ConfigMap with the FIPS value
835
835
cm .Data [fipsCMKey ] = "true"
836
836
igLogger .Info ("Setting FIPS mode" )
837
+ }
838
+
839
+ // set to default image
840
+ if cm .Data ["PODVM_IMAGE_URI" ] == "" && os .Getenv ("RELATED_IMAGE_PODVM_OCI" ) != "" {
841
+ cm .Data ["PODVM_IMAGE_URI" ] = "oci::" + os .Getenv ("RELATED_IMAGE_PODVM_OCI" )
842
+ igLogger .Info ("Setting PODVM_IMAGE_URI to default value" , "PODVM_IMAGE_URI" , cm .Data ["PODVM_IMAGE_URI" ])
837
843
838
- if err := r .client .Update (context .TODO (), cm ); err != nil {
839
- return err
844
+ if cm .Data ["UEFI_SIGNATURE_DATABASE_KEY" ] == "" && os .Getenv ("OSC_SIGNATURE_DATABASE_KEY" ) != "" {
845
+ cm .Data ["UEFI_SIGNATURE_DATABASE_KEY" ] = os .Getenv ("OSC_SIGNATURE_DATABASE_KEY" )
846
+ igLogger .Info ("Setting UEFI_SIGNATURE_DATABASE_KEY to default value" , "UEFI_SIGNATURE_DATABASE_KEY" , os .Getenv ("OSC_SIGNATURE_DATABASE_KEY" ))
840
847
}
841
848
}
842
849
850
+ if err := r .client .Update (context .TODO (), cm ); err != nil {
851
+ return err
852
+ }
853
+
843
854
igLogger .Info ("ConfigMap has been updated successfully" , "name" , cmName )
844
855
return nil
845
856
You can’t perform that action at this time.
0 commit comments