diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index b664c916..e5364aff 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -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 @@ -167,7 +168,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 diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml index a4acb0c2..83c434d4 100644 --- a/config/rbac/auth_proxy_role_binding.yaml +++ b/config/rbac/auth_proxy_role_binding.yaml @@ -15,5 +15,5 @@ roleRef: name: eventing-proxy subjects: - kind: ServiceAccount - name: eventing-controller-manager + name: eventing-manager namespace: system diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml index 1fd9f40e..d7fdbdeb 100644 --- a/config/rbac/auth_proxy_service.yaml +++ b/config/rbac/auth_proxy_service.yaml @@ -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: @@ -18,4 +18,4 @@ spec: protocol: TCP targetPort: https selector: - control-plane: controller-manager + control-plane: manager diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml index e940a7d5..27874747 100644 --- a/config/rbac/leader_election_role_binding.yaml +++ b/config/rbac/leader_election_role_binding.yaml @@ -15,5 +15,5 @@ roleRef: name: eventing-leader-election subjects: - kind: ServiceAccount - name: eventing-controller-manager + name: eventing-manager namespace: system diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index 03dee946..e70e9169 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -15,5 +15,5 @@ roleRef: name: eventing-manager subjects: - kind: ServiceAccount - name: eventing-controller-manager + name: eventing-manager namespace: system diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml index 37fd89a0..b44d6cd1 100644 --- a/config/rbac/service_account.yaml +++ b/config/rbac/service_account.yaml @@ -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 diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml index 978aa27f..2ec95ae1 100644 --- a/config/webhook/kustomization.yaml +++ b/config/webhook/kustomization.yaml @@ -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 diff --git a/config/webhook/webhook_configs.yaml b/config/webhook/webhook_configs.yaml index d91a9f22..3e838d61 100644 --- a/config/webhook/webhook_configs.yaml +++ b/config/webhook/webhook_configs.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/part-of: eventing-manager webhooks: - admissionReviewVersions: - - v1beta1 + - v1 clientConfig: service: name: eventing-manager-webhook-service @@ -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 @@ -42,7 +42,7 @@ metadata: app.kubernetes.io/part-of: eventing-manager webhooks: - admissionReviewVersions: - - v1beta1 + - v1 clientConfig: service: name: eventing-manager-webhook-service @@ -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