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.

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

Jump to bottom

Remove MINIO_ENDPOINTS env var #1111

Merged
merged 1 commit into from
May 6, 2022
Merged

Remove MINIO_ENDPOINTS env var #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions pkg/controller/cluster/main-controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,8 @@ func (c *Controller) syncHandler(key string) error {
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "PoolCreated", fmt.Sprintf("Tenant pool %s created", pool.Name))
// Report the pool is properly created
tenant.Status.Pools[i].State = miniov2.PoolCreated
// mark we are adding a new pool to the next block can act accordingly
addingNewPool = true
// push updates to status
if tenant, err = c.updatePoolStatus(ctx, tenant); err != nil {
return err
Expand Down Expand Up @@ -901,6 +903,7 @@ func (c *Controller) syncHandler(key string) error {
if initializedPool.Name != "" && addingNewPool {
// Restart services to get new args since we are expanding the deployment here.
if err := c.restartInitializedPool(ctx, tenant, initializedPool, tenantConfiguration); err != nil {
klog.Infof("'%s' restart call failed", key)
return err
}
metaNowTime := metav1.Now()
Expand Down
4 changes: 0 additions & 4 deletions pkg/resources/statefulsets/minio-statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ func minioEnvironmentVars(t *miniov2.Tenant, wsSecret *v1.Secret, hostsTemplate
Key: miniov2.WebhookMinIOArgs,
},
},
}, corev1.EnvVar{
// Add a fallback in-case operator is down.
Name: "MINIO_ENDPOINTS",
Value: strings.Join(GetContainerArgs(t, hostsTemplate), " "),
}, corev1.EnvVar{
Name: "MINIO_OPERATOR_VERSION",
Value: opVersion,
Expand Down