Skip to content

Add project group to Kubernetes agent auth context #1171

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

Open
eddymoulton wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add project group to Kubernetes agent auth context #1171

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
10 changes: 9 additions & 1 deletion source/Octopus.Tentacle.Contracts/KubernetesAgentAuthContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,25 @@ namespace Octopus.Tentacle.Contracts
{
public class KubernetesAgentAuthContext
{
public KubernetesAgentAuthContext(string spaceSlug, string projectSlug, string environmentSlug, string? tenantSlug, string stepSlug)
public KubernetesAgentAuthContext(
string spaceSlug,
string projectSlug,
string? projectGroupSlug,
string environmentSlug,
string? tenantSlug,
string stepSlug)
{
SpaceSlug = spaceSlug;
ProjectSlug = projectSlug;
ProjectGroupSlug = projectGroupSlug;
EnvironmentSlug = environmentSlug;
TenantSlug = tenantSlug;
StepSlug = stepSlug;
}

public string SpaceSlug { get; }
public string ProjectSlug { get; }
public string? ProjectGroupSlug { get; } // This is only nullable for backwards compatibility
public string EnvironmentSlug { get; }
public string? TenantSlug { get; }
public string StepSlug { get; }
Expand Down
10 changes: 8 additions & 2 deletions source/Octopus.Tentacle/Kubernetes/KubernetesScriptPodCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Newtonsoft.Json;
using Octopus.Tentacle.Configuration;
using Octopus.Tentacle.Configuration.Instances;
using Octopus.Tentacle.Contracts;
using Octopus.Tentacle.Contracts.KubernetesScriptServiceV1;
using Octopus.Tentacle.Core.Diagnostics;
using Octopus.Tentacle.Core.Services.Scripts.Locking;
Expand Down Expand Up @@ -434,7 +433,7 @@ V1Affinity ParseScriptPodAffinity(InMemoryTentacleScriptLog tentacleScriptLog)
KubernetesConfig.PodAnnotationsJsonVariableName,
"pod annotations");

Dictionary<string, string>? GetScriptPodAnnotations(InMemoryTentacleScriptLog tentacleScriptLog, StartKubernetesScriptCommandV1 command)
Dictionary<string, string> GetScriptPodAnnotations(InMemoryTentacleScriptLog tentacleScriptLog, StartKubernetesScriptCommandV1 command)
{
var annotations = ParseScriptPodAnnotations(tentacleScriptLog) ?? new Dictionary<string, string>();
annotations.AddRange(GetAuthContext(command));
Expand Down Expand Up @@ -478,6 +477,13 @@ static Dictionary<string, string> GetAuthContext(StartKubernetesScriptCommandV1
? HashValue(command.AuthContext.ProjectSlug)
: command.AuthContext.ProjectSlug;

if (command.AuthContext.ProjectGroupSlug is not null)
{
dict[$"{KubernetesConfig.AgentLabelNamespace}/project-group"] = hash
? HashValue(command.AuthContext.ProjectGroupSlug)
: command.AuthContext.ProjectGroupSlug;
}

dict[$"{KubernetesConfig.AgentLabelNamespace}/environment"] = hash
? HashValue(command.AuthContext.EnvironmentSlug)
: command.AuthContext.EnvironmentSlug;
Expand Down