Skip to content

Commit c8a8888

Browse files
committed
chore: rename istio based k8s dev env infra
Signed-off-by: Shane Utt <shaneutt@linux.com>
1 parent 692faf1 commit c8a8888

File tree

7 files changed

+9
-4
lines changed

7 files changed

+9
-4
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ clean.environment.dev.kind:
721721
environment.dev.kubernetes.infrastructure:
722722
ifeq ($(strip $(INFRASTRUCTURE_OVERRIDE)),true)
723723
@echo "Deploying OpenShift Infrastructure Components"
724-
kustomize build deploy/environments/dev/kubernetes-infra | kubectl apply --server-side --force-conflicts -f -
724+
kustomize build deploy/environments/dev/kubernetes-istio-infra | kubectl apply --server-side --force-conflicts -f -
725725
else
726726
$(error "Error: The environment variable INFRASTRUCTURE_OVERRIDE must be set to true in order to run this target.")
727727
endif
@@ -743,7 +743,7 @@ ifeq ($(strip $(INFRASTRUCTURE_OVERRIDE)),true)
743743
@echo "This is extremely destructive. We'll provide 5 seconds before starting to give you a chance to cancel."
744744
sleep 5
745745
@echo "Tearing Down OpenShift Infrastructure Components"
746-
kustomize build deploy/environments/dev/kubernetes-infra | kubectl delete -f - || true
746+
kustomize build deploy/environments/dev/kubernetes-istio-infra | kubectl delete -f - || true
747747
else
748748
$(error "Error: The environment variable INFRASTRUCTURE_OVERRIDE must be set to true in order to run this target.")
749749
endif
@@ -776,7 +776,7 @@ endif
776776
@echo "INFO: Creating namespace (if needed) and setting context to $(NAMESPACE)..."
777777
kubectl create namespace $(NAMESPACE) 2>/dev/null || true
778778
@echo "INFO: Deploying Development Environment in namespace $(NAMESPACE)"
779-
kustomize build deploy/environments/dev/kubernetes | envsubst | kubectl -n $(NAMESPACE) apply -f -
779+
kustomize build deploy/environments/dev/kubernetes-istio | envsubst | kubectl -n $(NAMESPACE) apply -f -
780780
@echo "INFO: Waiting for Pods in namespace $(NAMESPACE) to become ready"
781781
kubectl -n $(NAMESPACE) wait --for=condition=Ready --all pods --timeout=300s
782782
@echo "INFO: Waiting for Gateway in namespace $(NAMESPACE) to become ready"

deploy/environments/dev/kubernetes-infra/kustomization.yaml renamed to deploy/environments/dev/kubernetes-istio-infra/kustomization.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
#
44
# This provides the infrastructure-level requirements that individual
55
# development environments (see `deploy/environments/dev/kubernetes`) will need
6-
# (e.g. CRDs, Operators, RBAC, etc).
6+
# (e.g. CRDs, Operators, RBAC, etc). It uses Istio as the control-plane for
7+
# Gateways.
78
#
89
# **WARNING**: Needs to be run once, and regularly updated on an OpenShift
910
# cluster by an administrator prior to deploying individual environments on

deploy/environments/dev/kubernetes-infra/rbac.yaml renamed to deploy/environments/dev/kubernetes-istio-infra/rbac.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# -----------------------------------------------------------------------------
2+
# This provides access to authenticated users to create and manage Gateways
3+
# and attach GIE to them on development clusters.
4+
# -----------------------------------------------------------------------------
15
apiVersion: rbac.authorization.k8s.io/v1
26
kind: ClusterRole
37
metadata:

0 commit comments

Comments
 (0)