Skip to content

Commit

Permalink
fix: handle basic auth for OCI client (#333)
Browse files Browse the repository at this point in the history
## Description
- Use updated OCI client from validator-plugin-oci
- Refactor OCI auth secrets in Helm chart to support passing env vars
for ECR
- add 'make reviewable' extension to automatically update
`hauler-manifest.yaml` and `chart/validator/values.yaml`
- updated values.yaml for many plugins in the process + versions in
hauler-manifest.yaml

Requires:
- validator-labs/validator-plugin-oci#216

---------

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
  • Loading branch information
TylerGillson committed Jul 20, 2024
1 parent 8f94947 commit 5041c4f
Show file tree
Hide file tree
Showing 17 changed files with 1,412 additions and 593 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
timeout: 5m
timeout: 10m
allow-parallel-runners: true

issues:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.devspace
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$TARGETPLATFORM golang:alpine3.17 AS builder
FROM --platform=$TARGETPLATFORM golang:alpine3.19 AS builder
ARG TARGETOS
ARG TARGETARCH

Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ CERTS_INIT_IMG ?= quay.io/validator-labs/validator-certs-init:latest
# Helm vars
CHART_NAME=validator

reviewable-ext:
@$(INFO) Checking for plugin version updates...
bash hack/update-versions.sh

.PHONY: docker-build-certs-init
docker-build-certs-init: ## Build validator-certs-init docker image.
$(CONTAINER_TOOL) build -f hack/validator-certs-init.Dockerfile -t ${CERTS_INIT_IMG} . --platform linux/$(GOARCH)
Expand Down
2 changes: 1 addition & 1 deletion build
2 changes: 1 addition & 1 deletion chart/validator/README.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions chart/validator/templates/plugin-secret-oci-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ required ".Values.pluginSecrets.oci.auth.secretName is required!" .secretName }}
name: {{ required ".Values.pluginSecrets.oci.auth[*].secretName is required!" .secretName }}
stringData:
username: {{ required ".Values.pluginSecrets.oci.auth.username is required!" .username }}
password: {{ required ".Values.pluginSecrets.oci.auth.password is required!" .password }}
---
{{- range $key, $val := .env }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
Loading

0 comments on commit 5041c4f

Please sign in to comment.