Skip to content

Commit

Permalink
Fix incorrect manifest setting and remove unused manifests (#34)
Browse files Browse the repository at this point in the history
* Fix incorrect manifest setting

* Remove unused cert-manager auto-proxy webhook yaml
  • Loading branch information
Jeffwan committed Sep 18, 2021
1 parent 02dfeaa commit e5b2e49
Show file tree
Hide file tree
Showing 23 changed files with 4 additions and 333 deletions.
25 changes: 0 additions & 25 deletions ray-operator/config/certmanager/certificate.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions ray-operator/config/certmanager/kustomization.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions ray-operator/config/certmanager/kustomizeconfig.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions ray-operator/config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,3 @@
resources:
- bases/ray.io_rayclusters.yaml
# +kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
#- patches/webhook_in_rayclusters.yaml
# +kubebuilder:scaffold:crdkustomizewebhookpatch

# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
# patches here are for enabling the CA injection for each CRD
#- patches/cainjection_in_rayclusters.yaml
# +kubebuilder:scaffold:crdkustomizecainjectionpatch

# the following config is for teaching kustomize how to do kustomization for CRDs.
configurations:
- kustomizeconfig.yaml
17 changes: 0 additions & 17 deletions ray-operator/config/crd/kustomizeconfig.yaml

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions ray-operator/config/crd/patches/webhook_in_rayclusters.yaml

This file was deleted.

58 changes: 2 additions & 56 deletions ray-operator/config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,62 +13,8 @@ namespace: ray-system
# someName: someValue

bases:
#- ../crd
- ../crd
- ../rbac
- ../manager
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in crd/kustomization.yaml
#- ../webhook
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
#- ../certmanager
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
#- ../prometheus

#patchesStrategicMerge:
# Protect the /metrics endpoint by putting it behind auth.
# Only one of manager_auth_proxy_patch.yaml and
# manager_prometheus_metrics_patch.yaml should be enabled.
#- manager_auth_proxy_patch.yaml
# If you want your controller-manager to expose the /metrics
# endpoint w/o any authn/z, uncomment the following line and
# 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

# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in crd/kustomization.yaml
#- manager_webhook_patch.yaml

# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
# 'CERTMANAGER' needs to be enabled to use ca injection
#- webhookcainjection_patch.yaml

# the following config is for teaching kustomize how to do var substitution
#vars:
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
# objref:
# kind: Certificate
# group: cert-manager.io
# version: v1alpha2
# name: serving-cert # this name should match the one in certificate.yaml
# fieldref:
# fieldpath: metadata.namespace
#- name: CERTIFICATE_NAME
# objref:
# kind: Certificate
# group: cert-manager.io
# version: v1alpha2
# name: serving-cert # this name should match the one in certificate.yaml
#- name: SERVICE_NAMESPACE # namespace of the service
# objref:
# kind: Service
# version: v1
# name: webhook-service
# fieldref:
# fieldpath: metadata.namespace
#- name: SERVICE_NAME
# objref:
# kind: Service
# version: v1
# name: webhook-service
25 changes: 0 additions & 25 deletions ray-operator/config/default/manager_auth_proxy_patch.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions ray-operator/config/default/manager_webhook_patch.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions ray-operator/config/default/webhookcainjection_patch.yaml

This file was deleted.

1 change: 1 addition & 0 deletions ray-operator/config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
spec:
securityContext:
runAsNonRoot: true
serviceAccountName: ray-operator-service-account
containers:
- command:
- /manager
Expand Down
8 changes: 0 additions & 8 deletions ray-operator/config/quota/priority.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions ray-operator/config/quota/quota.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions ray-operator/config/rbac/auth_proxy_role.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions ray-operator/config/rbac/auth_proxy_role_binding.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions ray-operator/config/rbac/auth_proxy_service.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions ray-operator/config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,3 @@ resources:
- leader_election_role.yaml
- leader_election_role_binding.yaml
- service_account.yaml
# Comment the following 3 lines if you want to disable
# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
# which protects your /metrics endpoint.
#- auth_proxy_service.yaml
#- auth_proxy_role.yaml
#- auth_proxy_role_binding.yaml
2 changes: 1 addition & 1 deletion ray-operator/config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: ray-operator-role
name: ray-operator-cluster-role
rules:
- apiGroups:
- ""
Expand Down
6 changes: 0 additions & 6 deletions ray-operator/config/webhook/kustomization.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions ray-operator/config/webhook/kustomizeconfig.yaml

This file was deleted.

Empty file.
12 changes: 0 additions & 12 deletions ray-operator/config/webhook/service.yaml

This file was deleted.

0 comments on commit e5b2e49

Please sign in to comment.