Merge pull request #5 from edcdavid/build-plugins

Upgrade to latest ACM Generator plugin version

.github/workflows/test.yaml

@@ -2,9 +2,9 @@ name: Test Incoming Changes
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
   workflow_dispatch:
 env:
   TERM: xterm-color
@@ -98,8 +98,11 @@ jobs:
         env:
           SHELL: /bin/bash
 
-      - name: Build binary
-        run: make build
+      - name: Build binary linux-amd64
+        run: make build-linux-amd64
 
-      - name: Basic test
-        run: make test
+      - name: Build binary darwin-arm64
+        run: sudo make clean && make build-darwin-arm64
+
+      - name: Build local architecture and Basic test
+        run: sudo make clean && make test

Makefile

@@ -8,14 +8,25 @@ GO_PACKAGES=$(shell go list ./... | grep -v vendor)
 # Runs configured linters
 lint:
 	golangci-lint run --timeout 10m0s
-build:
+build: build-plugins
 	go build -o pgt2acm
+build-linux-amd64: build-plugins-linux-amd64
+	GOOS=linux GOARCH=amd64 go build -o pgt2acm
+build-darwin-arm64: build-plugins-darwin-arm64
+	GOOS=darwin GOARCH=arm64 go build -o pgt2acm
 test: build
 	scripts/test.sh
 clean:
-	rm -r test/acmgen-output
-	rm pgt2acm
+	rm -r test/acmgen-output || true
+	rm pgt2acm || true
+	rm -rf build || true
 fetch-schema:
 	kustomize openapi fetch > test/cluster-schema.json
 vet:
 	go vet ${GO_PACKAGES}
+build-plugins-darwin-arm64: clean
+	GOOS=darwin GOARCH=arm64 scripts/build-plugins.sh
+build-plugins-linux-amd64: clean
+	GOOS=linux GOARCH=amd64 scripts/build-plugins.sh
+build-plugins: clean
+	scripts/build-plugins.sh

scripts/build-plugins.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+ROOT=$(pwd)
+POLICY_GENERATOR_TAG=release-2.10
+
+rm -rf build || true
+mkdir build
+cd build || exit 1
+# Download ACM Policy Generator plugin repo
+git clone --branch="$POLICY_GENERATOR_TAG" --depth 1 https://github.com/stolostron/policy-generator-plugin
+# Download PGT repo
+git clone --depth 1 https://github.com/openshift-kni/cnf-features-deploy.git
+# Build latest Policy Generator Template plugin executable
+cd cnf-features-deploy/ztp/policygenerator || exit 1
+make build
+cp policygenerator "$ROOT"/kustomize/ran.openshift.io/v1/policygentemplate/PolicyGenTemplate
+cd - || exit 1
+
+# Build ACM Policy Generator plugin executable
+cd policy-generator-plugin/ || exit 1
+API_PLUGIN_PATH="." make build
+cp PolicyGenerator "$ROOT"/kustomize/policy.open-cluster-management.io/v1/policygenerator/PolicyGenerator

scripts/test.sh

@@ -2,7 +2,7 @@
 rm -rf test/acmgen-output
 mkdir test/acmgen-output
 cp -r test/init-source-crs test/acmgen-output/source-crs
-./pgt2acm -i test/pgt-input -o test/acmgen-output -s test/newptpconfig-schema.json -k PtpConfig -n "" -w
+./pgt2acm -i test/pgt-input -o test/acmgen-output -s test/newptpconfig-schema.json -k PtpConfig -n ""
 
 if diff -r test/acmgen-output test/acmgen-expected-output; then
 	echo "Test Passed"

test/acmgen-expected-output/acm-pgt-example-ptp.yaml

@@ -8,7 +8,14 @@ placementBindingDefaults:
 policyDefaults:
     namespace: ztp-group
     placement:
-        placementPath: group-du-standard-latest-config-policy-placement.yaml
+        labelSelector:
+            matchExpressions:
+                - key: du-profile
+                  operator: In
+                  values:
+                    - latest
+                - key: group-du-standard
+                  operator: Exists
     remediationAction: inform
     severity: low
     namespaceSelector: