Skip to content

operator: add env to config/manager/manager.yaml #417

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 7, 2025
Merged

operator: add env to config/manager/manager.yaml #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7db9026
operator: add env to config/manager/manager.yaml
implr Apr 6, 2025
d1294bd
fix build-installer calls
implr Apr 6, 2025
aac0648
Automated commit: update images.
implr Apr 6, 2025
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: 0 additions & 2 deletions .github/workflows/update-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,6 @@ jobs:
sudo mv operator-sdk /usr/local/bin/
make test
make docker-build IMG=kctf-operator
make build-installer IMG=kctf-operator
mv dist/install.yaml ../dist/resources/install.yaml

- id: push
name: Push images
Expand Down
2 changes: 1 addition & 1 deletion dist/challenge-templates/pwn/challenge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN /usr/sbin/userdel -r ubuntu && /usr/sbin/useradd --no-create-home -u 1000 us
COPY flag /
COPY chal /home/user/

FROM gcr.io/kctf-docker/challenge@sha256:5117cc6e9f35c62fd8ce47603b020c1875d243392d1b6275b4cb89e0d6b488ca
FROM gcr.io/kctf-docker/challenge@sha256:9f15314c26bd681a043557c9f136e7823414e9e662c08dde54d14a6bfd0b619f

COPY --from=chroot / /chroot

Expand Down
2 changes: 1 addition & 1 deletion dist/challenge-templates/pwn/healthcheck/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM gcr.io/kctf-docker/healthcheck@sha256:0c38967d7ca24193ee663ba184369df0c1914af96c4938dca3554b164596732e
FROM gcr.io/kctf-docker/healthcheck@sha256:66b34a47e7bbb832012905e229da0bbed80c5c3cddd4703127ca4026ba528cfc

COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/

Expand Down
2 changes: 1 addition & 1 deletion dist/challenge-templates/web/challenge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ COPY web-servers /web-servers

COPY flag /

FROM gcr.io/kctf-docker/challenge@sha256:5117cc6e9f35c62fd8ce47603b020c1875d243392d1b6275b4cb89e0d6b488ca
FROM gcr.io/kctf-docker/challenge@sha256:9f15314c26bd681a043557c9f136e7823414e9e662c08dde54d14a6bfd0b619f

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends tzdata apache2 \
Expand Down
2 changes: 1 addition & 1 deletion dist/challenge-templates/web/healthcheck/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM gcr.io/kctf-docker/healthcheck@sha256:0c38967d7ca24193ee663ba184369df0c1914af96c4938dca3554b164596732e
FROM gcr.io/kctf-docker/healthcheck@sha256:66b34a47e7bbb832012905e229da0bbed80c5c3cddd4703127ca4026ba528cfc

COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/

Expand Down
2 changes: 1 addition & 1 deletion dist/challenge-templates/xss-bot/challenge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM gcr.io/kctf-docker/challenge@sha256:5117cc6e9f35c62fd8ce47603b020c1875d243392d1b6275b4cb89e0d6b488ca
FROM gcr.io/kctf-docker/challenge@sha256:9f15314c26bd681a043557c9f136e7823414e9e662c08dde54d14a6bfd0b619f

RUN apt-get update && apt-get install -y gnupg2 wget

Expand Down
2 changes: 1 addition & 1 deletion dist/challenge-templates/xss-bot/healthcheck/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM gcr.io/kctf-docker/healthcheck@sha256:0c38967d7ca24193ee663ba184369df0c1914af96c4938dca3554b164596732e
FROM gcr.io/kctf-docker/healthcheck@sha256:66b34a47e7bbb832012905e229da0bbed80c5c3cddd4703127ca4026ba528cfc

COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/

Expand Down
7 changes: 6 additions & 1 deletion dist/resources/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8222,7 +8222,12 @@ spec:
- --leader-elect
command:
- /manager
image: gcr.io/kctf-docker/kctf-operator@sha256:eca42a9795c0150a803c35e83080495c664327f4067b9c676d8566daec39008e
env:
- name: ALLOWED_IPS
value: 0.0.0.0/0
- name: SECURITY_POLICY
value: DISABLED
image: gcr.io/kctf-docker/kctf-operator@sha256:6ee63bab2ffb69af6210c6b90d6145bf7653ea738b35976180a2c428740217e0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion kctf-operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment.
mkdir -p dist
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
$(KUSTOMIZE) build config/default > dist/install.yaml
$(KUSTOMIZE) build config/default > ../dist/resources/install.yaml

##@ Deployment

Expand Down
5 changes: 5 additions & 0 deletions kctf-operator/config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ spec:
- /manager
args:
- --leader-elect
env:
- name: ALLOWED_IPS
value: 0.0.0.0/0
- name: SECURITY_POLICY
value: DISABLED
image: controller:latest
name: manager
securityContext:
Expand Down
8,251 changes: 0 additions & 8,251 deletions kctf-operator/dist/install.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions kctf-operator/resources/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package resources
// == || These are set by automation || ==
// .. vv ........................... vv ..

const DOCKER_CERTBOT_IMAGE = "gcr.io/kctf-docker/certbot@sha256:fdf7b50056c99c7e2b4e16ce1fbbf046334ca73bb3bc067f56e51e06720edf2d"
const DOCKER_GCSFUSE_IMAGE = "gcr.io/kctf-docker/gcsfuse@sha256:cf43a4f5c68438cac676988fb9c6d144766252934d482b9532268e4d001a5ee9"
const DOCKER_CERTBOT_IMAGE = "gcr.io/kctf-docker/certbot@sha256:86f883af58f630babd55a20ae7d89974d9cc35608c25cb405fe3faf90d0ceef0"
const DOCKER_GCSFUSE_IMAGE = "gcr.io/kctf-docker/gcsfuse@sha256:6cb70b79588dc30e4ea64d85f2d0d1aff928d9002b75b697ce50009e8b88b208"

// .. ^^ ........................... ^^ ..
// == || These are set by automation || ==
Expand Down
Loading