Skip to content

Bug 1946479: manifests: use manual service account mounts #531

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 3 commits into from
Jun 9, 2021
Merged

Bug 1946479: manifests: use manual service account mounts #531

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a876a7a
manifests: use manual SA mounts
s-urbaniak Jun 8, 2021
247d887
go.mod: bump library-go
s-urbaniak Jun 8, 2021
a15239e
pkg/operator: fix signatures in new library-go
s-urbaniak Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
pkg/operator: fix signatures in new library-go
  • Loading branch information
@s-urbaniak
s-urbaniak committed Jun 9, 2021
commit a15239e81730053a77598b0b58f5a3c1436ea044
9 changes: 5 additions & 4 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
"github.com/openshift/library-go/pkg/operator/staleconditions"
"github.com/openshift/library-go/pkg/operator/staticpod"
"github.com/openshift/library-go/pkg/operator/staticpod/controller/installer"
"github.com/openshift/library-go/pkg/operator/staticpod/controller/revision"
"github.com/openshift/library-go/pkg/operator/staticresourcecontroller"
"github.com/openshift/library-go/pkg/operator/status"
Expand Down Expand Up @@ -127,8 +128,8 @@ func RunOperator(ctx context.Context, cc *controllercmd.ControllerContext) error
WithEvents(cc.EventRecorder).
WithInstaller([]string{"cluster-kube-controller-manager-operator", "installer"}).
WithPruning([]string{"cluster-kube-controller-manager-operator", "prune"}, "kube-controller-manager-pod").
WithResources(operatorclient.TargetNamespace, "kube-controller-manager", deploymentConfigMaps, deploymentSecrets).
WithCerts("kube-controller-manager-certs", CertConfigMaps, CertSecrets).
WithRevisionedResources(operatorclient.TargetNamespace, "kube-controller-manager", deploymentConfigMaps, deploymentSecrets).
WithUnrevisionedCerts("kube-controller-manager-certs", CertConfigMaps, CertSecrets).
WithVersioning("kube-controller-manager", versionRecorder).
ToControllers()
if err != nil {
Expand Down Expand Up @@ -233,15 +234,15 @@ var deploymentSecrets = []revision.RevisionResource{
{Name: "localhost-recovery-client-token"},
}

var CertConfigMaps = []revision.RevisionResource{
var CertConfigMaps = []installer.UnrevisionedResource{
{Name: "aggregator-client-ca"},
{Name: "client-ca"},

// this is a copy of trusted-ca-bundle CM but with key modified to "tls-ca-bundle.pem" so that we can mount it the way we need
{Name: "trusted-ca-bundle", Optional: true},
}

var CertSecrets = []revision.RevisionResource{
var CertSecrets = []installer.UnrevisionedResource{
{Name: "kube-controller-manager-client-cert-key"},
{Name: "csr-signer"},
}