Merge pull request #226 from rphillips/4.14_and_4.15_fixes

OCPBUGS-43791: 4.14 and 4.15 fixes - update symbols and ignore cni
openshift · Oct 24, 2024 · da4f77e · da4f77e
2 parents e1b52b2 + 3c5610b
commit da4f77e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/dist/releases/4.14/config.toml b/dist/releases/4.14/config.toml
@@ -62,7 +62,7 @@ files = [
   "/usr/lib/golang/pkg/tool/linux_amd64/cgo",
   "/usr/lib/golang/pkg/tool/linux_amd64/compile",
   "/usr/lib/golang/pkg/tool/linux_amd64/covdata",
-  "/usr/lib/golang/pkg/tool/linux_amd64/cover"
+  "/usr/lib/golang/pkg/tool/linux_amd64/cover",
 ]
 
 [[payload.openshift-enterprise-operator-sdk-container.ignore]]
@@ -71,7 +71,7 @@ files = [
   "/usr/lib/golang/pkg/tool/linux_amd64/cgo",
   "/usr/lib/golang/pkg/tool/linux_amd64/compile",
   "/usr/lib/golang/pkg/tool/linux_amd64/covdata",
-  "/usr/lib/golang/pkg/tool/linux_amd64/cover"
+  "/usr/lib/golang/pkg/tool/linux_amd64/cover",
 ]
 
 [[payload.openshift-enterprise-operator-sdk-container.ignore]]
@@ -80,7 +80,7 @@ files = [
   "/usr/lib/golang/pkg/tool/linux_amd64/cgo",
   "/usr/lib/golang/pkg/tool/linux_amd64/compile",
   "/usr/lib/golang/pkg/tool/linux_amd64/covdata",
-  "/usr/lib/golang/pkg/tool/linux_amd64/cover"
+  "/usr/lib/golang/pkg/tool/linux_amd64/cover",
 ]
 
 [[payload.operator-lifecycle-manager-container.ignore]]
@@ -114,3 +114,20 @@ files = ["/usr/bin/cpb"]
 [[payload.ose-olm-rukpak-container.ignore]]
 error = "ErrGoNotCgoEnabled"
 files = ["/unpack"]
+
+[[rpm.containernetworking-plugins.ignore]]
+error = "ErrGoMissingSymbols"
+files = [
+  "/usr/libexec/cni/bandwidth",
+  "/usr/libexec/cni/bridge",
+  "/usr/libexec/cni/dhcp",
+  "/usr/libexec/cni/dummy",
+  "/usr/libexec/cni/firewall",
+  "/usr/libexec/cni/host-device",
+  "/usr/libexec/cni/host-local",
+  "/usr/libexec/cni/ipvlan",
+  "/usr/libexec/cni/macvlan",
+  "/usr/libexec/cni/portmap",
+  "/usr/libexec/cni/ptp",
+  "/usr/libexec/cni/vlan",
+]
diff --git a/dist/releases/4.15/config.toml b/dist/releases/4.15/config.toml
@@ -149,3 +149,20 @@ files = ["/unpack"]
 [[payload.rhel-coreos.ignore]]
 error = "ErrGoNotCgoEnabled"
 files = ["/unpack"]
+
+[[rpm.containernetworking-plugins.ignore]]
+error = "ErrGoMissingSymbols"
+files = [
+  "/usr/libexec/cni/bandwidth",
+  "/usr/libexec/cni/bridge",
+  "/usr/libexec/cni/dhcp",
+  "/usr/libexec/cni/dummy",
+  "/usr/libexec/cni/firewall",
+  "/usr/libexec/cni/host-device",
+  "/usr/libexec/cni/host-local",
+  "/usr/libexec/cni/ipvlan",
+  "/usr/libexec/cni/macvlan",
+  "/usr/libexec/cni/portmap",
+  "/usr/libexec/cni/ptp",
+  "/usr/libexec/cni/vlan",
+]
diff --git a/internal/validations/validations.go b/internal/validations/validations.go
@@ -30,10 +30,12 @@ var (
 	// Use these symbols for all go versions up to 1.21.13. These symbols
 	// changed in version 1.21.13 and again in 1.22
 	requiredGolangSymbolsPre12113 = []string{
+		"vendor/github.com/golang-fips/openssl-fips/openssl._Cfunc__goboringcrypto_DLOPEN_OPENSSL",
 		"vendor/github.com/golang-fips/openssl/openssl._Cfunc__goboringcrypto_DLOPEN_OPENSSL",
 		"crypto/internal/boring._Cfunc__goboringcrypto_DLOPEN_OPENSSL",
 	}
 	requiredGolangSymbolsPre122 = []string{
+		"vendor/github.com/golang-fips/openssl-fips/openssl._Cfunc__goboringcrypto_DLOPEN_OPENSSL",
 		"vendor/github.com/golang-fips/openssl/openssl._Cfunc__goboringcrypto_DLOPEN_OPENSSL",
 		"crypto/internal/boring._Cfunc__goboringcrypto_DLOPEN_OPENSSL",
 	}