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

feat(provider/kubernetes): Attach k8s annotation monikers to v2 resources #1917

Merged
merged 1 commit into from
Sep 20, 2017
Merged

feat(provider/kubernetes): Attach k8s annotation monikers to v2 resources #1917

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...roovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/view/model/KubernetesV2Cluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.netflix.spinnaker.clouddriver.model.Cluster;
import com.netflix.spinnaker.clouddriver.model.LoadBalancer;
import com.netflix.spinnaker.clouddriver.model.ServerGroup;
import com.netflix.spinnaker.moniker.Moniker;
import lombok.Data;

import java.util.HashSet;
Expand All @@ -29,6 +30,7 @@
@Data
public class KubernetesV2Cluster implements Cluster {
String name;
Moniker moniker;
String type;
String accountName;
Set<ServerGroup> serverGroups = new HashSet<>();
Expand All @@ -37,5 +39,6 @@ public class KubernetesV2Cluster implements Cluster {
public KubernetesV2Cluster(Keys.ClusterCacheKey key) {
this.name = key.getName();
this.accountName = key.getAccount();
this.moniker = Moniker.builder().cluster(name).build(); // TODO(lwander) if it turns out that cluster -> app is important, enforce constraints here.
}
}
5 changes: 4 additions & 1 deletion ...oovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/view/model/KubernetesV2Instance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package com.netflix.spinnaker.clouddriver.kubernetes.v2.view.model;

import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesManifest;
import com.netflix.spinnaker.clouddriver.model.HealthState;
import com.netflix.spinnaker.clouddriver.model.Instance;
Expand All @@ -36,8 +37,10 @@ public class KubernetesV2Instance extends ManifestBasedModel implements Instance
Long launchTime;
List<Map<String, String>> health = new ArrayList<>();
KubernetesManifest manifest;
Keys.InfrastructureCacheKey key;

public KubernetesV2Instance(KubernetesManifest manifest) {
public KubernetesV2Instance(KubernetesManifest manifest, String key) {
this.manifest = manifest;
this.key = (Keys.InfrastructureCacheKey) Keys.parseKey(key).get();
}
}
5 changes: 4 additions & 1 deletion .../com/netflix/spinnaker/clouddriver/kubernetes/v2/view/model/KubernetesV2LoadBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package com.netflix.spinnaker.clouddriver.kubernetes.v2.view.model;

import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesManifest;
import com.netflix.spinnaker.clouddriver.model.LoadBalancer;
import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup;
Expand All @@ -32,8 +33,10 @@ public class KubernetesV2LoadBalancer extends ManifestBasedModel implements Load
String account;
Set<LoadBalancerServerGroup> serverGroups = new HashSet<>();
KubernetesManifest manifest;
Keys.InfrastructureCacheKey key;

public KubernetesV2LoadBalancer(KubernetesManifest manifest) {
public KubernetesV2LoadBalancer(KubernetesManifest manifest, String key) {
this.manifest = manifest;
this.key = (Keys.InfrastructureCacheKey) Keys.parseKey(key).get();
}
}
5 changes: 4 additions & 1 deletion ...y/com/netflix/spinnaker/clouddriver/kubernetes/v2/view/model/KubernetesV2ServerGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package com.netflix.spinnaker.clouddriver.kubernetes.v2.view.model;

import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesManifest;
import com.netflix.spinnaker.clouddriver.model.Instance;
import com.netflix.spinnaker.clouddriver.model.ServerGroup;
Expand All @@ -43,13 +44,15 @@ public class KubernetesV2ServerGroup extends ManifestBasedModel implements Serve
ImageSummary imageSummary;
ImagesSummary imagesSummary;
KubernetesManifest manifest;
Keys.InfrastructureCacheKey key;

@Override
public Boolean isDisabled() {
return disabled;
}

public KubernetesV2ServerGroup(KubernetesManifest manifest) {
public KubernetesV2ServerGroup(KubernetesManifest manifest, String key) {
this.manifest = manifest;
this.key = (Keys.InfrastructureCacheKey) Keys.parseKey(key).get();
}
}
16 changes: 16 additions & 0 deletions ...groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/view/model/ManifestBasedModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
package com.netflix.spinnaker.clouddriver.kubernetes.v2.view.model;

import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesManifest;
import com.netflix.spinnaker.clouddriver.names.NamerRegistry;
import com.netflix.spinnaker.moniker.Moniker;

abstract public class ManifestBasedModel {
public String getName() {
Expand Down Expand Up @@ -47,5 +50,18 @@ public String getProviderType() {
return KubernetesCloudProvider.getID();
}

public Moniker getMoniker() {
return NamerRegistry.lookup()
.withProvider(KubernetesCloudProvider.getID())
.withAccount(getAccountName())
.withResource(KubernetesManifest.class)
.deriveMoniker(getManifest());
}

public String getAccountName() {
return getKey().getAccount();
}

abstract protected KubernetesManifest getManifest();
abstract protected Keys.InfrastructureCacheKey getKey();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this new abstract method needs to be implemented in a couple of more classes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah whoops thanks

}