mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
41536738c8
* feat(api): hard-fork CRD API group argoproj.io -> deploy.hanzo.ai
Hanzo CD hard-fork, phase 1.1. Single source of truth is
pkg/apis/application/register.go's Group constant (Application/AppProject/
ApplicationSet all derive their FullName from it); every other Go call-site
that hardcoded the literal group string is updated to match: the 3 generated
informer GVRs, the app-of-apps nested-Application detector in types.go, the
resource-tree Application-kind cache populator, the 3 NotFound error
constructors in server/application, and the applicationset-controller's
leader-election Lease name/ID (kept in lockstep across Go source + RBAC
resourceNames, or leader election would get RBAC-denied on startup).
CRD YAMLs (application/appproject/applicationset) and every RBAC apiGroups
rule that actually governs our 3 CRDs are repointed to deploy.hanzo.ai, across
both manifests/base/* (namespaced Roles) and manifests/cluster-rbac/* (cluster
scope). Two adjacent things that share the "argoproj.io" string but are NOT
ours are deliberately left untouched: gitops-engine's health-check dispatch
for Argo Workflows' `Workflow` kind, and argocd-server-clusterrole's second
apiGroups block granting read on Argo Workflows' `workflows` resource — both
belong to a separate, unrelated Argoproj-family project we are not forking.
Also untouched, per explicit scope: annotation/label keys (argocd.argoproj.io/*)
and finalizers (*.argoproj.io) that track already-applied live resources, and
argocd-cm.yaml's resource.customizations.ignoreResourceUpdates keys (a narrow
app-of-apps diffing nicety, not build- or RBAC-relevant).
CGO_ENABLED=0 go build ./... verified green.
* ci: wire canonical hanzo.yml + cicd.yml (Hanzo CD image build)
Phase 1.3. Follows the same one-way pattern every hanzo/lux/zoo repo uses:
hanzo.yml declares the image (root Dockerfile -> ghcr.io/hanzoai/deploy) and a
fast go-build sanity test (the multi-stage Dockerfile build is the slow, real
gate); cicd.yml is the ~10-line trigger shim importing hanzoai/ci's reusable
build workflow on the arc pool, secrets from KMS only.
No `deploy:` block yet, matching the hanzoai/cms build-only-first-cutover
pattern: this repo's own live hanzo-cd namespace runs the whole Hanzo fleet's
GitOps, so the prod image/CRD swap is a deliberate separate action (see the
[HELD] universe PR), never an automatic rollout on merge. Every PR/push still
builds and pushes an immutable ghcr.io/hanzoai/deploy:sha-<7>-amd64 image.
* feat(ui): rebrand Argo CD -> Hanzo CD (title, favicon, logo, sidebar)
Phase 1.2. User-facing "Argo CD"/"ArgoCD" text replaced with "Hanzo CD"
across the login page, help modal, settings screens, version-info panel,
sync-options warning, fullscreen-logs title, app.tsx page titles, and
index.html's <title>/noscript text (dropped the now-wrong upstream CLI
doc link rather than invent a hanzo.ai URL that doesn't exist).
Logo/favicon assets replaced with the canonical Hanzo mark (never
hand-drawn, copied from ~/work/hanzo/logo/dist): the two real usages of
Argo's logo collapse onto one Hanzo glyph (mono + white variants) at the
same 5 call sites (login icon + footer, login.scss $logoPath/
$logoNegativePath, sidebar text-logo), preserving the existing CSS
invert() filters so both the light login panel and dark sidebar still
render correctly. Old argologo.svg/argo_o.svg/argo.png deleted (no
longer referenced). favicon-{16x16,32x32}.png added at
ui/src/assets/favicon/ (index.html's links to that path were previously
dead - the directory didn't exist in this checkout). package.json name
argo-cd-ui -> hanzo-cd-ui.
Left alone, deliberately: the two Kubernetes resource-kind icon sets
under ui/src/assets/images/resources/ (unrelated to branding), and
upstream doc/project links (argoproj.io, argo-cd.readthedocs.io) since
we have no equivalent hanzo.ai docs to point to yet - except the login
footer logo's outbound link, which now points to hanzo.ai instead of
argoproj.io (a Hanzo-branded mark linking to the upstream project it
was forked from read as an obvious leftover).
* feat(module): rename Go module github.com/argoproj/argo-cd/v3 -> github.com/hanzoai/deploy
Phase 2. No version suffix on the new path (org policy: never publish our
own Go modules above v1.x.x / with a v2+ suffix) — this fork starts a fresh
v0/v1 module identity rather than carrying the v3 the upstream fork point
had reached.
Mechanical, symmetric rewrite: 704 .go files (import statements only; two
disjoint substitutions applied specific-first so the nested gitops-engine
module path never double-matches), plus go.mod (module line, the
gitops-engine require+replace pair, version reset to v0.0.0-... since a
suffix-less path can't carry a v3 semver), gitops-engine/go.mod, Makefile
(ldflags PACKAGE + 2 TEST_MODULE filters), .golangci.yaml, .goreleaser.yaml,
.mockery.yaml (+ gitops-engine's), Procfile, the codegen/proto generation
scripts (hack/generate-proto.sh, update-codegen.sh, update-openapi.sh), and
20 .proto files' go_package options. Also one OpenTelemetry tracer name
string in gitops-engine/pkg/sync/sync_context.go (a cosmestic label, not an
import, but worth keeping consistent).
CGO_ENABLED=0 go build ./... verified green for both the root module and
the nested gitops-engine module; go vet clean on both; go mod tidy run
(network available) to reconcile go.sum, dependency set unchanged.
Left alone, deliberately: doc-only mentions (docs/snyk/*.html scan reports,
gitops-engine/README.md), a comment-only reference in
.github/workflows/release.yaml, and one Renovate bot config line — none are
build- or codegen-load-bearing. Also left alone: comments citing upstream
GitHub issue URLs (github.com/argoproj/argo-cd/issues/NNNNN) and a handful
of test fixtures using "https://github.com/argoproj/argo-cd.git" as a
representative example repo URL — both are accurate historical/test-data
references, not stale self-references.
---------
Co-authored-by: Hanzo Dev <[email protected]>
888 lines
29 KiB
Go
888 lines
29 KiB
Go
package generators
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
|
|
|
"github.com/hanzoai/deploy/applicationset/utils"
|
|
argoprojiov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type possiblyErroringFakeCtrlRuntimeClient struct {
|
|
client.Client
|
|
shouldError bool
|
|
}
|
|
|
|
func (p *possiblyErroringFakeCtrlRuntimeClient) List(ctx context.Context, secretList client.ObjectList, opts ...client.ListOption) error {
|
|
if p.shouldError {
|
|
return errors.New("could not list Secrets")
|
|
}
|
|
return p.Client.List(ctx, secretList, opts...)
|
|
}
|
|
|
|
func TestGenerateParams(t *testing.T) {
|
|
clusters := []client.Object{
|
|
&corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "staging-01",
|
|
Namespace: "namespace",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "staging",
|
|
"org": "foo",
|
|
},
|
|
Annotations: map[string]string{
|
|
"foo.argoproj.io": "staging",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("staging-01"),
|
|
"server": []byte("https://staging-01.example.com"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
},
|
|
&corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "production-01",
|
|
Namespace: "namespace",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "production",
|
|
"org": "bar",
|
|
},
|
|
Annotations: map[string]string{
|
|
"foo.argoproj.io": "production",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("production_01/west"),
|
|
"server": []byte("https://production-01.example.com"),
|
|
"project": []byte("prod-project"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
},
|
|
}
|
|
testCases := []struct {
|
|
name string
|
|
selector metav1.LabelSelector
|
|
isFlatMode bool
|
|
values map[string]string
|
|
expected []map[string]any
|
|
// clientError is true if a k8s client error should be simulated
|
|
clientError bool
|
|
expectedError error
|
|
}{
|
|
{
|
|
name: "no label selector",
|
|
selector: metav1.LabelSelector{},
|
|
values: map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "{{values.lol1}}{{values.lol1}}",
|
|
"lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}",
|
|
"foo": "bar",
|
|
"bar": "{{ metadata.annotations.foo.argoproj.io }}",
|
|
"bat": "{{ metadata.labels.environment }}",
|
|
"aaa": "{{ server }}",
|
|
"no-op": "{{ this-does-not-exist }}",
|
|
}, expected: []map[string]any{
|
|
{"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "{{ metadata.annotations.foo.argoproj.io }}", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "{{ metadata.labels.environment }}", "values.aaa": "https://kubernetes.default.svc", "nameNormalized": "in-cluster", "name": "in-cluster", "server": "https://kubernetes.default.svc", "project": ""},
|
|
{
|
|
"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "production", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "production", "values.aaa": "https://production-01.example.com", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
|
|
},
|
|
|
|
{
|
|
"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "staging", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "staging", "values.aaa": "https://staging-01.example.com", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "secret type label selector",
|
|
selector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
},
|
|
},
|
|
values: nil,
|
|
expected: []map[string]any{
|
|
{
|
|
"name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
|
|
},
|
|
|
|
{
|
|
"name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "production-only",
|
|
selector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{
|
|
"environment": "production",
|
|
},
|
|
},
|
|
values: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"values.foo": "bar", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "production or staging",
|
|
selector: metav1.LabelSelector{
|
|
MatchExpressions: []metav1.LabelSelectorRequirement{
|
|
{
|
|
Key: "environment",
|
|
Operator: "In",
|
|
Values: []string{
|
|
"production",
|
|
"staging",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
values: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"values.foo": "bar", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
|
|
},
|
|
{
|
|
"values.foo": "bar", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "production or staging with match labels",
|
|
selector: metav1.LabelSelector{
|
|
MatchExpressions: []metav1.LabelSelectorRequirement{
|
|
{
|
|
Key: "environment",
|
|
Operator: "In",
|
|
Values: []string{
|
|
"production",
|
|
"staging",
|
|
},
|
|
},
|
|
},
|
|
MatchLabels: map[string]string{
|
|
"org": "foo",
|
|
},
|
|
},
|
|
values: map[string]string{
|
|
"name": "baz",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"values.name": "baz", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "simulate client error",
|
|
selector: metav1.LabelSelector{},
|
|
values: nil,
|
|
expected: nil,
|
|
clientError: true,
|
|
expectedError: errors.New("error getting cluster secrets: could not list Secrets"),
|
|
},
|
|
{
|
|
name: "flat mode without selectors",
|
|
selector: metav1.LabelSelector{},
|
|
values: map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "{{values.lol1}}{{values.lol1}}",
|
|
"lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}",
|
|
"foo": "bar",
|
|
"bar": "{{ metadata.annotations.foo.argoproj.io }}",
|
|
"bat": "{{ metadata.labels.environment }}",
|
|
"aaa": "{{ server }}",
|
|
"no-op": "{{ this-does-not-exist }}",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"clusters": []map[string]any{
|
|
{"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "{{ metadata.annotations.foo.argoproj.io }}", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "{{ metadata.labels.environment }}", "values.aaa": "https://kubernetes.default.svc", "nameNormalized": "in-cluster", "name": "in-cluster", "server": "https://kubernetes.default.svc", "project": ""},
|
|
{
|
|
"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "production", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "production", "values.aaa": "https://production-01.example.com", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
|
|
},
|
|
|
|
{
|
|
"values.lol1": "lol", "values.lol2": "{{values.lol1}}{{values.lol1}}", "values.lol3": "{{values.lol2}}{{values.lol2}}{{values.lol2}}", "values.foo": "bar", "values.bar": "staging", "values.no-op": "{{ this-does-not-exist }}", "values.bat": "staging", "values.aaa": "https://staging-01.example.com", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
isFlatMode: true,
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "production or staging with flat mode",
|
|
selector: metav1.LabelSelector{
|
|
MatchExpressions: []metav1.LabelSelectorRequirement{
|
|
{
|
|
Key: "environment",
|
|
Operator: "In",
|
|
Values: []string{
|
|
"production",
|
|
"staging",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
isFlatMode: true,
|
|
values: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"clusters": []map[string]any{
|
|
{
|
|
"values.foo": "bar", "name": "production_01/west", "nameNormalized": "production-01-west", "server": "https://production-01.example.com", "metadata.labels.environment": "production", "metadata.labels.org": "bar",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "production", "project": "prod-project",
|
|
},
|
|
{
|
|
"values.foo": "bar", "name": "staging-01", "nameNormalized": "staging-01", "server": "https://staging-01.example.com", "metadata.labels.environment": "staging", "metadata.labels.org": "foo",
|
|
"metadata.labels.argocd.argoproj.io/secret-type": "cluster", "metadata.annotations.foo.argoproj.io": "staging", "project": "",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
t.Run(testCase.name, func(t *testing.T) {
|
|
fakeClient := fake.NewClientBuilder().WithObjects(clusters...).Build()
|
|
cl := &possiblyErroringFakeCtrlRuntimeClient{
|
|
fakeClient,
|
|
testCase.clientError,
|
|
}
|
|
|
|
clusterGenerator := NewClusterGenerator(cl, "namespace")
|
|
|
|
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{},
|
|
}
|
|
|
|
got, err := clusterGenerator.GenerateParams(&argoprojiov1alpha1.ApplicationSetGenerator{
|
|
Clusters: &argoprojiov1alpha1.ClusterGenerator{
|
|
Selector: testCase.selector,
|
|
Values: testCase.values,
|
|
FlatList: testCase.isFlatMode,
|
|
},
|
|
}, &applicationSetInfo, nil)
|
|
|
|
if testCase.expectedError != nil {
|
|
require.EqualError(t, err, testCase.expectedError.Error())
|
|
} else {
|
|
require.NoError(t, err)
|
|
assertEqualParamsFlat(t, testCase.expected, got, testCase.isFlatMode)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func assertEqualParamsFlat(t *testing.T, expected, got []map[string]any, isFlatMode bool) {
|
|
t.Helper()
|
|
if isFlatMode && len(expected) == 1 && len(got) == 1 {
|
|
expectedClusters, ok1 := expected[0]["clusters"].([]map[string]any)
|
|
gotClusters, ok2 := got[0]["clusters"].([]map[string]any)
|
|
if ok1 && ok2 {
|
|
assert.ElementsMatch(t, expectedClusters, gotClusters)
|
|
return
|
|
}
|
|
}
|
|
assert.ElementsMatch(t, expected, got)
|
|
}
|
|
|
|
func TestGenerateParamsGoTemplate(t *testing.T) {
|
|
clusters := []client.Object{
|
|
&corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "staging-01",
|
|
Namespace: "namespace",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "staging",
|
|
"org": "foo",
|
|
},
|
|
Annotations: map[string]string{
|
|
"foo.argoproj.io": "staging",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("staging-01"),
|
|
"server": []byte("https://staging-01.example.com"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
},
|
|
&corev1.Secret{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Secret",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "production-01",
|
|
Namespace: "namespace",
|
|
Labels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "production",
|
|
"org": "bar",
|
|
},
|
|
Annotations: map[string]string{
|
|
"foo.argoproj.io": "production",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"config": []byte("{}"),
|
|
"name": []byte("production_01/west"),
|
|
"server": []byte("https://production-01.example.com"),
|
|
},
|
|
Type: corev1.SecretType("Opaque"),
|
|
},
|
|
}
|
|
testCases := []struct {
|
|
name string
|
|
selector metav1.LabelSelector
|
|
values map[string]string
|
|
isFlatMode bool
|
|
expected []map[string]any
|
|
// clientError is true if a k8s client error should be simulated
|
|
clientError bool
|
|
expectedError error
|
|
}{
|
|
{
|
|
name: "no label selector",
|
|
selector: metav1.LabelSelector{},
|
|
values: map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "{{ .values.lol1 }}{{ .values.lol1 }}",
|
|
"lol3": "{{ .values.lol2 }}{{ .values.lol2 }}{{ .values.lol2 }}",
|
|
"foo": "bar",
|
|
"bar": "{{ if not (empty .metadata) }}{{index .metadata.annotations \"foo.argoproj.io\" }}{{ end }}",
|
|
"bat": "{{ if not (empty .metadata) }}{{.metadata.labels.environment}}{{ end }}",
|
|
"aaa": "{{ .server }}",
|
|
"no-op": "{{ .thisDoesNotExist }}",
|
|
}, expected: []map[string]any{
|
|
{
|
|
"name": "production_01/west",
|
|
"nameNormalized": "production-01-west",
|
|
"server": "https://production-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "production",
|
|
"org": "bar",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "production",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "<no value><no value>",
|
|
"lol3": "<no value><no value><no value>",
|
|
"foo": "bar",
|
|
"bar": "production",
|
|
"bat": "production",
|
|
"aaa": "https://production-01.example.com",
|
|
"no-op": "<no value>",
|
|
},
|
|
},
|
|
{
|
|
"name": "staging-01",
|
|
"nameNormalized": "staging-01",
|
|
"server": "https://staging-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "staging",
|
|
"org": "foo",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "staging",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "<no value><no value>",
|
|
"lol3": "<no value><no value><no value>",
|
|
"foo": "bar",
|
|
"bar": "staging",
|
|
"bat": "staging",
|
|
"aaa": "https://staging-01.example.com",
|
|
"no-op": "<no value>",
|
|
},
|
|
},
|
|
{
|
|
"nameNormalized": "in-cluster",
|
|
"name": "in-cluster",
|
|
"server": "https://kubernetes.default.svc",
|
|
"project": "",
|
|
"values": map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "<no value><no value>",
|
|
"lol3": "<no value><no value><no value>",
|
|
"foo": "bar",
|
|
"bar": "",
|
|
"bat": "",
|
|
"aaa": "https://kubernetes.default.svc",
|
|
"no-op": "<no value>",
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "secret type label selector",
|
|
selector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
},
|
|
},
|
|
values: nil,
|
|
expected: []map[string]any{
|
|
{
|
|
"name": "production_01/west",
|
|
"nameNormalized": "production-01-west",
|
|
"server": "https://production-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "production",
|
|
"org": "bar",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "production",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
"name": "staging-01",
|
|
"nameNormalized": "staging-01",
|
|
"server": "https://staging-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "staging",
|
|
"org": "foo",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "staging",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "production-only",
|
|
selector: metav1.LabelSelector{
|
|
MatchLabels: map[string]string{
|
|
"environment": "production",
|
|
},
|
|
},
|
|
values: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"name": "production_01/west",
|
|
"nameNormalized": "production-01-west",
|
|
"server": "https://production-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "production",
|
|
"org": "bar",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "production",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "production or staging",
|
|
selector: metav1.LabelSelector{
|
|
MatchExpressions: []metav1.LabelSelectorRequirement{
|
|
{
|
|
Key: "environment",
|
|
Operator: "In",
|
|
Values: []string{
|
|
"production",
|
|
"staging",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
values: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"name": "production_01/west",
|
|
"nameNormalized": "production-01-west",
|
|
"server": "https://production-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "production",
|
|
"org": "bar",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "production",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
{
|
|
"name": "staging-01",
|
|
"nameNormalized": "staging-01",
|
|
"server": "https://staging-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "staging",
|
|
"org": "foo",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "staging",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "production or staging with match labels",
|
|
selector: metav1.LabelSelector{
|
|
MatchExpressions: []metav1.LabelSelectorRequirement{
|
|
{
|
|
Key: "environment",
|
|
Operator: "In",
|
|
Values: []string{
|
|
"production",
|
|
"staging",
|
|
},
|
|
},
|
|
},
|
|
MatchLabels: map[string]string{
|
|
"org": "foo",
|
|
},
|
|
},
|
|
values: map[string]string{
|
|
"name": "baz",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"name": "staging-01",
|
|
"nameNormalized": "staging-01",
|
|
"server": "https://staging-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "staging",
|
|
"org": "foo",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "staging",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"name": "baz",
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "simulate client error",
|
|
selector: metav1.LabelSelector{},
|
|
values: nil,
|
|
expected: nil,
|
|
clientError: true,
|
|
expectedError: errors.New("error getting cluster secrets: could not list Secrets"),
|
|
},
|
|
{
|
|
name: "Clusters with flat list mode and no selector",
|
|
selector: metav1.LabelSelector{},
|
|
isFlatMode: true,
|
|
values: map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "{{ .values.lol1 }}{{ .values.lol1 }}",
|
|
"lol3": "{{ .values.lol2 }}{{ .values.lol2 }}{{ .values.lol2 }}",
|
|
"foo": "bar",
|
|
"bar": "{{ if not (empty .metadata) }}{{index .metadata.annotations \"foo.argoproj.io\" }}{{ end }}",
|
|
"bat": "{{ if not (empty .metadata) }}{{.metadata.labels.environment}}{{ end }}",
|
|
"aaa": "{{ .server }}",
|
|
"no-op": "{{ .thisDoesNotExist }}",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"clusters": []map[string]any{
|
|
{
|
|
"nameNormalized": "in-cluster",
|
|
"name": "in-cluster",
|
|
"server": "https://kubernetes.default.svc",
|
|
"project": "",
|
|
"values": map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "<no value><no value>",
|
|
"lol3": "<no value><no value><no value>",
|
|
"foo": "bar",
|
|
"bar": "",
|
|
"bat": "",
|
|
"aaa": "https://kubernetes.default.svc",
|
|
"no-op": "<no value>",
|
|
},
|
|
},
|
|
{
|
|
"name": "production_01/west",
|
|
"nameNormalized": "production-01-west",
|
|
"server": "https://production-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "production",
|
|
"org": "bar",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "production",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "<no value><no value>",
|
|
"lol3": "<no value><no value><no value>",
|
|
"foo": "bar",
|
|
"bar": "production",
|
|
"bat": "production",
|
|
"aaa": "https://production-01.example.com",
|
|
"no-op": "<no value>",
|
|
},
|
|
},
|
|
{
|
|
"name": "staging-01",
|
|
"nameNormalized": "staging-01",
|
|
"server": "https://staging-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "staging",
|
|
"org": "foo",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "staging",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"lol1": "lol",
|
|
"lol2": "<no value><no value>",
|
|
"lol3": "<no value><no value><no value>",
|
|
"foo": "bar",
|
|
"bar": "staging",
|
|
"bat": "staging",
|
|
"aaa": "https://staging-01.example.com",
|
|
"no-op": "<no value>",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
{
|
|
name: "production or staging with flat mode",
|
|
selector: metav1.LabelSelector{
|
|
MatchExpressions: []metav1.LabelSelectorRequirement{
|
|
{
|
|
Key: "environment",
|
|
Operator: "In",
|
|
Values: []string{
|
|
"production",
|
|
"staging",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
isFlatMode: true,
|
|
values: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
expected: []map[string]any{
|
|
{
|
|
"clusters": []map[string]any{
|
|
{
|
|
"name": "production_01/west",
|
|
"nameNormalized": "production-01-west",
|
|
"server": "https://production-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "production",
|
|
"org": "bar",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "production",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
{
|
|
"name": "staging-01",
|
|
"nameNormalized": "staging-01",
|
|
"server": "https://staging-01.example.com",
|
|
"project": "",
|
|
"metadata": map[string]any{
|
|
"labels": map[string]string{
|
|
"argocd.argoproj.io/secret-type": "cluster",
|
|
"environment": "staging",
|
|
"org": "foo",
|
|
},
|
|
"annotations": map[string]string{
|
|
"foo.argoproj.io": "staging",
|
|
},
|
|
},
|
|
"values": map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
clientError: false,
|
|
expectedError: nil,
|
|
},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
t.Run(testCase.name, func(t *testing.T) {
|
|
fakeClient := fake.NewClientBuilder().WithObjects(clusters...).Build()
|
|
cl := &possiblyErroringFakeCtrlRuntimeClient{
|
|
fakeClient,
|
|
testCase.clientError,
|
|
}
|
|
|
|
clusterGenerator := NewClusterGenerator(cl, "namespace")
|
|
|
|
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "set",
|
|
},
|
|
Spec: argoprojiov1alpha1.ApplicationSetSpec{
|
|
GoTemplate: true,
|
|
},
|
|
}
|
|
|
|
got, err := clusterGenerator.GenerateParams(&argoprojiov1alpha1.ApplicationSetGenerator{
|
|
Clusters: &argoprojiov1alpha1.ClusterGenerator{
|
|
Selector: testCase.selector,
|
|
Values: testCase.values,
|
|
FlatList: testCase.isFlatMode,
|
|
},
|
|
}, &applicationSetInfo, nil)
|
|
|
|
if testCase.expectedError != nil {
|
|
require.EqualError(t, err, testCase.expectedError.Error())
|
|
} else {
|
|
require.NoError(t, err)
|
|
assertEqualParamsFlat(t, testCase.expected, got, testCase.isFlatMode)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSanitizeClusterName(t *testing.T) {
|
|
t.Run("valid DNS-1123 subdomain name", func(t *testing.T) {
|
|
assert.Equal(t, "cluster-name", utils.SanitizeName("cluster-name"))
|
|
})
|
|
t.Run("invalid DNS-1123 subdomain name", func(t *testing.T) {
|
|
invalidName := "-.--CLUSTER/name -./.-"
|
|
assert.Equal(t, "cluster-name", utils.SanitizeName(invalidName))
|
|
})
|
|
}
|