Skip to content

fix: update team-operator Helm values for helm/v2-alpha chart #132

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

Draft
ian-flores wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: update team-operator Helm values for helm/v2-alpha chart #132

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
2 changes: 1 addition & 1 deletion python-pulumi/src/ptd/pulumi_resources/aws_workload_clusters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ def _define_team_operator_iam(self):
self.team_operator_roles = {}

# Service account name must match the Helm chart default (team-operator-controller-manager)
# This is set in team-operator/dist/chart/values.yaml under controllerManager.serviceAccountName
# This is generated by the team-operator chart's _helpers.tpl resourceName function
helm_service_account_name = "team-operator-controller-manager"

for release in self.managed_clusters_by_release:
Expand Down
34 changes: 13 additions & 21 deletions python-pulumi/src/ptd/pulumi_resources/team_operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,41 +243,33 @@ def _build_migration_script(self, namespace: str) -> str:

def _define_helm_release(self):
# Parse self.image (from _define_image) into repository and tag
# Format is either "repo@sha256:digest" or "repo:tag"
if "@" in self.image:
# Image with digest: "hostname/repo@sha256:abc123"
image_repository, image_tag = self.image.rsplit("@", 1)
image_tag = f"@{image_tag}" # Helm needs the @ prefix for digests
elif ":" in self.image.split("/")[-1]:
# Format: "repo:tag" (digest-based images are not supported)
if ":" in self.image.split("/")[-1]:
# Image with tag: "hostname/repo:tag"
image_repository, image_tag = self.image.rsplit(":", 1)
else:
# No tag specified, use latest
image_repository = self.image
image_tag = "latest"

# Build environment variables
env_vars = {
"WATCH_NAMESPACES": ptd.POSIT_TEAM_NAMESPACE,
}
# Build environment variables (list format for helm/v2-alpha chart)
env_vars = [
{"name": "WATCH_NAMESPACES", "value": ptd.POSIT_TEAM_NAMESPACE},
]

# Add AWS_REGION if we have a region configured
if self.workload.cfg.region:
env_vars["AWS_REGION"] = self.workload.cfg.region
env_vars.append({"name": "AWS_REGION", "value": self.workload.cfg.region})

# Helm values for the team-operator chart
# Helm values for the team-operator chart (helm/v2-alpha structure)
helm_values = {
"controllerManager": {
"manager": {
"replicas": 1,
"container": {
"image": {
"repository": image_repository,
"tag": image_tag,
},
"env": env_vars,
"image": {
"repository": image_repository,
"tag": image_tag,
},
# Use default serviceAccountName from chart (team-operator-controller-manager)
# to match existing kustomize resources for seamless migration
"env": env_vars,
"serviceAccount": {
"annotations": self.service_account_annotations,
},
Expand Down
Loading