chore: replace lingering pola references with policy assistant

Signed-off-by: Hunter Gregory <[email protected]>
kubernetes-sigs · Nov 11, 2024 · 8d40382 · 8d40382
1 parent 9281b0c
commit 8d40382
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/cmd/policy-assistant/.github/workflows/kind_antrea.yml b/cmd/policy-assistant/.github/workflows/kind_antrea.yml
@@ -2,7 +2,7 @@ name: Kind Antrea policy-assistant
 on:
   workflow_dispatch:
     inputs:
-      pola_args:
+      policy_assistant_args:
         description: "args to pass on to policy-assistant"
         required: false
         default: "generate --include conflict --job-timeout-seconds 2 --server-protocol=tcp,udp"
@@ -23,4 +23,4 @@ jobs:
           go-version: 1.18
       - name: Run policy-assistant
         working-directory: hack/kind
-        run: CNI=antrea RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.pola_args }}" ./run-policy-assistant.sh
+        run: CNI=antrea RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.policy_assistant_args }}" ./run-policy-assistant.sh
diff --git a/cmd/policy-assistant/.github/workflows/kind_calico.yml b/cmd/policy-assistant/.github/workflows/kind_calico.yml
@@ -2,7 +2,7 @@ name: Kind Calico policy-assistant
 on:
   workflow_dispatch:
     inputs:
-      pola_args:
+      policy_assistant_args:
         description: "args to pass on to policy-assistant"
         required: false
         default: "generate --include conflict --job-timeout-seconds 2"
@@ -22,4 +22,4 @@ jobs:
           go-version: 1.18
       - name: Run policy-assistant
         working-directory: hack/kind
-        run: CNI=calico RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.pola_args }}" ./run-policy-assistant.sh
+        run: CNI=calico RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.policy_assistant_args }}" ./run-policy-assistant.sh
diff --git a/cmd/policy-assistant/.github/workflows/kind_cilium.yml b/cmd/policy-assistant/.github/workflows/kind_cilium.yml
@@ -2,7 +2,7 @@ name: Kind Cilium policy-assistant
 on:
   workflow_dispatch:
     inputs:
-      pola_args:
+      policy_assistant_args:
         description: "args to pass on to policy-assistant"
         required: false
         default: "generate --include conflict --job-timeout-seconds 2 --server-protocol=tcp,udp --ignore-loopback=true"
@@ -22,4 +22,4 @@ jobs:
           go-version: 1.18
       - name: Run policy-assistant
         working-directory: hack/kind
-        run: CNI=cilium RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.pola_args }}" ./run-policy-assistant.sh
+        run: CNI=cilium RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.policy_assistant_args }}" ./run-policy-assistant.sh
diff --git a/cmd/policy-assistant/.github/workflows/kind_cni_from_source.yml b/cmd/policy-assistant/.github/workflows/kind_cni_from_source.yml
@@ -5,7 +5,7 @@ on:
       cni:
         description: "name of CNI to use"
         required: true
-      pola_args:
+      policy_assistant_args:
         description: "args to pass on to policy-assistant"
         required: false
         default: "generate include --conflict --job-timeout-seconds 2"
@@ -24,4 +24,4 @@ jobs:
 
       - name: Run policy-assistant
         working-directory: hack/kind
-        run: CNI=${{ github.event.inputs.cni }} RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.pola_args }}" ./run-policy-assistant.sh
+        run: CNI=${{ github.event.inputs.cni }} RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.policy_assistant_args }}" ./run-policy-assistant.sh
diff --git a/cmd/policy-assistant/.github/workflows/kind_ovn.yml b/cmd/policy-assistant/.github/workflows/kind_ovn.yml
@@ -2,7 +2,7 @@ name: Kind Ovn policy-assistant
 on:
   workflow_dispatch:
     inputs:
-      pola_args:
+      policy_assistant_args:
         description: "args to pass on to policy-assistant"
         required: false
         default: "generate --include conflict --job-timeout-seconds 2 --exclude=named-port,multi-peer,upstream-e2e,example --ignore-loopback=true"
@@ -24,4 +24,4 @@ jobs:
           go-version: 1.18
       - name: Run policy-assistant
         working-directory: hack/kind
-        run: CNI=ovn-kubernetes RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.pola_args }}" ./run-policy-assistant.sh
+        run: CNI=ovn-kubernetes RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.policy_assistant_args }}" ./run-policy-assistant.sh
diff --git a/cmd/policy-assistant/.goreleaser.yml b/cmd/policy-assistant/.goreleaser.yml
@@ -57,5 +57,5 @@ archives:
       - README*
       - CHANGELOG*
 checksum:
-  name_template: "pola_{{ .RawVersion }}_checksums.txt"
+  name_template: "policy_assistant_{{ .RawVersion }}_checksums.txt"
   algorithm: sha256
diff --git a/cmd/policy-assistant/Makefile b/cmd/policy-assistant/Makefile
@@ -1,13 +1,13 @@
 # TODO: create an actual image registry + image
 
 # constants
-# FIXME: update POLA_IMAGE to the actual image name
-POLA_IMAGE			= policy-assistant
+# FIXME: update POLICY_ASSISTANT_IMAGE to the actual image name
+POLICY_ASSISTANT_IMAGE			= policy-assistant
 
 # variables
 # FIXME: update IMAGE_REGISTRY to the actual image registry
 IMAGE_REGISTRY      ?= docker.io
-POLA_TAG			?= latest
+POLICY_ASSISTANT_TAG			?= latest
 
 test:
 	go test ./pkg/...
