Skip to content

Commit d45f795

Browse files
committed
Update AGENT_VERSION to EXTENSION_VERSION and cleanup README
1 parent 50316f4 commit d45f795

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

.github/workflows/release.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: Agent Docker Image - Build and Release
1+
name: Build and Release
22

33
on:
44
push:
55
tags:
66
- "v*"
77

88
env:
9-
# Any version upgrade for the OSQuery or Kubectl should be done here
9+
# Any version upgrade for the osquery or kubectl should be done here
1010
OSQUERY_VERSION: 5.12.1
1111
KUBECTL_VERSION: 1.30.0
1212
jobs:
@@ -20,12 +20,12 @@ jobs:
2020
- name: Extract tagged Agent Docker Image version
2121
id: image-version
2222
run: echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
23-
23+
2424
- name: Debug - tag extraction
2525
run: echo "Using transformed tag ${{ steps.image-version.outputs.version }}"
2626

27-
- name: Query the latest Agent version
28-
id: agent-version
27+
- name: Query the latest extension version
28+
id: extension-version
2929
uses: actions/github-script@v6
3030
with:
3131
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -50,12 +50,12 @@ jobs:
5050
core.setOutput("version", tagName);
5151
5252
- name: Debug - query result
53-
run: echo "Using transformed tag ${{ steps.agent-version.outputs.version }}"
53+
run: echo "Using transformed tag ${{ steps.extension-version.outputs.version }}"
5454

5555
- name: Versions used for the build
5656
run: |
5757
echo "DOCKER_VERSION=${{ steps.image-version.outputs.version }}"
58-
echo "AGENT_VERSION=${{ steps.agent-version.outputs.version }}"
58+
echo "EXTENSION_VERSION=${{ steps.extension-version.outputs.version }}"
5959
echo "OSQUERY_VERSION=${{ env.OSQUERY_VERSION }}"
6060
echo "KUBECTL_VERSION=${{ env.KUBECTL_VERSION }}"
6161
@@ -90,5 +90,4 @@ jobs:
9090
build-args: |
9191
OSQUERY_VERSION=${{ env.OSQUERY_VERSION }}
9292
KUBECTL_VERSION=${{ env.KUBECTL_VERSION }}
93-
AGENT_VERSION=${{ steps.agent-version.outputs.version }}
94-
93+
EXTENSION_VERSION=${{ steps.extension-version.outputs.version }}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ docker build ./kubernetes/docker/ \
1616
-t guardrails-agent-kubernetes:latest \
1717
--build-arg OSQUERY_VERSION=5.12.1 \
1818
--build-arg KUBECTL_VERSION=1.30.0 \
19-
--build-arg AGENT_VERSION=0.28.0
19+
--build-arg EXTENSION_VERSION=0.28.0
2020
```
2121

22-
- OSQUERY_VERSION: This argument specifies the version of osquery to be installed in the Docker image. Osquery is an operating system instrumentation framework that makes operating system analytics and monitoring easier. In your Dockerfile, this version is used to download the specific osquery package from the official osquery repository.
22+
- OSQUERY_VERSION: This argument specifies the version of osquery to be installed in the Docker image. osquery is an operating system instrumentation framework that makes operating system analytics and monitoring easier. In your Dockerfile, this version is used to download the specific osquery package from the official osquery repository.
2323

2424
- KUBECTL_VERSION: This argument specifies the version of kubectl to be installed in the Docker image. Kubectl is a command line tool for controlling Kubernetes clusters. In your Dockerfile, this version is used to download the specific kubectl binary from the official Kubernetes release page.
2525

26-
- AGENT_VERSION: This argument specifies the version of the osquery extension for Kubernetes to be installed in the Docker image. This extension allows osquery to interact with Kubernetes. In your Dockerfile, this version is used to download the specific osquery extension tarball from the GitHub release page of the steampipe-plugin-kubernetes project.
26+
- EXTENSION_VERSION: This argument specifies the version of the osquery extension for Kubernetes to be installed in the Docker image. This extension allows osquery to interact with Kubernetes. In your Dockerfile, this version is used to download the specific osquery extension tarball from the [Steampipe Kubernetes plugin releases](https://github.com/turbot/steampipe-plugin-kubernetes/releases).
2727

2828
## Open Source & Contributing
2929

kubernetes/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM ubuntu:24.04
44
ARG \
55
OSQUERY_VERSION \
66
KUBECTL_VERSION \
7-
AGENT_VERSION \
7+
EXTENSION_VERSION \
88
TARGETARCH
99

1010
# Copy the start script from the build context to the container
@@ -28,7 +28,7 @@ RUN \
2828
# Create the directory for the osquery extensions
2929
mkdir -p /usr/lib/osquery/extensions/ && \
3030
# Download the osquery extension tarball from the GitHub release
31-
wget -O /tmp/osquery_extension_kubernetes.linux_${TARGETARCH}.tar.gz https://github.com/turbot/steampipe-plugin-kubernetes/releases/download/v${AGENT_VERSION}/steampipe_osquery_kubernetes.linux_${TARGETARCH}.tar.gz && \
31+
wget -O /tmp/osquery_extension_kubernetes.linux_${TARGETARCH}.tar.gz https://github.com/turbot/steampipe-plugin-kubernetes/releases/download/v${EXTENSION_VERSION}/steampipe_osquery_kubernetes.linux_${TARGETARCH}.tar.gz && \
3232
# Extract the osquery extension tarball
3333
tar -xzf /tmp/osquery_extension_kubernetes.linux_${TARGETARCH}.tar.gz -C /tmp && \
3434
# Move the extension to the extensions directory

0 commit comments

Comments
 (0)