rebrand: API group deploy.hanzo.ai -> apps.hanzo.ai

The CRD kind is Application, so apps.hanzo.ai reads naturally
(applications/applicationsets/appprojects.apps.hanzo.ai). Flips the group
constant (pkg/apis/application/register.go), all annotation/label/finalizer
domains (tracking-id, installation-id, secret-type, refresh, hydrate,
resources-finalizer, etc.), the node.Group check, and the 3 CRD manifests.
Module path github.com/hanzoai/deploy and hanzocd-* object names unchanged.

Co-authored-by: Hanzo Dev <[email protected]>

cmd/argocd-applicationset-controller/commands/applicationset_controller.go

@@ -169,7 +169,7 @@ func NewCommand() *cobra.Command {
 				Cache:                  cacheOpt,
 				HealthProbeBindAddress: probeBindAddr,
 				LeaderElection:         enableLeaderElection,
-				LeaderElectionID:       "58ac56fa.applicationsets.deploy.hanzo.ai",
+				LeaderElectionID:       "58ac56fa.applicationsets.apps.hanzo.ai",
 				Client: ctrlclient.Options{
 					DryRun: &dryRun,
 				},

common/common.go

@@ -191,13 +191,13 @@ const (
 	// LabelKeyAppName is the label key to use to uniquely identify the name of the Kubernetes application
 	LabelKeyAppName = "app.kubernetes.io/name"
 	// LabelKeyAutoLabelClusterInfo if set to true will automatically add extra labels from the cluster info (currently it only adds a k8s version label)
-	LabelKeyAutoLabelClusterInfo = "deploy.hanzo.ai/auto-label-cluster-info"
+	LabelKeyAutoLabelClusterInfo = "apps.hanzo.ai/auto-label-cluster-info"
 	// LabelKeyLegacyApplicationName is the legacy label (v0.10 and below) and is superseded by 'app.kubernetes.io/instance'
 	LabelKeyLegacyApplicationName = "applications.argoproj.io/app-name"
 	// LabelKeySecretType contains the type of argocd secret (currently: 'cluster', 'repository', 'repo-config' or 'repo-creds')
-	LabelKeySecretType = "deploy.hanzo.ai/secret-type"
+	LabelKeySecretType = "apps.hanzo.ai/secret-type"
 	// LabelKeyClusterKubernetesVersion contains the kubernetes version of the cluster secret if it has been enabled
-	LabelKeyClusterKubernetesVersion = "deploy.hanzo.ai/kubernetes-version"
+	LabelKeyClusterKubernetesVersion = "apps.hanzo.ai/kubernetes-version"
 	// LabelValueSecretTypeCluster indicates a secret type of cluster
 	LabelValueSecretTypeCluster = "cluster"
 	// LabelValueSecretTypeRepository indicates a secret type of repository
@@ -212,41 +212,41 @@ const (
 	LabelValueSecretTypeSCMCreds = "scm-creds"
 
 	// AnnotationKeyAppInstance is the Argo CD application name is used as the instance name
-	AnnotationKeyAppInstance = "deploy.hanzo.ai/tracking-id"
-	AnnotationInstallationID = "deploy.hanzo.ai/installation-id"
+	AnnotationKeyAppInstance = "apps.hanzo.ai/tracking-id"
+	AnnotationInstallationID = "apps.hanzo.ai/installation-id"
 
 	// AnnotationCompareOptions is a comma-separated list of options for comparison
-	AnnotationCompareOptions = "deploy.hanzo.ai/compare-options"
+	AnnotationCompareOptions = "apps.hanzo.ai/compare-options"
 
 	// AnnotationClientSideApplyMigrationManager specifies a custom field manager for client-side apply migration
-	AnnotationClientSideApplyMigrationManager = "deploy.hanzo.ai/client-side-apply-migration-manager"
+	AnnotationClientSideApplyMigrationManager = "apps.hanzo.ai/client-side-apply-migration-manager"
 
 	// AnnotationIgnoreHealthCheck when set on an Application's immediate child indicates that its health check
 	// can be disregarded.
-	AnnotationIgnoreHealthCheck = "deploy.hanzo.ai/ignore-healthcheck"
+	AnnotationIgnoreHealthCheck = "apps.hanzo.ai/ignore-healthcheck"
 
 	// AnnotationKeyManagedBy is annotation name which indicates that k8s resource is managed by an application.
 	AnnotationKeyManagedBy = "managed-by"
 	// AnnotationValueManagedByArgoCD is a 'managed-by' annotation value for resources managed by Argo CD
-	AnnotationValueManagedByArgoCD = "deploy.hanzo.ai"
+	AnnotationValueManagedByArgoCD = "apps.hanzo.ai"
 
 	// AnnotationKeyLinkPrefix tells the UI to add an external link icon to the application node
 	// that links to the value given in the annotation.
-	// The annotation key must be followed by a unique identifier. Ex: link.deploy.hanzo.ai/dashboard
+	// The annotation key must be followed by a unique identifier. Ex: link.apps.hanzo.ai/dashboard
 	// It's valid to have multiple annotations that match the prefix.
 	// Values can simply be a url or they can have
 	// an optional link title separated by a "|"
 	// Ex: "http://grafana.example.com/d/yu5UH4MMz/deployments"
 	// Ex: "Go to Dashboard|http://grafana.example.com/d/yu5UH4MMz/deployments"
-	AnnotationKeyLinkPrefix = "link.deploy.hanzo.ai/"
+	AnnotationKeyLinkPrefix = "link.apps.hanzo.ai/"
 	// AnnotationKeyIgnoreDefaultLinks tells the Application to not add autogenerated links from this object into its externalURLs
 	// This applies to ingress objects and takes effect if set to "true"
 	// This only disables the default behavior of generating links based on the ingress spec, and does not disable AnnotationKeyLinkPrefix
-	AnnotationKeyIgnoreDefaultLinks = "deploy.hanzo.ai/ignore-default-links"
+	AnnotationKeyIgnoreDefaultLinks = "apps.hanzo.ai/ignore-default-links"
 
 	// AnnotationKeyAppSkipReconcile tells the Application to skip the Application controller reconcile.
 	// Skip reconcile when the value is "true" or any other string values that can be strconv.ParseBool() to be true.
-	AnnotationKeyAppSkipReconcile = "deploy.hanzo.ai/skip-reconcile"
+	AnnotationKeyAppSkipReconcile = "apps.hanzo.ai/skip-reconcile"
 
 	// LabelKeyComponentRepoServer is the label key to identify the component as repo-server
 	LabelKeyComponentRepoServer = "app.kubernetes.io/component"
@@ -442,7 +442,7 @@ func GetCMPWorkDir() string {
 
 const (
 	// AnnotationApplicationSetRefresh is an annotation that is added when an ApplicationSet is requested to be refreshed by a webhook. The ApplicationSet controller will remove this annotation at the end of reconciliation.
-	AnnotationApplicationSetRefresh = "deploy.hanzo.ai/application-set-refresh"
+	AnnotationApplicationSetRefresh = "apps.hanzo.ai/application-set-refresh"
 )
 
 // gRPC settings

controller/cache/info.go

@@ -89,7 +89,7 @@ func populateNodeInfo(un *unstructured.Unstructured, res *ResourceInfo, customLa
 		case "Gateway":
 			populateGatewayInfo(un, res)
 		}
-	case "deploy.hanzo.ai":
+	case "apps.hanzo.ai":
 		if gvk.Kind == "Application" {
 			populateApplicationInfo(un, res)
 		}

hanzo.yml

@@ -19,8 +19,8 @@ test:
 
 # BUILD-ONLY for the hard-fork cutover: no `deploy:` block. The live `hanzo-cd`
 # namespace reconciles the whole Hanzo fleet (ArgoCD IS the deploy mechanism
-# for everything else), so the prod cutover — deploy.hanzo.ai CRDs + image swap
-# + re-homing every live Application from argoproj.io → deploy.hanzo.ai — is a
+# for everything else), so the prod cutover — apps.hanzo.ai CRDs + image swap
+# + re-homing every live Application from argoproj.io → apps.hanzo.ai — is a
 # deliberate, separately-greenlit action, never an auto-deploy on merge. See
 # universe: infra/k8s/hanzo-cd/ for the prepared-but-HELD swap. (Same
 # controlled build-only-first pattern as hanzoai/cms.)

manifests/base/application-controller-roles/argocd-application-controller-role.yaml

@@ -17,7 +17,7 @@ rules:
   - list
   - watch
 - apiGroups:
-  - deploy.hanzo.ai
+  - apps.hanzo.ai
   resources:
   - applications
   - applicationsets

manifests/base/applicationset-controller/argocd-applicationset-controller-role.yaml

@@ -8,7 +8,7 @@ metadata:
   name: argocd-applicationset-controller
 rules:
   - apiGroups:
-      - deploy.hanzo.ai
+      - apps.hanzo.ai
     resources:
       - applications
       - applicationsets
@@ -22,7 +22,7 @@ rules:
       - update
       - watch
   - apiGroups:
-      - deploy.hanzo.ai
+      - apps.hanzo.ai
     resources:
       - appprojects
     verbs:
@@ -30,7 +30,7 @@ rules:
       - list
       - watch
   - apiGroups:
-      - deploy.hanzo.ai
+      - apps.hanzo.ai
     resources:
       - applicationsets/status
     verbs:
@@ -70,7 +70,7 @@ rules:
       - leases
     resourceNames:
       # Defined in `cmd/argocd-applicationset-controller/commands/applicationset_controller.go`
-      - 58ac56fa.applicationsets.deploy.hanzo.ai
+      - 58ac56fa.applicationsets.apps.hanzo.ai
     verbs:
       - get
       - update

manifests/base/notification/argocd-notifications-controller-role.yaml

@@ -8,7 +8,7 @@ metadata:
   name: argocd-notifications-controller
 rules:
 - apiGroups:
-  - deploy.hanzo.ai
+  - apps.hanzo.ai
   resources:
   - applications
   - appprojects

manifests/base/server/argocd-server-role.yaml

@@ -21,7 +21,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - deploy.hanzo.ai
+  - apps.hanzo.ai
   resources:
   - applications
   - appprojects

manifests/cluster-rbac/applicationset-controller/argocd-applicationset-controller-clusterrole.yaml

@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/component: applicationset-controller
 rules:
   - apiGroups:
-      - deploy.hanzo.ai
+      - apps.hanzo.ai
     resources:
       - applications
       - applicationsets
@@ -22,7 +22,7 @@ rules:
       - update
       - watch
   - apiGroups:
-      - deploy.hanzo.ai
+      - apps.hanzo.ai
     resources:
       - appprojects
     verbs:
@@ -30,7 +30,7 @@ rules:
       - list
       - watch
   - apiGroups:
-      - deploy.hanzo.ai
+      - apps.hanzo.ai
     resources:
       - applicationsets/status
     verbs:
@@ -70,7 +70,7 @@ rules:
       - leases
     resourceNames:
       # Defined in `cmd/argocd-applicationset-controller/commands/applicationset_controller.go`
-      - 58ac56fa.applicationsets.deploy.hanzo.ai
+      - 58ac56fa.applicationsets.apps.hanzo.ai
     verbs:
       - get
       - update

manifests/cluster-rbac/server/argocd-server-clusterrole.yaml

@@ -35,7 +35,7 @@ rules:
   verbs:
   - get     # supports viewing pod logs from UI
 - apiGroups:
-  - "deploy.hanzo.ai"
+  - "apps.hanzo.ai"
   resources:
   - "applications"
   - "applicationsets"

manifests/crds/application-crd.yaml

@@ -2,11 +2,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    app.kubernetes.io/name: applications.deploy.hanzo.ai
+    app.kubernetes.io/name: applications.apps.hanzo.ai
     app.kubernetes.io/part-of: argocd
-  name: applications.deploy.hanzo.ai
+  name: applications.apps.hanzo.ai
 spec:
-  group: deploy.hanzo.ai
+  group: apps.hanzo.ai
   names:
     kind: Application
     listKind: ApplicationList

manifests/crds/applicationset-crd.yaml

@@ -2,11 +2,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    app.kubernetes.io/name: applicationsets.deploy.hanzo.ai
+    app.kubernetes.io/name: applicationsets.apps.hanzo.ai
     app.kubernetes.io/part-of: argocd
-  name: applicationsets.deploy.hanzo.ai
+  name: applicationsets.apps.hanzo.ai
 spec:
-  group: deploy.hanzo.ai
+  group: apps.hanzo.ai
   names:
     kind: ApplicationSet
     listKind: ApplicationSetList

manifests/crds/appproject-crd.yaml

@@ -2,11 +2,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    app.kubernetes.io/name: appprojects.deploy.hanzo.ai
+    app.kubernetes.io/name: appprojects.apps.hanzo.ai
     app.kubernetes.io/part-of: argocd
-  name: appprojects.deploy.hanzo.ai
+  name: appprojects.apps.hanzo.ai
 spec:
-  group: deploy.hanzo.ai
+  group: apps.hanzo.ai
   names:
     kind: AppProject
     listKind: AppProjectList

pkg/apis/application/register.go

@@ -2,7 +2,7 @@ package application
 
 const (
 	// API Group
-	Group string = "deploy.hanzo.ai"
+	Group string = "apps.hanzo.ai"
 
 	// Application constants
 	ApplicationKind      string = "Application"

pkg/apis/application/v1alpha1/application_annotations.go

@@ -3,14 +3,14 @@ package v1alpha1
 const (
 	// AnnotationKeyRefresh is the annotation key which indicates that app needs to be refreshed. Removed by application controller after app is refreshed.
 	// Might take values 'normal'/'hard'. Value 'hard' means manifest cache and target cluster state cache should be invalidated before refresh.
-	AnnotationKeyRefresh string = "deploy.hanzo.ai/refresh"
+	AnnotationKeyRefresh string = "apps.hanzo.ai/refresh"
 	// AnnotationKeyHydrate is the annotation key which indicates that app needs to be hydrated. Removed by application controller after app is hydrated.
-	AnnotationKeyHydrate string = "deploy.hanzo.ai/hydrate"
+	AnnotationKeyHydrate string = "apps.hanzo.ai/hydrate"
 	// AnnotationKeyManifestGeneratePaths is an annotation that contains a list of semicolon-separated paths in the
 	// manifests repository that affects the manifest generation. Paths might be either relative or absolute. The
 	// absolute path means an absolute path within the repository and the relative path is relative to the application
 	// source path within the repository.
-	AnnotationKeyManifestGeneratePaths = "deploy.hanzo.ai/manifest-generate-paths"
+	AnnotationKeyManifestGeneratePaths = "apps.hanzo.ai/manifest-generate-paths"
 	// AnnotationKeyManagedByURL contains the URL of the Hanzo CD instance managing the application
-	AnnotationKeyManagedByURL = "deploy.hanzo.ai/managed-by-url"
+	AnnotationKeyManagedByURL = "apps.hanzo.ai/managed-by-url"
 )

pkg/apis/application/v1alpha1/application_defaults.go

@@ -7,19 +7,19 @@ const (
 	DefaultSyncRetryDuration    time.Duration = 5000000000   // 5s
 	DefaultSyncRetryFactor                    = int64(2)
 	// ResourcesFinalizerName is the finalizer value which we inject to finalize deletion of an application
-	ResourcesFinalizerName string = "resources-finalizer.deploy.hanzo.ai"
+	ResourcesFinalizerName string = "resources-finalizer.apps.hanzo.ai"
 
 	// PreDeleteFinalizerName is the finalizer that controls pre-delete hooks execution
-	PreDeleteFinalizerName string = "pre-delete-finalizer.deploy.hanzo.ai"
+	PreDeleteFinalizerName string = "pre-delete-finalizer.apps.hanzo.ai"
 
 	// PostDeleteFinalizerName is the finalizer that controls post-delete hooks execution
-	PostDeleteFinalizerName string = "post-delete-finalizer.deploy.hanzo.ai"
+	PostDeleteFinalizerName string = "post-delete-finalizer.apps.hanzo.ai"
 
 	// ForegroundPropagationPolicyFinalizer is the finalizer we inject to delete application with foreground propagation policy
-	ForegroundPropagationPolicyFinalizer string = "resources-finalizer.deploy.hanzo.ai/foreground"
+	ForegroundPropagationPolicyFinalizer string = "resources-finalizer.apps.hanzo.ai/foreground"
 
 	// BackgroundPropagationPolicyFinalizer is the finalizer we inject to delete application with background propagation policy
-	BackgroundPropagationPolicyFinalizer = "resources-finalizer.deploy.hanzo.ai/background"
+	BackgroundPropagationPolicyFinalizer = "resources-finalizer.apps.hanzo.ai/background"
 
 	// DefaultAppProjectName contains name of 'default' app project, which is available in every Hanzo CD installation
 	DefaultAppProjectName = "default"

pkg/apis/application/v1alpha1/types.go

@@ -2150,7 +2150,7 @@ func (t *ApplicationTree) GetSummary(app *Application) ApplicationSummary {
 		for _, image := range node.Images {
 			imagesSet[image] = true
 		}
-		if node.Group == "deploy.hanzo.ai" && node.Kind == "Application" {
+		if node.Group == "apps.hanzo.ai" && node.Kind == "Application" {
 			appOfApps = true
 		}
 	}

pkg/client/informers/externalversions/application/v1alpha1/application.go

@@ -48,7 +48,7 @@ func NewFilteredApplicationInformer(client versioned.Interface, namespace string
 // Always prefer using an informer factory to get a shared informer instead of getting an independent
 // one. This reduces memory footprint and number of connections to the server.
 func NewApplicationInformerWithOptions(client versioned.Interface, namespace string, options internalinterfaces.InformerOptions) cache.SharedIndexInformer {
-	gvr := schema.GroupVersionResource{Group: "deploy.hanzo.ai", Version: "v1alpha1", Resource: "applications"}
+	gvr := schema.GroupVersionResource{Group: "apps.hanzo.ai", Version: "v1alpha1", Resource: "applications"}
 	identifier := options.InformerName.WithResource(gvr)
 	tweakListOptions := options.TweakListOptions
 	return cache.NewSharedIndexInformerWithOptions(

pkg/client/informers/externalversions/application/v1alpha1/applicationset.go

@@ -48,7 +48,7 @@ func NewFilteredApplicationSetInformer(client versioned.Interface, namespace str
 // Always prefer using an informer factory to get a shared informer instead of getting an independent
 // one. This reduces memory footprint and number of connections to the server.
 func NewApplicationSetInformerWithOptions(client versioned.Interface, namespace string, options internalinterfaces.InformerOptions) cache.SharedIndexInformer {
-	gvr := schema.GroupVersionResource{Group: "deploy.hanzo.ai", Version: "v1alpha1", Resource: "applicationsets"}
+	gvr := schema.GroupVersionResource{Group: "apps.hanzo.ai", Version: "v1alpha1", Resource: "applicationsets"}
 	identifier := options.InformerName.WithResource(gvr)
 	tweakListOptions := options.TweakListOptions
 	return cache.NewSharedIndexInformerWithOptions(

pkg/client/informers/externalversions/application/v1alpha1/appproject.go

@@ -48,7 +48,7 @@ func NewFilteredAppProjectInformer(client versioned.Interface, namespace string,
 // Always prefer using an informer factory to get a shared informer instead of getting an independent
 // one. This reduces memory footprint and number of connections to the server.
 func NewAppProjectInformerWithOptions(client versioned.Interface, namespace string, options internalinterfaces.InformerOptions) cache.SharedIndexInformer {
-	gvr := schema.GroupVersionResource{Group: "deploy.hanzo.ai", Version: "v1alpha1", Resource: "appprojects"}
+	gvr := schema.GroupVersionResource{Group: "apps.hanzo.ai", Version: "v1alpha1", Resource: "appprojects"}
 	identifier := options.InformerName.WithResource(gvr)
 	tweakListOptions := options.TweakListOptions
 	return cache.NewSharedIndexInformerWithOptions(

server/application/application.go

@@ -204,7 +204,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa
 		if apierrors.IsNotFound(err) {
 			if project != "" {
 				// We know that the user was allowed to get the Application, but the Application does not exist. Return 404.
-				return nil, nil, status.Error(codes.NotFound, apierrors.NewNotFound(schema.GroupResource{Group: "deploy.hanzo.ai", Resource: "applications"}, name).Error())
+				return nil, nil, status.Error(codes.NotFound, apierrors.NewNotFound(schema.GroupResource{Group: "apps.hanzo.ai", Resource: "applications"}, name).Error())
 			}
 			// We don't know if the user was allowed to get the Application, and we don't want to leak information about
 			// the Application's existence. Return 403.
@@ -226,7 +226,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa
 			// The user specified a project. We would have returned a 404 if the user had access to the app, but the app
 			// did not exist. So we have to return a 404 when the app does exist, but the user does not have access.
 			// Otherwise, they could infer that the app exists based on the error code.
-			return nil, nil, status.Error(codes.NotFound, apierrors.NewNotFound(schema.GroupResource{Group: "deploy.hanzo.ai", Resource: "applications"}, name).Error())
+			return nil, nil, status.Error(codes.NotFound, apierrors.NewNotFound(schema.GroupResource{Group: "apps.hanzo.ai", Resource: "applications"}, name).Error())
 		}
 		// The user didn't specify a project. We always return permission denied for both lack of access and lack of
 		// existence.
@@ -243,7 +243,7 @@ func (s *Server) getAppEnforceRBAC(ctx context.Context, action, project, namespa
 		}).Warnf("user tried to %s application in project %s, but the application is in project %s", action, project, effectiveProject)
 		// The user has access to the app, but the app is in a different project. Return 404, meaning "app doesn't
 		// exist in that project".
-		return nil, nil, status.Error(codes.NotFound, apierrors.NewNotFound(schema.GroupResource{Group: "deploy.hanzo.ai", Resource: "applications"}, name).Error())
+		return nil, nil, status.Error(codes.NotFound, apierrors.NewNotFound(schema.GroupResource{Group: "apps.hanzo.ai", Resource: "applications"}, name).Error())
 	}
 	// Get the app's associated project, and make sure all project restrictions are enforced.
 	proj, err := s.getAppProject(ctx, a, logCtx)