Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "CCO-421: *: split pod identity webhooks from core controller" #605

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmd/cloud-credential-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

operatorcmd "github.com/openshift/cloud-credential-operator/pkg/cmd/operator"
"github.com/openshift/cloud-credential-operator/pkg/cmd/render"
webhookoperatorcmd "github.com/openshift/cloud-credential-operator/pkg/cmd/webhookoperator"
"github.com/openshift/cloud-credential-operator/pkg/version"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -45,7 +44,6 @@ func main() {

cmd.AddCommand(operatorcmd.NewOperator())
cmd.AddCommand(render.NewRenderCommand())
cmd.AddCommand(webhookoperatorcmd.NewOperator())

err := cmd.Execute()
if err != nil {
Expand Down
34 changes: 34 additions & 0 deletions manifests/01-cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,40 @@ rules:
- list
- watch
- update
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
- update
- apiGroups:
- admissionregistration.k8s.io
resources:
- mutatingwebhookconfigurations
verbs:
- "*"
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterroles
- clusterrolebindings
verbs:
- "*"
- apiGroups:
- authentication.k8s.io
resources:
- tokenreviews
verbs:
- create
- apiGroups:
- authorization.k8s.io
resources:
- subjectaccessreviews
verbs:
- create
- apiGroups:
- operator.openshift.io
resources:
Expand Down
15 changes: 0 additions & 15 deletions manifests/01-webhook-cluster-role-binding.yaml

This file was deleted.

86 changes: 0 additions & 86 deletions manifests/01-webhook-cluster-role.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions manifests/01-webhook-role-binding.yaml

This file was deleted.

49 changes: 0 additions & 49 deletions manifests/01-webhook-role.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions manifests/02-webhook-sa.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions manifests/03-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ spec:
env:
- name: RELEASE_VERSION
value: 0.0.1-snapshot
- name: AZURE_POD_IDENTITY_WEBHOOK_IMAGE
value: quay.io/openshift/azure-workload-identity-webhook:latest
- name: AWS_POD_IDENTITY_WEBHOOK_IMAGE
value: quay.io/openshift/aws-pod-identity-webhook:latest
image: quay.io/openshift/origin-cloud-credential-operator:latest
imagePullPolicy: IfNotPresent
name: cloud-credential-operator
Expand Down
118 changes: 0 additions & 118 deletions manifests/03-webhook-deployment.yaml

This file was deleted.