Skip to content
This repository has been archived by the owner on May 14, 2022. It is now read-only.

Commit

Permalink
Remove the pod V0 builder classes (#1222)
Browse files Browse the repository at this point in the history
* Remove the pod V0 builder classes

* Add the POD_LABEL_RELOCATION_BINPACK label in V1 spec pod
  • Loading branch information
tbak authored Feb 17, 2022
1 parent 74ee5d3 commit 21fb6d9
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 1,227 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,4 @@ public interface KubePodConfiguration {
* @return the pod spec target region to use
*/
String getTargetRegion();

/**
* @return the pod spec routing rules to use.
*/
@DefaultValue("v0")
String getDefaultPodSpecVersion();

/**
* @return the pod spec routing rules to use.
*/
@DefaultValue("")
String getPodSpecVersionRoutingRules();
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
package com.netflix.titus.master.kubernetes.pod;

import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.inject.Singleton;

import com.google.inject.AbstractModule;
Expand Down Expand Up @@ -48,7 +46,6 @@
import com.netflix.titus.master.kubernetes.pod.taint.TaintTolerationFactory;
import com.netflix.titus.master.kubernetes.pod.topology.DefaultTopologyFactory;
import com.netflix.titus.master.kubernetes.pod.topology.TopologyFactory;
import com.netflix.titus.master.kubernetes.pod.v0.V0SpecPodFactory;
import com.netflix.titus.master.kubernetes.pod.v1.V1SpecPodFactory;
import com.netflix.titus.master.mesos.MesosConfiguration;
import com.netflix.titus.master.service.management.ApplicationSlaManagementService;
Expand All @@ -59,7 +56,7 @@ public class KubePodModule extends AbstractModule {

@Override
protected void configure() {
bind(PodFactory.class).to(RouterPodFactory.class);
bind(PodFactory.class).to(V1SpecPodFactory.class);
bind(ContainerResultCodeResolver.class).to(DefaultContainerResultCodeResolver.class);
bind(PodAffinityFactory.class).to(DefaultPodAffinityFactory.class);
bind(TaintTolerationFactory.class).to(DefaultTaintTolerationFactory.class);
Expand Down Expand Up @@ -112,15 +109,4 @@ public ContainerEnvFactory getContainerEnvFactory(TitusRuntime titusRuntime) {
UserProvidedContainerEnvFactory.getInstance(),
TitusProvidedContainerEnvFactory.getInstance());
}

@Provides
@Singleton
public RouterPodFactory getRouterPodFactory(KubePodConfiguration configuration,
V0SpecPodFactory v0SpecPodFactory,
V1SpecPodFactory v1SpecPodFactory) {
Map<String, PodFactory> versionedPodFactories = new LinkedHashMap<>();
versionedPodFactories.put("v0", v0SpecPodFactory);
versionedPodFactories.put("v1", v1SpecPodFactory);
return new RouterPodFactory(configuration, versionedPodFactories);
}
}

This file was deleted.

Loading

0 comments on commit 21fb6d9

Please sign in to comment.