chore: remove version from generated files (#84)

Duologic · web-flow · commit bf982bd8af03 · 2026-01-09T16:33:43.000+01:00
* chore: remove version from generated files

* chore: remove arg from Makefile

* fix: remove dash for ending newline, not supported on older jsonnet versions
diff --git a/Makefile b/Makefile
@@ -26,7 +26,6 @@ grafanaplane/zz: $(GENERATOR_DEPTHS)
 		  -s  1000 \
 		  -S -c -m grafanaplane \
 		  -J generator/vendor \
-		  -A 'version=$(LIBRARY_VERSION)-$(PROVIDER_VERSION)' \
 		  generator/main.libsonnet) && \
 	xargs -n1 jsonnetfmt --no-use-implicit-plus -i <<< "$${FILES}"
 
diff --git a/docs/README.md b/docs/README.md
@@ -11,7 +11,7 @@ Most of this library is generated: the Compositions/XRDs packages, Configuration
 ## Install
 
 ```
-jb install github.com/grafana/grafana-crossplane-libsonnet/grafanaplane@0.16.0-0.40.0
+jb install github.com/grafana/grafana-crossplane-libsonnet/grafanaplane@main
 ```
 
 ## Usage
diff --git a/docs/configurations.md b/docs/configurations.md
@@ -9,20 +9,20 @@ local grafanaplane = import 'github.com/grafana/grafana-crossplane-libsonnet/gra
 local configurations = grafanaplane.configurations;
 
 [
-  configuration.alerting,
-  configuration.asserts,
-  configuration.cloud,
-  configuration.cloudprovider,
-  configuration.connections,
-  configuration.enterprise,
-  configuration.fleetmanagement,
-  configuration.frontendobservability,
-  configuration.k6,
-  configuration.ml,
-  configuration.oncall,
-  configuration.oss,
-  configuration.slo,
-  configuration.sm
+  configuration.alerting(version),
+  configuration.asserts(version),
+  configuration.cloud(version),
+  configuration.cloudprovider(version),
+  configuration.connections(version),
+  configuration.enterprise(version),
+  configuration.fleetmanagement(version),
+  configuration.frontendobservability(version),
+  configuration.k6(version),
+  configuration.ml(version),
+  configuration.oncall(version),
+  configuration.oss(version),
+  configuration.slo(version),
+  configuration.sm(version)
 ]
 ```
 
diff --git a/generator/configurations.libsonnet b/generator/configurations.libsonnet
@@ -1,10 +1,5 @@
 local crossplane = import 'github.com/jsonnet-libs/crossplane-libsonnet/crossplane/1.17/main.libsonnet';
 
-local configuration(key, version) =
-  local conf = crossplane.pkg.v1.configuration;
-  conf.new(key)
-  + conf.spec.withPackage('ghcr.io/grafana/crossplane/' + key + ':' + version);
-
 local xrds =
   std.map(
     function(o) o.definition,
@@ -70,11 +65,36 @@ local gvkByGroup(name, gvks) = {
   for group in groupSet(gvks)
 };
 
-function(version='main') {
-  configurations: {
-    [shortGroupName(group)]: configuration('grafana-namespaced-' + shortGroupName(group), version)
-    for group in groupSet(gvkXRDs)
-  },
+local configuration(group) =
+  |||
+    %(key)s(version): {
+      apiVersion: 'pkg.crossplane.io/v1',
+      kind: 'Configuration',
+      metadata: {
+        annotations: {
+          'tanka.dev/namespaced': 'false',
+        },
+        name: '%(name)s',
+      },
+      spec: {
+        package: 'ghcr.io/grafana/crossplane/%(name)s:%%s' %% version,
+      },
+    },
+  ||| % {
+    key: shortGroupName(group),
+    name: 'grafana-namespaced-' + shortGroupName(group),
+  };
+
+{
+  configurations:
+    std.lines(
+      ['{']
+      + std.map(
+        configuration,
+        groupSet(gvkXRDs)
+      )
+      + ['}']
+    ),
 
   gvks:
     gvkByGroup('xrd', gvkXRDs)
diff --git a/generator/main.libsonnet b/generator/main.libsonnet
@@ -54,15 +54,13 @@ local global =
 
 local ast = autils.deepMergeObjects([compositions, global]);
 
-function(version='main')
-  local files = utils.splitIntoFiles(ast, 'zz');
-  {
-    [file.key]: file.value.toString()
-    for file in std.objectKeysValues(files)
-  }
-  + {
-    local conf = configurations(version),
-    'zz/configurations.libsonnet': std.manifestJson(conf.configurations),
-    'zz/version.libsonnet': std.manifestJson(version),
-    'zz/gvks.libsonnet': std.manifestJson(conf.gvks),
-  }
+local files = utils.splitIntoFiles(ast, 'zz');
+{
+  [file.key]: file.value.toString()
+  for file in std.objectKeysValues(files)
+}
++ {
+  local conf = configurations,
+  'zz/configurations.libsonnet': conf.configurations,
+  'zz/gvks.libsonnet': std.manifestJson(conf.gvks),
+}
diff --git a/grafanaplane/main.libsonnet b/grafanaplane/main.libsonnet
@@ -15,7 +15,7 @@ local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet';
         Most of this library is generated: the Compositions/XRDs packages, Configurations and the library in `zz/`.
       |||,
       'main.libsonnet',
-      import 'zz/version.libsonnet',
+      'main',
     )
     + d.package.withUsageTemplate(
       @"local %(name)s = import '%(import)s';"
@@ -49,7 +49,7 @@ local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet';
           % std.join(
             ',\n',
             std.map(
-              function(item) '  configuration.' + item,
+              function(item) '  configuration.%s(version)' % item,
               std.objectFields(configurations)
             )
           )
diff --git a/grafanaplane/zz/configurations.libsonnet b/grafanaplane/zz/configurations.libsonnet
@@ -1,5 +1,5 @@
 {
-  alerting: {
+  alerting(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -9,10 +9,11 @@
       name: 'grafana-namespaced-alerting',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-alerting:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-alerting:%s' % version,
     },
   },
-  asserts: {
+
+  asserts(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -22,10 +23,11 @@
       name: 'grafana-namespaced-asserts',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-asserts:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-asserts:%s' % version,
     },
   },
-  cloud: {
+
+  cloud(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -35,10 +37,11 @@
       name: 'grafana-namespaced-cloud',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-cloud:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-cloud:%s' % version,
     },
   },
-  cloudprovider: {
+
+  cloudprovider(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -48,10 +51,11 @@
       name: 'grafana-namespaced-cloudprovider',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-cloudprovider:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-cloudprovider:%s' % version,
     },
   },
-  connections: {
+
+  connections(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -61,10 +65,11 @@
       name: 'grafana-namespaced-connections',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-connections:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-connections:%s' % version,
     },
   },
-  enterprise: {
+
+  enterprise(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -74,10 +79,11 @@
       name: 'grafana-namespaced-enterprise',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-enterprise:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-enterprise:%s' % version,
     },
   },
-  fleetmanagement: {
+
+  fleetmanagement(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -87,10 +93,11 @@
       name: 'grafana-namespaced-fleetmanagement',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-fleetmanagement:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-fleetmanagement:%s' % version,
     },
   },
-  frontendobservability: {
+
+  frontendobservability(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -100,10 +107,11 @@
       name: 'grafana-namespaced-frontendobservability',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-frontendobservability:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-frontendobservability:%s' % version,
     },
   },
-  k6: {
+
+  k6(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -113,10 +121,11 @@
       name: 'grafana-namespaced-k6',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-k6:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-k6:%s' % version,
     },
   },
-  ml: {
+
+  ml(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -126,10 +135,11 @@
       name: 'grafana-namespaced-ml',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-ml:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-ml:%s' % version,
     },
   },
-  oncall: {
+
+  oncall(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -139,10 +149,11 @@
       name: 'grafana-namespaced-oncall',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-oncall:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-oncall:%s' % version,
     },
   },
-  oss: {
+
+  oss(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -152,10 +163,11 @@
       name: 'grafana-namespaced-oss',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-oss:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-oss:%s' % version,
     },
   },
-  slo: {
+
+  slo(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -165,10 +177,11 @@
       name: 'grafana-namespaced-slo',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-slo:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-slo:%s' % version,
     },
   },
-  sm: {
+
+  sm(version): {
     apiVersion: 'pkg.crossplane.io/v1',
     kind: 'Configuration',
     metadata: {
@@ -178,7 +191,8 @@
       name: 'grafana-namespaced-sm',
     },
     spec: {
-      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-sm:0.16.0-0.40.0',
+      package: 'ghcr.io/grafana/crossplane/grafana-namespaced-sm:%s' % version,
     },
   },
+
 }
diff --git a/grafanaplane/zz/version.libsonnet b/grafanaplane/zz/version.libsonnet

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet';`
`15`	`15`	Most of this library is generated: the Compositions/XRDs packages, Configurations and the library in `zz/`.
`16`	`16`	`\|\|\|,`
`17`	`17`	`'main.libsonnet',`
`18`		`- import 'zz/version.libsonnet',`
	`18`	`+ 'main',`
`19`	`19`	`)`
`20`	`20`	`+ d.package.withUsageTemplate(`
`21`	`21`	`@"local %(name)s = import '%(import)s';"`
`@@ -49,7 +49,7 @@ local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet';`
`49`	`49`	`% std.join(`
`50`	`50`	`',\n',`
`51`	`51`	`std.map(`
`52`		`- function(item) ' configuration.' + item,`
	`52`	`+ function(item) ' configuration.%s(version)' % item,`
`53`	`53`	`std.objectFields(configurations)`
`54`	`54`	`)`
`55`	`55`	`)`