feat: labels, package name

patrickleet · patrickleet · commit 188c6eb6d44c · 2026-01-07T13:40:01.000-06:00
diff --git a/.gitops/deploy/Chart.yaml b/.gitops/deploy/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: configuration-aws-irsa
+name: aws-account
 version: 0.0.0
-description: A Helm chart for my application
-appVersion: v1.19.0
+description: GitOps packaging for the aws-account bundle
+appVersion: v0.1.0
diff --git a/.gitops/deploy/templates/config.yaml b/.gitops/deploy/templates/config.yaml
@@ -1,23 +1,21 @@
 apiVersion: pkg.crossplane.io/v1
 kind: Configuration
 metadata:
-  name: configuration-aws-irsa
+  name: aws-account
 spec:
-  package: ghcr.io/hops-ops/configuration-aws-irsa:{{ .Values.version }}
+  package: ghcr.io/hops-ops/aws-account:{{ .Values.version }}
   packagePullSecrets:
     - name: ghcr
   skipDependencyResolution: {{ .Values.skipDependencyResolution }}
 
 ---
 
-# skipDependencyResolution false would have named this hops-ops-configuration-aws-irsarender
-# so we need to match that format to avoid issues with the package name
 apiVersion: pkg.crossplane.io/v1
 kind: Function
 metadata:
-  name: hops-ops-configuration-aws-irsarender
+  name: hops-ops-aws-accountrender
 spec:
-  package: ghcr.io/hops-ops/configuration-aws-irsa_render:{{ .Values.version }}
+  package: ghcr.io/hops-ops/aws-account_render:{{ .Values.version }}
   packagePullSecrets:
     - name: ghcr
   skipDependencyResolution: {{ .Values.skipDependencyResolution }}
diff --git a/AGENTS.md b/AGENTS.md
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-PACKAGE ?= configuration-aws-account
+PACKAGE ?= aws-account
 XRD_DIR := apis/accounts
 COMPOSITION := $(XRD_DIR)/composition.yaml
 DEFINITION := $(XRD_DIR)/definition.yaml
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# configuration-aws-account
+# aws-account
 
 Create and manage individual AWS Organizations member accounts. This is a low-level building block - most users should use the Organization XRD with inline accounts instead.
 
diff --git a/apis/accounts/composition.yaml b/apis/accounts/composition.yaml
@@ -9,7 +9,7 @@ spec:
   mode: Pipeline
   pipeline:
   - functionRef:
-      name: hops-ops-configuration-aws-accountrender
+      name: hops-ops-aws-accountrender
     step: render
   - functionRef:
       name: crossplane-contrib-function-auto-ready
diff --git a/apis/accounts/configuration.yaml b/apis/accounts/configuration.yaml
@@ -1,10 +1,10 @@
 apiVersion: meta.pkg.crossplane.io/v1alpha1
 kind: Configuration
 metadata:
-  name: configuration-aws-account
+  name: aws-account
   annotations:
     meta.crossplane.io/maintainer: Patrick Lee Scott
-    meta.crossplane.io/source: github.com/hops-ops/configuration-aws-account
+    meta.crossplane.io/source: github.com/hops-ops/aws-account
     meta.crossplane.io/description: Vends AWS Organizations accounts, OU placement, and ProviderConfigs.
 spec:
   dependsOn:
diff --git a/apis/accounts/definition.yaml b/apis/accounts/definition.yaml
@@ -66,6 +66,12 @@ spec:
                 description: Optional list of Service Control Policy ARNs to attach to the account.
                 items:
                   type: string
+              labels:
+                type: object
+                description: Custom labels applied to all managed resources. Merged with default labels (hops.ops.com.ai/managed, hops.ops.com.ai/<kind>).
+                additionalProperties:
+                  type: string
+                x-kubernetes-preserve-unknown-fields: true
               tags:
                 type: object
                 description: "AWS resource tags. Automatically includes {\"hops\": \"true\"}."
diff --git a/functions/render/000-state-init.yaml.gotmpl b/functions/render/000-state-init.yaml.gotmpl
@@ -3,6 +3,12 @@
 {{- $metadata := $xr.metadata | default dict }}
 {{- $spec := $xr.spec | default dict }}
 
+{{- /* Default labels: managed=true + <kind>=<name> */}}
+{{- $defaultLabels := dict
+  "hops.ops.com.ai/managed" "true"
+  (printf "hops.ops.com.ai/%s" (lower $xr.kind)) $metadata.name
+}}
+
 {{- $state := dict
   "spec" (dict
     "raw" $spec
@@ -17,6 +23,7 @@
       )
       "managementPolicies" ($spec.managementPolicies | default (list "*"))
       "policyAttachments" ($spec.policyAttachments | default list)
+      "labels" (merge $defaultLabels ($spec.labels | default dict))
       "tags" (merge (dict "hops" "true") ($spec.tags | default dict))
       "forProvider" ($spec.forProvider | default dict)
     )
diff --git a/functions/render/005-state-account.yaml.gotmpl b/functions/render/005-state-account.yaml.gotmpl
@@ -11,6 +11,7 @@
   "externalName" $eff.externalName
   "providerConfig" $eff.providerConfigRef
   "managementPolicies" $eff.managementPolicies
+  "labels" $eff.labels
   "tags" $eff.tags
   "forProvider" $eff.forProvider
 }}
diff --git a/functions/render/100-account.yaml.gotmpl b/functions/render/100-account.yaml.gotmpl
@@ -5,9 +5,7 @@ apiVersion: organizations.aws.m.upbound.io/v1beta1
 kind: Account
 metadata:
   name: {{ $state.account.name }}
-  labels:
-    hops.ops.com.ai/managed: "true"
-    hops.ops.com.ai/account: {{ $state.account.name }}
+  labels: {{ $state.account.labels | toJson }}
   annotations:
     {{ setResourceNameAnnotation "member-account" }}
     {{- if $state.account.externalName }}
diff --git a/functions/render/200-scp-attachments.yaml.gotmpl b/functions/render/200-scp-attachments.yaml.gotmpl
@@ -7,9 +7,7 @@ apiVersion: organizations.aws.m.upbound.io/v1beta1
 kind: PolicyAttachment
 metadata:
   name: {{ $state.account.name }}-{{ $attachment.policyId }}
-  labels:
-    hops.ops.com.ai/managed: "true"
-    hops.ops.com.ai/account: {{ $state.account.name }}
+  labels: {{ $state.account.labels | toJson }}
   annotations:
     {{ setResourceNameAnnotation $attachment.resourceName }}
 spec:
diff --git a/tests/e2etest-account/kcl.mod.lock b/tests/e2etest-account/kcl.mod.lock
@@ -2,4 +2,11 @@
   [dependencies.model]
     name = "model"
     full_name = "models_0.0.1"
-    version = "0.0.1"
+    version = "0.0.1"
+    reg = "ghcr.io"
+    repo = "kcl-lang/model"
+    oci_tag = "0.0.1"
+  [dependencies.models]
+    name = "models"
+    full_name = "models_0.0.1"
+    version = "0.0.1"
diff --git a/upbound.yaml b/upbound.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# configuration-aws-account`
	`1`	`+# aws-account`
`2`	`2`
`3`	`3`	`Create and manage individual AWS Organizations member accounts. This is a low-level building block - most users should use the Organization XRD with inline accounts instead.`
`4`	`4`