Skip to content

Commit

Permalink
UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
Browse files Browse the repository at this point in the history
  • Loading branch information
soltysh committed Apr 26, 2024
1 parent c60cbfd commit 368d794
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 2 additions & 4 deletions hack/lib/golang.sh
Expand Up @@ -318,7 +318,7 @@ readonly KUBE_ALL_TARGETS=(
)
readonly KUBE_ALL_BINARIES=("${KUBE_ALL_TARGETS[@]##*/}")

readonly KUBE_STATIC_LIBRARIES=()
readonly KUBE_STATIC_BINARIES=()

# Fully-qualified package names that we want to instrument for coverage information.
readonly KUBE_COVERAGE_INSTRUMENTED_PACKAGES=(
Expand Down Expand Up @@ -348,9 +348,7 @@ kube::golang::is_statically_linked() {
if [[ -n "${KUBE_CGO_OVERRIDES_LIST:+x}" ]]; then
for e in "${KUBE_CGO_OVERRIDES_LIST[@]}"; do [[ "${1}" == *"/${e}" ]] && return 1; done;
fi
if [[ -n "${KUBE_STATIC_LIBRARIES:+x}" ]]; then
for e in "${KUBE_STATIC_LIBRARIES[@]}"; do [[ "${1}" == *"/${e}" ]] && return 0; done;
fi
for e in "${KUBE_STATIC_BINARIES[@]}"; do [[ "${1}" == *"/${e}" ]] && return 0; done;
if [[ -n "${KUBE_STATIC_OVERRIDES_LIST:+x}" ]]; then
for e in "${KUBE_STATIC_OVERRIDES_LIST[@]}"; do [[ "${1}" == *"/${e}" ]] && return 0; done;
fi
Expand Down
4 changes: 3 additions & 1 deletion test/typecheck/main.go
Expand Up @@ -63,7 +63,9 @@ func newConfig(platform string) *packages.Config {
mode = mode | packages.NeedTypesInfo
}
env := append(os.Environ(),
"CGO_ENABLED=1",
// OpenShift doesn't build with CGO, since we use host-provided SSL
// binaries for FIPS compatibility.
// "CGO_ENABLED=1",
fmt.Sprintf("GOOS=%s", goos),
fmt.Sprintf("GOARCH=%s", goarch))
tagstr := "selinux"
Expand Down

0 comments on commit 368d794

Please sign in to comment.