Skip to content

Commit

Permalink
Update namespace to kuadrant-system
Browse files Browse the repository at this point in the history
Changes the default namespace from `kuadrant-operator-system` to
`kuadrant-system`.  The kuadrant controller is currently hard coded to
use `kuadrant-system` when creating resources, so using it here ensures
all kuadrant resources end up in the same ns.  Will also make docs
between the operator/controller/kuadrantcl repos more consistent.
  • Loading branch information
mikenairn committed Jan 28, 2022
1 parent bbd0e0f commit 5aa0c78
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
make deploy
- name: Wait for deployment
run: |
kubectl -n kuadrant-operator-system wait --timeout=300s --for=condition=Available deployments --all
kubectl -n kuadrant-system wait --timeout=300s --for=condition=Available deployments --all
# Note: This doesn't run any actual tests yet!
- name: Run make undeploy
run: |
Expand Down
94 changes: 47 additions & 47 deletions bundle/manifests/kuadrant-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,38 +209,26 @@ spec:
- create
serviceAccountName: kuadrant-operator-controller-manager
deployments:
- name: kuadrant-operator-controller-manager
- name: kuadrant-controller-manager
spec:
replicas: 1
selector:
matchLabels:
app: kuadrant
control-plane: controller-manager
strategy: {}
template:
metadata:
labels:
app: kuadrant
control-plane: controller-manager
spec:
containers:
- args:
- --secure-listen-address=0.0.0.0:8443
- --upstream=http://127.0.0.1:8080/
- --logtostderr=true
- --v=10
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy
ports:
- containerPort: 8443
name: https
protocol: TCP
resources: {}
- args:
- --health-probe-bind-address=:8081
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
- --config=controller_manager_config.yaml
command:
- /manager
image: quay.io/kuadrant/kuadrant-operator:latest
image: quay.io/kuadrant/kuadrant-controller:latest
livenessProbe:
httpGet:
path: /healthz
Expand All @@ -256,37 +244,68 @@ spec:
periodSeconds: 10
resources:
limits:
cpu: 200m
memory: 100Mi
cpu: 100m
memory: 30Mi
requests:
cpu: 100m
memory: 20Mi
securityContext:
allowPrivilegeEscalation: false
volumeMounts:
- mountPath: /controller_manager_config.yaml
name: manager-config
subPath: controller_manager_config.yaml
- args:
- --secure-listen-address=0.0.0.0:8443
- --upstream=http://127.0.0.1:8080/
- --logtostderr=true
- --v=10
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy
ports:
- containerPort: 8443
name: https
resources: {}
securityContext:
runAsNonRoot: true
serviceAccountName: kuadrant-operator-controller-manager
serviceAccountName: kuadrant-controller-manager
terminationGracePeriodSeconds: 10
- name: kuadrant-controller-manager
volumes:
- configMap:
name: kuadrant-manager-config
name: manager-config
- name: kuadrant-operator-controller-manager
spec:
replicas: 1
selector:
matchLabels:
app: kuadrant
control-plane: controller-manager
strategy: {}
template:
metadata:
labels:
app: kuadrant
control-plane: controller-manager
spec:
containers:
- args:
- --config=controller_manager_config.yaml
- --secure-listen-address=0.0.0.0:8443
- --upstream=http://127.0.0.1:8080/
- --logtostderr=true
- --v=10
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy
ports:
- containerPort: 8443
name: https
protocol: TCP
resources: {}
- args:
- --health-probe-bind-address=:8081
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
command:
- /manager
image: quay.io/kuadrant/kuadrant-controller:latest
image: quay.io/kuadrant/kuadrant-operator:latest
livenessProbe:
httpGet:
path: /healthz
Expand All @@ -302,36 +321,17 @@ spec:
periodSeconds: 10
resources:
limits:
cpu: 100m
memory: 30Mi
cpu: 200m
memory: 100Mi
requests:
cpu: 100m
memory: 20Mi
securityContext:
allowPrivilegeEscalation: false
volumeMounts:
- mountPath: /controller_manager_config.yaml
name: manager-config
subPath: controller_manager_config.yaml
- args:
- --secure-listen-address=0.0.0.0:8443
- --upstream=http://127.0.0.1:8080/
- --logtostderr=true
- --v=10
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy
ports:
- containerPort: 8443
name: https
resources: {}
securityContext:
runAsNonRoot: true
serviceAccountName: kuadrant-controller-manager
serviceAccountName: kuadrant-operator-controller-manager
terminationGracePeriodSeconds: 10
volumes:
- configMap:
name: kuadrant-manager-config
name: manager-config
permissions:
- rules:
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Adds namespace to all resources.
namespace: kuadrant-operator-system
namespace: kuadrant-system

# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
Expand Down
3 changes: 3 additions & 0 deletions config/dependencies/controller/kustomization.template.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
resources:
- github.com/Kuadrant/kuadrant-controller/config/default?ref=${KUADRANT_CONTROLLER_GITREF}

patchesStrategicMerge:
- delete-ns.yaml
3 changes: 3 additions & 0 deletions config/dependencies/controller/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
resources:
- github.com/Kuadrant/kuadrant-controller/config/default?ref=main

patchesStrategicMerge:
- delete-ns.yaml
3 changes: 1 addition & 2 deletions config/dependencies/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
namespace: kuadrant-operator-system
namespace: kuadrant-system

resources:
- controller
- authorino
- limitador

patchesStrategicMerge:
- controller/delete-ns.yaml
- authorino/delete-ns.yaml
- limitador/delete-ns.yaml
2 changes: 1 addition & 1 deletion config/deploy/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace: kuadrant-operator-system
namespace: kuadrant-system

resources:
- ../default
Expand Down
2 changes: 1 addition & 1 deletion config/deploy/olm/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Adds namespace to all resources.
namespace: kuadrant-operator-system
namespace: kuadrant-system

resources:
- namespace.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/deploy/olm/subscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
name: kuadrant
spec:
source: kuadrant-operator-catalog
sourceNamespace: kuadrant-operator-system
sourceNamespace: kuadrant-system
name: kuadrant-operator
channel: "alpha"
2 changes: 1 addition & 1 deletion make/kind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ kind-create-kuadrant-cluster: kind-create-cluster ## Create a kind cluster with
$(KIND) load docker-image $(IMG) --name $(KIND_CLUSTER_NAME)
$(MAKE) install
$(MAKE) deploy
kubectl -n kuadrant-operator-system wait --timeout=300s --for=condition=Available deployments --all
kubectl -n kuadrant-system wait --timeout=300s --for=condition=Available deployments --all

0 comments on commit 5aa0c78

Please sign in to comment.