@@ -25,4 +25,4 @@ policy-assistant-binary:
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./cmd/policy-assistant/policy-assistant ./cmd/policy-assistant
 
 policy-assistant-image: policy-assistant-binary
-	docker build -t $(IMAGE_REGISTRY)/$(POLA_IMAGE):$(POLA_TAG) ./cmd/policy-assistant
+	docker build -t $(IMAGE_REGISTRY)/$(POLICY_ASSISTANT_IMAGE):$(POLICY_ASSISTANT_TAG) ./cmd/policy-assistant
diff --git a/cmd/policy-assistant/examples/run.sh b/cmd/policy-assistant/examples/run.sh
@@ -3,9 +3,9 @@
 set -euo pipefail
 set -xv
 
-POLA_OUTPUT_DIR=${POLA_OUTPUT_DIR:-"./policy-assistant-output"}
+POLICY_ASSISTANT_OUTPUT_DIR=${POLICY_ASSISTANT_OUTPUT_DIR:-"./policy-assistant-output"}
 
-mkdir -p "$POLA_OUTPUT_DIR"
+mkdir -p "$POLICY_ASSISTANT_OUTPUT_DIR"
 
 # run all 5
 printf "\n\n********************** run all 5 modes **************************\n\n"
@@ -15,42 +15,42 @@ go run ../cmd/policy-assistant/main.go analyze \
   --target-pod-path ./targets-example.json \
   --traffic-path ./traffic-example.json \
   --probe-path ./probe-example.json \
-  > "$POLA_OUTPUT_DIR"/analyze-all-five.txt
+  > "$POLICY_ASSISTANT_OUTPUT_DIR"/analyze-all-five.txt
 
 # run just the explainer
 printf "\n\n********************** run just the explainer **************************\n\n"
 go run ../cmd/policy-assistant/main.go analyze \
   --mode explain \
   --policy-path ../networkpolicies/simple-example/ \
-  > "$POLA_OUTPUT_DIR"/analyze-explain.txt
+  > "$POLICY_ASSISTANT_OUTPUT_DIR"/analyze-explain.txt
 
 # run just the targets
 printf "\n\n********************** run just the targets **************************\n\n"
 go run ../cmd/policy-assistant/main.go analyze \
   --mode query-target \
   --policy-path ../networkpolicies/simple-example/ \
   --target-pod-path ./targets.json \
-  > "$POLA_OUTPUT_DIR"/analyze-query-target.txt
+  > "$POLICY_ASSISTANT_OUTPUT_DIR"/analyze-query-target.txt
 
 # run just the traffic
 printf "\n\n********************** run just the traffic **************************\n\n"
 go run ../cmd/policy-assistant/main.go analyze \
   --mode query-traffic \
   --policy-path ../networkpolicies/simple-example/ \
   --traffic-path ./traffic.json \
-  > "$POLA_OUTPUT_DIR"/analyze-query-traffic.txt
+  > "$POLICY_ASSISTANT_OUTPUT_DIR"/analyze-query-traffic.txt
 
 # run just the probe
 printf "\n\n********************** run just the probe **************************\n\n"
 go run ../cmd/policy-assistant/main.go analyze \
   --mode probe \
   --policy-path ../networkpolicies/simple-example/ \
   --probe-path ./probe.json \
-  > "$POLA_OUTPUT_DIR"/analyze-probe.txt
+  > "$POLICY_ASSISTANT_OUTPUT_DIR"/analyze-probe.txt
 
 # run just the linter
 printf "\n\n********************** run just the linter **************************\n\n"
 go run ../cmd/policy-assistant/main.go analyze \
   --mode lint \
   --policy-path ../networkpolicies/simple-example \
-  > "$POLA_OUTPUT_DIR"/analyze-lint.txt
+  > "$POLICY_ASSISTANT_OUTPUT_DIR"/analyze-lint.txt
diff --git a/cmd/policy-assistant/hack/sonobuoy/run-sonobuoy-plugin.sh b/cmd/policy-assistant/hack/sonobuoy/run-sonobuoy-plugin.sh
@@ -3,11 +3,11 @@
 set -xv
 set -euo pipefail
 
-POLA_ARGS=$@
+POLICY_ASSISTANT_ARGS=$@
 RESULTS_DIR="${RESULTS_DIR:-/tmp/results}"
 
 
-./policy-assistant $POLA_ARGS > "${RESULTS_DIR}"/results.txt
+./policy-assistant $POLICY_ASSISTANT_ARGS > "${RESULTS_DIR}"/results.txt
 
 
 cd "${RESULTS_DIR}"

diff --git a/cmd/policy-assistant/pkg/connectivity/probe/pod.go b/cmd/policy-assistant/pkg/connectivity/probe/pod.go
@@ -15,7 +15,7 @@ import (
 const (
 	agnhostImage = "e2e-test-images/agnhost:2.43"
 	// FIXME use a real image repository
-	polaWorkerImage = "docker.io/policy-assistant-worker:latest"
+	policyAssistantWorkerImage = "docker.io/policy-assistant-worker:latest"
 )
 
 func NewPod(ns string, name string, labels map[string]string, ip string, containers []*Container) *Pod {
@@ -194,7 +194,7 @@ func (c *Container) KubeServicePort() v1.ServicePort {
 
 func (c *Container) Image() string {
 	if c.BatchJobs {
-		return polaWorkerImage
+		return policyAssistantWorkerImage
 	}
 	return c.ImageRegistry + "/" + agnhostImage
 }