Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix fips build #810

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Fix fips build #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions packages/system/kcrypt-challenger/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,9 @@ requires:
version: ">=0"
{{end}}
prelude:
- apt-get update && apt-get install -y gcc
{{if not (or (eq .Values.category "fips") (eq .Values.category "fips-static"))}}
- apt-get install -y libssl-dev
{{ end }}
- apt-get update && apt-get install -y gcc libssl-dev
- mkdir go/src/github.com/${GITHUB_ORG}/ -p
- cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git
{{ if ne .Values.live "yes" }}
- cd go/src/github.com/${GITHUB_ORG}/ && git checkout 3912abcec424521725ccd335181f2fde90510081 -b build
{{ end }}
env:
- GOPATH=/luetbuild/go/
- DEBIAN_FRONTEND=noninteractive
Expand All @@ -38,14 +32,14 @@ steps:
PACKAGE_VERSION=${PACKAGE_VERSION%\+*} && \
mkdir -p /system/discovery && \
cd go/src/github.com/${GITHUB_ORG}/{{ .Values.name }}/ && go build -ldflags="${LDFLAGS}" -o {{ .Values.binary_name }} ./cmd/discovery/main.go && mv {{ .Values.binary_name }} /system/discovery
- upx -1 /system/discovery/{{ .Values.binary_name }}
- chmod +x /system/discovery/{{ .Values.binary_name }}
{{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}}
{{ if .Values.arch }}
{{ if eq .Values.arch "amd64" }}
- go tool nm /system/discovery/{{ .Values.binary_name }} | grep -i "FIPS_mode"
{{end}}
{{end}}
- upx -1 /system/discovery/{{ .Values.binary_name }}
- chmod +x /system/discovery/{{ .Values.binary_name }}
{{end}}
includes:
- /system/discovery/{{ .Values.binary_name }}
17 changes: 1 addition & 16 deletions packages/system/kcrypt-challenger/collection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ packages:
- name: kcrypt-challenger
binary_name: kcrypt-discovery-challenger
category: system
live: "yes"
version: "0.8.0"
labels:
github.repo: "kcrypt-challenger"
Expand All @@ -14,25 +13,11 @@ packages:
- name: kcrypt-challenger
binary_name: kcrypt-discovery-challenger
category: fips
live: "yes"
version: "0.7.0"
version: "0.8.0"
labels:
github.repo: "kcrypt-challenger"
github.owner: "kairos-io"
uri:
- https://github.com/kairos-io/kcrypt-challenger
license: "Apache License v2"
description: "Cloud native guardian for persistent data in the edge"
#- name: kcrypt-challenger
#binary_name: kcrypt-discovery-challenger
#ldflags: "-linkmode external -extldflags -static"
#category: fips-static
#live: "yes"
#version: "0.5.0"
#labels:
#github.repo: "kcrypt-challenger"
#github.owner: "kairos-io"
#uri:
#- https://github.com/kairos-io/kcrypt-challenger
#license: "Apache License v2"
#description: "Cloud native guardian for persistent data in the edge"
Loading