Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: netobserv/network-observability-cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd2a8af56a99a560570a27e82d6ed8500dcbbf8c
Choose a base ref
..
head repository: netobserv/network-observability-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 88b00405a33d83b1b1217f3e7e81411d64b613ba
Choose a head ref
Showing with 4 additions and 5 deletions.
  1. +2 −2 .github/workflows/release.yml
  2. +2 −3 scripts/functions.sh
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -43,6 +43,8 @@ jobs:
registry: quay.io
- name: build and push manifest with images
run: MULTIARCH_TARGETS="${{ env.WF_MULTIARCH_TARGETS }}" IMAGE_ORG=${{ env.WF_ORG }} VERSION=${{ env.tag }} make images
- name: build plugin artifact
run: IMAGE_ORG=${{ env.WF_ORG }} VERSION=${{ env.tag }} make release
- name: create github release
uses: actions/create-release@v1
id: create_release
@@ -54,8 +56,6 @@ jobs:
body_path: ./tmp/release.md
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: build plugin artifact
run: IMAGE_ORG=${{ env.WF_ORG }} VERSION=${{ env.tag }} make release
- name: push plugin artifact
uses: actions/upload-release-asset@v1
env:
5 changes: 2 additions & 3 deletions scripts/functions.sh
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ function clusterIsReady() {
}

MANIFEST_FILE="flow-capture.yml"
MANIFEST_OUTPUT_PATH="output"
MANIFEST_OUTPUT_PATH="tmp"

function setup {
echo "Setting up... "
@@ -172,6 +172,7 @@ function setup {

${K8S_CLI_BIN} apply -f "${manifest}"
${K8S_CLI_BIN} rollout status daemonset netobserv-cli -n netobserv-cli --timeout 60s
rm -rf ${MANIFEST_OUTPUT_PATH}
elif [ "$1" = "packets" ]; then
echo "creating packet-capture agents"
echo "${packetAgentYAML/"{{PCA_FILTER_VALUE}}"/${2:-}}" | ${K8S_CLI_BIN} apply -f -
@@ -195,8 +196,6 @@ function cleanup {
}

function edit_manifest() {
echo "Editing manifest file..."

## replace the env variable in the manifest file
echo "env: $1, env_value: $2"
case "$1" in