Skip to content

Commit

Permalink
Removes kfserving prefix from Kustomize and explicitly applies it to …
Browse files Browse the repository at this point in the history
…all resources (kubeflow#104)
  • Loading branch information
ellistarn authored and k8s-ci-robot committed May 20, 2019
1 parent a1cc86c commit 5f4f44c
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 35 deletions.
16 changes: 1 addition & 15 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
# Adds namespace to all resources.
namespace: kfserving-system

# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: kfserving-

# Labels to add to all resources and selectors.
#commonLabels:
# someName: someValue
Expand Down Expand Up @@ -41,11 +34,4 @@ patches:
# comment manager_auth_proxy_patch.yaml.
# Only one of manager_auth_proxy_patch.yaml and
# manager_prometheus_metrics_patch.yaml should be enabled.
#- manager_prometheus_metrics_patch.yaml

vars:
- name: WEBHOOK_SECRET_NAME
objref:
kind: Secret
name: webhook-server-secret
apiVersion: v1
#- manager_prometheus_metrics_patch.yaml
12 changes: 6 additions & 6 deletions config/default/manager/manager.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: controller-manager
namespace: system
name: kfserving-controller-manager
namespace: kfserving-system
labels:
control-plane: kfserving-controller-manager
controller-tools.k8s.io: "1.0"
Expand Down Expand Up @@ -30,7 +30,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: SECRET_NAME
value: $(WEBHOOK_SECRET_NAME)
value: kfserving-webhook-server-secret
resources:
limits:
cpu: 100m
Expand All @@ -51,10 +51,10 @@ spec:
- name: cert
secret:
defaultMode: 420
secretName: webhook-server-secret
secretName: kfserving-webhook-server-secret
---
apiVersion: v1
kind: Secret
metadata:
name: webhook-server-secret
namespace: system
name: kfserving-webhook-server-secret
namespace: kfserving-system
6 changes: 3 additions & 3 deletions config/default/manager/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ metadata:
control-plane: kfserving-controller-manager
controller-tools.k8s.io: "1.0"
istio-injection: disabled
name: system
name: kfserving-system
---
apiVersion: v1
kind: Service
metadata:
name: controller-manager-service
namespace: system
name: kfserving-controller-manager-service
namespace: kfserving-system
labels:
control-plane: kfserving-controller-manager
controller-tools.k8s.io: "1.0"
Expand Down
4 changes: 2 additions & 2 deletions config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: controller-manager
namespace: system
name: kfserving-controller-manager
namespace: kfserving-system
spec:
template:
spec:
Expand Down
4 changes: 2 additions & 2 deletions config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: controller-manager
namespace: system
name: kfserving-controller-manager
namespace: kfserving-system
spec:
template:
spec:
Expand Down
4 changes: 2 additions & 2 deletions config/default/manager_prometheus_metrics_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: controller-manager
namespace: system
name: kfserving-controller-manager
namespace: kfserving-system
spec:
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion config/default/rbac/auth_proxy_role.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: proxy-role
name: kfserving-proxy-role
rules:
- apiGroups: ["authentication.k8s.io"]
resources:
Expand Down
2 changes: 1 addition & 1 deletion config/default/rbac/auth_proxy_role_binding.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: proxy-rolebinding
name: kfserving-proxy-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
4 changes: 2 additions & 2 deletions config/default/rbac/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ metadata:
labels:
control-plane: controller-manager
controller-tools.k8s.io: "1.0"
name: controller-manager-metrics-service
namespace: system
name: kfserving-controller-manager-metrics-service
namespace: kfserving-system
spec:
ports:
- name: https
Expand Down
2 changes: 1 addition & 1 deletion image_patch_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cat > config/overlays/development/manager_image_patch.yaml << EOF
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: controller-manager
name: kfserving-controller-manager
spec:
template:
spec:
Expand Down

0 comments on commit 5f4f44c

Please sign in to comment.