Skip to content

Commit e8d00f1

Browse files
committed
Various fixes related to hive developer experience (dx)
.gitignore: add venv so I stop accidentally adding it with `git add hack/` hack/*.sh: use `oc` instead of `kubectl` Makefile: add target for using podman to push to registry (local registry running in podman has no security setup, hence ignore TLS)
1 parent 00f84cc commit e8d00f1

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
bin/**
88
**/__debug_bin
99
**/__pycache__
10+
**/venv
1011

1112
# Test binary, build with `go test -c`
1213
*.test

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ buildah-dev-build:
317317
podman-dev-build:
318318
podman build --tag ${IMG} $(GOCACHE_VOL_ARG) -f ./Dockerfile .
319319

320+
.PHONY: podman-dev-push
321+
podman-dev-push: podman-dev-build
322+
podman push --tls-verify=false ${IMG}
323+
320324
# Build and push the dev image with buildah
321325
.PHONY: buildah-dev-push
322326
buildah-dev-push: buildah-dev-build

hack/create-service-account-secrets.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# - hiveadmission
66
# - hive-controllers
77
#
8-
cat <<EOF | kubectl apply -f -
8+
cat <<EOF | oc apply -f -
99
apiVersion: v1
1010
kind: List
1111
items:

hack/hiveadmission-dev-cert.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cat <<EOF | cfssl genkey - | cfssljson -bare server
2424
}
2525
EOF
2626

27-
cat <<EOF | kubectl apply -f -
27+
cat <<EOF | oc apply -f -
2828
apiVersion: certificates.k8s.io/v1
2929
kind: CertificateSigningRequest
3030
metadata:
@@ -38,14 +38,14 @@ spec:
3838
- server auth
3939
EOF
4040

41-
kubectl certificate approve hiveadmission.${HIVE_NS}
41+
oc adm certificate approve hiveadmission.${HIVE_NS}
4242

4343
sleep 5
44-
kubectl get csr hiveadmission.${HIVE_NS} -o jsonpath='{.status.certificate}' | base64 --decode > server.crt
44+
oc get csr hiveadmission.${HIVE_NS} -o jsonpath='{.status.certificate}' | base64 --decode > server.crt
4545

4646
cat server.crt
4747

48-
cat <<EOF | kubectl apply -f -
48+
cat <<EOF | oc apply -f -
4949
kind: Secret
5050
apiVersion: v1
5151
data:

0 commit comments

Comments
 (0)