Skip to content

Commit 1e3bedc

Browse files
committed
add: address feedback on pr
1 parent 08743f5 commit 1e3bedc

File tree

6 files changed

+6
-43
lines changed

6 files changed

+6
-43
lines changed

config/certmanager/certificate.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

config/certmanager/kustomization.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

config/certmanager/kustomizeconfig.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

config/default/webhookcainjection_patch.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
apiVersion: admissionregistration.k8s.io/v1
33
kind: MutatingWebhookConfiguration
44
metadata:
5-
labels:
6-
app.kubernetes.io/name: mutatingwebhookconfiguration
7-
app.kubernetes.io/instance: mutating-webhook-configuration
8-
app.kubernetes.io/component: webhook
9-
app.kubernetes.io/created-by: codeflare-operator
10-
app.kubernetes.io/part-of: codeflare-operator
11-
app.kubernetes.io/managed-by: kustomize
125
name: mutating-webhook-configuration
136
annotations:
14-
service.beta.openshift.io/inject-cabundle: "true"
15-
service.beta.openshift.io/serving-cert-secret-name: codeflare-operator-raycluster-webhook-cert
7+
service.beta.openshift.io/inject-cabundle: "true"

config/webhook/service.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
labels:
5-
app.kubernetes.io/name: service
6-
app.kubernetes.io/part-of: codeflare-operator
7-
app.kubernetes.io/instance: webhook-service
8-
app.kubernetes.io/component: webhook
9-
app.kubernetes.io/created-by: codeflare-operator
10-
app.kubernetes.io/managed-by: kustomize
114
name: webhook-service
125
namespace: openshift-operators
136
annotations:
14-
service.beta.openshift.io/serving-cert-secret-name: codeflare-operator-raycluster-webhook-cert
7+
service.beta.openshift.io/serving-cert-secret-name: codeflare-operator-raycluster-webhook-cert
158
spec:
169
ports:
1710
- port: 443
1811
protocol: TCP
1912
targetPort: 9443
2013
selector:
21-
app.kubernetes.io/part-of: codeflare
14+
app.kubernetes.io/part-of: codeflare
2215
app.kubernetes.io/name: codeflare-operator

pkg/controllers/raycluster_webhook.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ package controllers
1818

1919
import (
2020
"context"
21+
2122
rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
23+
2224
corev1 "k8s.io/api/core/v1"
2325
"k8s.io/apimachinery/pkg/runtime"
2426
ctrl "sigs.k8s.io/controller-runtime"
@@ -32,7 +34,7 @@ var rayclusterlog = logf.Log.WithName("raycluster-resource")
3234
func (r *RayClusterDefaulter) SetupWebhookWithManager(mgr ctrl.Manager) error {
3335
return ctrl.NewWebhookManagedBy(mgr).
3436
For(&rayv1.RayCluster{}).
35-
WithDefaulter(r).
37+
WithDefaulter(&RayClusterDefaulter{}).
3638
Complete()
3739
}
3840

0 commit comments

Comments
 (0)