Skip to content

Commit

Permalink
Fixed webhooks and renamed service-account
Browse files Browse the repository at this point in the history
  • Loading branch information
mfaizanse committed Sep 26, 2023
1 parent 8aa4e9f commit d69bd7f
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 24 deletions.
3 changes: 2 additions & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
traffic.sidecar.istio.io/excludeInboundPorts: "9443"
labels:
control-plane: eventing-manager
app.kubernetes.io/name: eventing-manager
Expand Down Expand Up @@ -169,7 +170,7 @@ spec:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
serviceAccountName: eventing-controller-manager
serviceAccountName: eventing-manager
terminationGracePeriodSeconds: 10
volumes:
- name: cert
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/auth_proxy_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ roleRef:
name: eventing-proxy
subjects:
- kind: ServiceAccount
name: eventing-controller-manager
name: eventing-manager
namespace: system
8 changes: 4 additions & 4 deletions config/rbac/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apiVersion: v1
kind: Service
metadata:
labels:
control-plane: controller-manager
control-plane: manager
app.kubernetes.io/name: service
app.kubernetes.io/instance: eventing-controller-manager-metrics
app.kubernetes.io/instance: eventing-manager-metrics
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: eventing-manager
app.kubernetes.io/part-of: eventing-manager
app.kubernetes.io/managed-by: kustomize
name: eventing-controller-manager-metrics
name: eventing-manager-metrics
namespace: system
spec:
ports:
Expand All @@ -18,4 +18,4 @@ spec:
protocol: TCP
targetPort: https
selector:
control-plane: controller-manager
control-plane: manager
2 changes: 1 addition & 1 deletion config/rbac/leader_election_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ roleRef:
name: eventing-leader-election
subjects:
- kind: ServiceAccount
name: eventing-controller-manager
name: eventing-manager
namespace: system
2 changes: 1 addition & 1 deletion config/rbac/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ roleRef:
name: eventing-manager
subjects:
- kind: ServiceAccount
name: eventing-controller-manager
name: eventing-manager
namespace: system
6 changes: 3 additions & 3 deletions config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: serviceaccount
app.kubernetes.io/instance: controller-manager-sa
app.kubernetes.io/name: eventing-manager
app.kubernetes.io/instance: manager-sa
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: eventing-manager
app.kubernetes.io/part-of: eventing-manager
app.kubernetes.io/managed-by: kustomize
name: eventing-controller-manager
name: eventing-manager
namespace: system
2 changes: 1 addition & 1 deletion config/webhook/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ kind: Kustomization
images:
- name: api-gateway
newName: europe-docker.pkg.dev/kyma-project/prod/eventing-webhook-certificates
newTag: v20230808-29d8ce01
newTag: 1.7.0
24 changes: 12 additions & 12 deletions config/webhook/webhook_configs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/part-of: eventing-manager
webhooks:
- admissionReviewVersions:
- v1beta1
- v1
clientConfig:
service:
name: eventing-manager-webhook-service
Expand All @@ -20,14 +20,14 @@ webhooks:
name: msubscription.kb.io
rules:
- apiGroups:
- eventing.kyma-project.io
- eventing.kyma-project.io
apiVersions:
- v1alpha2
- v1alpha2
operations:
- CREATE
- UPDATE
- CREATE
- UPDATE
resources:
- subscriptions
- subscriptions
sideEffects: None
---
apiVersion: admissionregistration.k8s.io/v1
Expand All @@ -42,7 +42,7 @@ metadata:
app.kubernetes.io/part-of: eventing-manager
webhooks:
- admissionReviewVersions:
- v1beta1
- v1
clientConfig:
service:
name: eventing-manager-webhook-service
Expand All @@ -52,12 +52,12 @@ webhooks:
name: vsubscription.kb.io
rules:
- apiGroups:
- eventing.kyma-project.io
- eventing.kyma-project.io
apiVersions:
- v1alpha2
- v1alpha2
operations:
- CREATE
- UPDATE
- CREATE
- UPDATE
resources:
- subscriptions
- subscriptions
sideEffects: None

0 comments on commit d69bd7f

Please sign in to comment.