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.

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

ci: embed prod policy settings on release #164

Merged
merged 3 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e_simple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
just get-credentials
- name: Build, deploy, nunki generate, nunki set, nunki verify
run: |
just default simple
just default simple cli-release
- name: Summary
run: |
cat ./workspace/just.namespace | tee -a "${GITHUB_STEP_SUMMARY}"
Expand Down
21 changes: 11 additions & 10 deletions justfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Undeploy, rebuild, deploy.
default target=default_deploy_target: undeploy coordinator initializer openssl port-forwarder (deploy target) set verify (wait-for-workload target)
default target=default_deploy_target cli=default_cli: undeploy coordinator initializer openssl port-forwarder (deploy target cli) set verify (wait-for-workload target)

# Build the coordinator, containerize and push it.
coordinator:
Expand All @@ -17,14 +17,15 @@ port-forwarder:
initializer:
nix run .#containers.push-initializer -- "$container_registry/nunki/initializer"

default_cli := "nunki.cli"
default_deploy_target := "simple"
workspace_dir := "workspace"

# Generate policies, apply Kubernetes manifests.
deploy target=default_deploy_target: (generate target) apply
deploy target=default_deploy_target cli=default_cli: (generate target cli) apply

# Generate policies, update manifest.
generate target=default_deploy_target:
generate target=default_deploy_target cli=default_cli:
#!/usr/bin/env bash
set -euo pipefail
mkdir -p ./{{ workspace_dir }}
Expand All @@ -37,7 +38,7 @@ generate target=default_deploy_target:
nix run .#kypatch namespace -- ./{{ workspace_dir }}/deployment \
--replace edg-default {{ target }}${namespace_suffix-}
t=$(date +%s)
nix run .#nunki.cli -- generate \
nix run .#{{ cli }} -- generate \
-m ./{{ workspace_dir }}/manifest.json \
-p ./{{ workspace_dir }}/rules.rego \
-s ./{{ workspace_dir }}/genpolicy-msft.json \
Expand Down Expand Up @@ -69,7 +70,7 @@ create:
nix run .#scripts.create-coco-aks -- --name="$azure_resource_group"

# Set the manifest at the coordinator.
set:
set cli=default_cli:
#!/usr/bin/env bash
set -euo pipefail
ns=$(cat ./{{ workspace_dir }}/just.namespace)
Expand All @@ -81,7 +82,7 @@ set:
nix run .#scripts.wait-for-port-listen -- 1313
policy=$(<./{{ workspace_dir }}/just.coordinator-policy-hash)
t=$(date +%s)
nix run .#nunki.cli -- set \
nix run .#{{ cli }} -- set \
-m ./{{ workspace_dir }}/manifest.json \
-c localhost:1313 \
--coordinator-policy-hash "${policy}" \
Expand All @@ -91,7 +92,7 @@ set:
echo "set $duration" >> ./{{ workspace_dir }}/just.perf

# Verify the Coordinator.
verify:
verify cli=default_cli:
#!/usr/bin/env bash
set -euo pipefail
rm -rf ./{{ workspace_dir }}/verify
Expand All @@ -102,7 +103,7 @@ verify:
trap "kill $PID" EXIT
nix run .#scripts.wait-for-port-listen -- 1314
t=$(date +%s)
nix run .#nunki.cli -- verify \
nix run .#{{ cli }} -- verify \
-c localhost:1314 \
-o ./{{ workspace_dir }}/verify
duration=$(( $(date +%s) - $t ))
Expand Down Expand Up @@ -164,11 +165,11 @@ fmt:
lint:
nix run .#scripts.golangci-lint -- run

demodir: undeploy coordinator initializer
demodir cli=default_cli: undeploy coordinator initializer
#!/usr/bin/env bash
d=$(mktemp -d)
echo "Creating demo directory at ${d}"
nix build .#nunki.cli
nix build .#{{ cli }}
cp ./result-cli/bin/nunki "${d}/nunki"
cp -R ./deployments/emojivoto "${d}/deployment"
nix run .#scripts.patch-nunki-image-hashes -- "${d}/deployment"
Expand Down
17 changes: 17 additions & 0 deletions packages/by-name/cli-release/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{ lib
, nunki
, genpolicy-msft
, genpolicy ? genpolicy-msft
}:

(nunki.overrideAttrs (_finalAttrs: previousAttrs: {
prePatch = ''
install -D ${lib.getExe genpolicy} cli/assets/genpolicy
install -D ${genpolicy.settings}/genpolicy-settings.json cli/assets/genpolicy-settings.json
install -D ${genpolicy.rules}/genpolicy-rules.rego cli/assets/genpolicy-rules.rego
'';

ldflags = previousAttrs.ldflags ++ [
"-X main.DefaultCoordinatorPolicyHash=${builtins.readFile ../../../cli/assets/coordinator-policy-hash}"
];
})).cli
Loading