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

mounting Operator CA in minio not longer required #1847

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ nancy
examples/.DS_Store
testing/openshift/bundle/*
examples/**/obj/
.idea
.idea
public.crt
go_build_operator_
operator.iml
17 changes: 0 additions & 17 deletions pkg/resources/statefulsets/minio-statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,6 @@ func NewPool(args *NewPoolArgs) *appsv1.StatefulSet {
serviceName := args.ServiceName
hostsTemplate := args.HostsTemplate
operatorVersion := args.OperatorVersion
operatorCATLS := args.OperatorCATLS
operatorImage := args.OperatorImage

var podVolumes []corev1.Volume
Expand Down Expand Up @@ -673,22 +672,6 @@ func NewPool(args *NewPoolArgs) *appsv1.StatefulSet {
})
}

if operatorCATLS {
// Mount Operator CA TLS certificate to MinIO ~/cert/CAs
operatorCATLSSecretName := "operator-ca-tls"
certVolumeSources = append(certVolumeSources, []corev1.VolumeProjection{
{
Secret: &corev1.SecretProjection{
LocalObjectReference: corev1.LocalObjectReference{
Name: operatorCATLSSecretName,
},
Items: []corev1.KeyToPath{
{Key: "public.crt", Path: "CAs/operator-ca.crt"},
},
},
},
}...)
}
// If KES is enable mount TLS certificate secrets
if t.HasKESEnabled() {
// External Client certificates will have priority over AutoCert generated certificates
Expand Down