From 1807852b6be2948078a70213cdb760c43b000b10 Mon Sep 17 00:00:00 2001
From: Soule BA <soule@weave.works>
Date: Fri, 1 Apr 2022 10:27:37 +0200
Subject: [PATCH] Update pkg/kustomize to v0.1.0
If implemented this fixes a bug where retrieving the groupVersion.Group
of a kustomization were returning an empty string.
Signed-off-by: Soule BA <soule@weave.works>
---
cmd/flux/build_kustomization_test.go | 6 +
.../podinfo-kustomization.yaml | 4 +
.../podinfo-with-var-substitution-result.yaml | 216 ++++++++++++++++++
.../var-substitution/cluster.json | 124 ++++++++++
.../var-substitution/deployment.yaml | 77 +++++++
.../var-substitution/kustomization.yaml | 11 +
go.mod | 2 +-
go.sum | 4 +-
8 files changed, 441 insertions(+), 3 deletions(-)
create mode 100644 cmd/flux/testdata/build-kustomization/podinfo-with-var-substitution-result.yaml
create mode 100644 cmd/flux/testdata/build-kustomization/var-substitution/cluster.json
create mode 100644 cmd/flux/testdata/build-kustomization/var-substitution/deployment.yaml
create mode 100644 cmd/flux/testdata/build-kustomization/var-substitution/kustomization.yaml
diff --git a/cmd/flux/build_kustomization_test.go b/cmd/flux/build_kustomization_test.go
index 99ecb45c..03826d04 100644
--- a/cmd/flux/build_kustomization_test.go
+++ b/cmd/flux/build_kustomization_test.go
@@ -54,6 +54,12 @@ func TestBuildKustomization(t *testing.T) {
resultFile: "./testdata/build-kustomization/podinfo-without-service-result.yaml",
assertFunc: "assertGoldenTemplateFile",
},
+ {
+ name: "build deployment and configmpa with var substitution",
+ args: "build kustomization podinfo --path ./testdata/build-kustomization/var-substitution",
+ resultFile: "./testdata/build-kustomization/podinfo-with-var-substitution-result.yaml",
+ assertFunc: "assertGoldenTemplateFile",
+ },
}
tmpl := map[string]string{
diff --git a/cmd/flux/testdata/build-kustomization/podinfo-kustomization.yaml b/cmd/flux/testdata/build-kustomization/podinfo-kustomization.yaml
index 6d3eabed..72103efe 100644
--- a/cmd/flux/testdata/build-kustomization/podinfo-kustomization.yaml
+++ b/cmd/flux/testdata/build-kustomization/podinfo-kustomization.yaml
@@ -13,3 +13,7 @@ spec:
kind: GitRepository
name: podinfo
targetNamespace: default
+ postBuild:
+ substitute:
+ cluster_env: "prod"
+ cluster_region: "eu-central-1"
diff --git a/cmd/flux/testdata/build-kustomization/podinfo-with-var-substitution-result.yaml b/cmd/flux/testdata/build-kustomization/podinfo-with-var-substitution-result.yaml
new file mode 100644
index 00000000..0c32c936
--- /dev/null
+++ b/cmd/flux/testdata/build-kustomization/podinfo-with-var-substitution-result.yaml
@@ -0,0 +1,216 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ labels:
+ environment: prod
+ kustomize.toolkit.fluxcd.io/name: podinfo
+ kustomize.toolkit.fluxcd.io/namespace: {{ .fluxns }}
+ region: eu-central-1
+ name: podinfo
+ namespace: default
+spec:
+ minReadySeconds: 3
+ progressDeadlineSeconds: 60
+ revisionHistoryLimit: 5
+ selector:
+ matchLabels:
+ app: podinfo
+ strategy:
+ rollingUpdate:
+ maxUnavailable: 0
+ type: RollingUpdate
+ template:
+ metadata:
+ annotations:
+ prometheus.io/port: "9797"
+ prometheus.io/scrape: "true"
+ labels:
+ app: podinfo
+ spec:
+ containers:
+ - command:
+ - ./podinfo
+ - --port=9898
+ - --port-metrics=9797
+ - --grpc-port=9999
+ - --grpc-service-name=podinfo
+ - --level=info
+ - --random-delay=false
+ - --random-error=false
+ env:
+ - name: PODINFO_UI_COLOR
+ value: '#34577c'
+ image: ghcr.io/stefanprodan/podinfo:6.0.10
+ imagePullPolicy: IfNotPresent
+ livenessProbe:
+ exec:
+ command:
+ - podcli
+ - check
+ - http
+ - localhost:9898/healthz
+ initialDelaySeconds: 5
+ timeoutSeconds: 5
+ name: podinfod
+ ports:
+ - containerPort: 9898
+ name: http
+ protocol: TCP
+ - containerPort: 9797
+ name: http-metrics
+ protocol: TCP
+ - containerPort: 9999
+ name: grpc
+ protocol: TCP
+ readinessProbe:
+ exec:
+ command:
+ - podcli
+ - check
+ - http
+ - localhost:9898/readyz
+ initialDelaySeconds: 5
+ timeoutSeconds: 5
+ resources:
+ limits:
+ cpu: 2000m
+ memory: 512Mi
+ requests:
+ cpu: 100m
+ memory: 64Mi
+---
+apiVersion: v1
+data:
+ cluster.json: |
+ {
+ "annotations": {
+ "list": [
+ {
+ "builtIn": 1,
+ "datasource": "-- Grafana --",
+ "enable": true,
+ "hide": true,
+ "iconColor": "rgba(0, 211, 255, 1)",
+ "name": "Annotations & Alerts",
+ "type": "dashboard"
+ }
+ ]
+ },
+ "editable": true,
+ "gnetId": null,
+ "graphTooltip": 0,
+ "iteration": 1636369574387,
+ "links": [],
+ "panels": [
+ {
+ "datasource": "${DS_PROMETHEUS}",
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "decimals": 0,
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 100
+ }
+ ]
+ },
+ "unit": "short"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 5,
+ "w": 6,
+ "x": 0,
+ "y": 0
+ },
+ "id": 24,
+ "options": {
+ "colorMode": "value",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "last"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "value"
+ },
+ "pluginVersion": "7.5.5",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "count(gotk_reconcile_condition{namespace=~\"$operator_namespace\",exported_namespace=~\"$namespace\",type=\"Ready\",status=\"True\",kind=~\"Kustomization|HelmRelease\"})\n-\nsum(gotk_reconcile_condition{namespace=~\"$operator_namespace\",exported_namespace=~\"$namespace\",type=\"Ready\",status=\"Deleted\",kind=~\"Kustomization|HelmRelease\"})",
+ "interval": "",
+ "legendFormat": "",
+ "refId": "A"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Cluster Reconcilers",
+ "type": "stat"
+ },
+ {
+ "collapsed": false,
+ "datasource": "${DS_PROMETHEUS}",
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 9
+ },
+ "id": 15,
+ "panels": [],
+ "title": "Status",
+ "type": "row"
+ }
+ ],
+ "refresh": "",
+ "schemaVersion": 27,
+ "style": "light",
+ "tags": [
+ "flux"
+ ],
+ "time": {
+ "from": "now-15m",
+ "to": "now"
+ },
+ "timepicker": {
+ "refresh_intervals": [
+ "10s",
+ "30s",
+ "1m",
+ "5m",
+ "15m",
+ "30m",
+ "1h",
+ "2h",
+ "1d"
+ ]
+ },
+ "timezone": "",
+ "title": "Flux Cluster Stats",
+ "uid": "flux-cluster",
+ "version": 1
+ }
+kind: ConfigMap
+metadata:
+ labels:
+ kustomize.toolkit.fluxcd.io/name: podinfo
+ kustomize.toolkit.fluxcd.io/namespace: {{ .fluxns }}
+ kustomize.toolkit.fluxcd.io/substitute: disabled
+ name: flux-grafana-dashboards-kt8md725kf
+ namespace: default
diff --git a/cmd/flux/testdata/build-kustomization/var-substitution/cluster.json b/cmd/flux/testdata/build-kustomization/var-substitution/cluster.json
new file mode 100644
index 00000000..8184714a
--- /dev/null
+++ b/cmd/flux/testdata/build-kustomization/var-substitution/cluster.json
@@ -0,0 +1,124 @@
+{
+ "annotations": {
+ "list": [
+ {
+ "builtIn": 1,
+ "datasource": "-- Grafana --",
+ "enable": true,
+ "hide": true,
+ "iconColor": "rgba(0, 211, 255, 1)",
+ "name": "Annotations & Alerts",
+ "type": "dashboard"
+ }
+ ]
+ },
+ "editable": true,
+ "gnetId": null,
+ "graphTooltip": 0,
+ "iteration": 1636369574387,
+ "links": [],
+ "panels": [
+ {
+ "datasource": "${DS_PROMETHEUS}",
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "decimals": 0,
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 100
+ }
+ ]
+ },
+ "unit": "short"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 5,
+ "w": 6,
+ "x": 0,
+ "y": 0
+ },
+ "id": 24,
+ "options": {
+ "colorMode": "value",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "last"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "value"
+ },
+ "pluginVersion": "7.5.5",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "count(gotk_reconcile_condition{namespace=~\"$operator_namespace\",exported_namespace=~\"$namespace\",type=\"Ready\",status=\"True\",kind=~\"Kustomization|HelmRelease\"})\n-\nsum(gotk_reconcile_condition{namespace=~\"$operator_namespace\",exported_namespace=~\"$namespace\",type=\"Ready\",status=\"Deleted\",kind=~\"Kustomization|HelmRelease\"})",
+ "interval": "",
+ "legendFormat": "",
+ "refId": "A"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Cluster Reconcilers",
+ "type": "stat"
+ },
+ {
+ "collapsed": false,
+ "datasource": "${DS_PROMETHEUS}",
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 9
+ },
+ "id": 15,
+ "panels": [],
+ "title": "Status",
+ "type": "row"
+ }
+ ],
+ "refresh": "",
+ "schemaVersion": 27,
+ "style": "light",
+ "tags": [
+ "flux"
+ ],
+ "time": {
+ "from": "now-15m",
+ "to": "now"
+ },
+ "timepicker": {
+ "refresh_intervals": [
+ "10s",
+ "30s",
+ "1m",
+ "5m",
+ "15m",
+ "30m",
+ "1h",
+ "2h",
+ "1d"
+ ]
+ },
+ "timezone": "",
+ "title": "Flux Cluster Stats",
+ "uid": "flux-cluster",
+ "version": 1
+}
diff --git a/cmd/flux/testdata/build-kustomization/var-substitution/deployment.yaml b/cmd/flux/testdata/build-kustomization/var-substitution/deployment.yaml
new file mode 100644
index 00000000..9b5f2c35
--- /dev/null
+++ b/cmd/flux/testdata/build-kustomization/var-substitution/deployment.yaml
@@ -0,0 +1,77 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ labels:
+ environment: ${cluster_env:=dev}
+ region: ${cluster_region}
+ name: podinfo
+spec:
+ minReadySeconds: 3
+ revisionHistoryLimit: 5
+ progressDeadlineSeconds: 60
+ strategy:
+ rollingUpdate:
+ maxUnavailable: 0
+ type: RollingUpdate
+ selector:
+ matchLabels:
+ app: podinfo
+ template:
+ metadata:
+ annotations:
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "9797"
+ labels:
+ app: podinfo
+ spec:
+ containers:
+ - name: podinfod
+ image: ghcr.io/stefanprodan/podinfo:6.0.10
+ imagePullPolicy: IfNotPresent
+ ports:
+ - name: http
+ containerPort: 9898
+ protocol: TCP
+ - name: http-metrics
+ containerPort: 9797
+ protocol: TCP
+ - name: grpc
+ containerPort: 9999
+ protocol: TCP
+ command:
+ - ./podinfo
+ - --port=9898
+ - --port-metrics=9797
+ - --grpc-port=9999
+ - --grpc-service-name=podinfo
+ - --level=info
+ - --random-delay=false
+ - --random-error=false
+ env:
+ - name: PODINFO_UI_COLOR
+ value: "#34577c"
+ livenessProbe:
+ exec:
+ command:
+ - podcli
+ - check
+ - http
+ - localhost:9898/healthz
+ initialDelaySeconds: 5
+ timeoutSeconds: 5
+ readinessProbe:
+ exec:
+ command:
+ - podcli
+ - check
+ - http
+ - localhost:9898/readyz
+ initialDelaySeconds: 5
+ timeoutSeconds: 5
+ resources:
+ limits:
+ cpu: 2000m
+ memory: 512Mi
+ requests:
+ cpu: 100m
+ memory: 64Mi
diff --git a/cmd/flux/testdata/build-kustomization/var-substitution/kustomization.yaml b/cmd/flux/testdata/build-kustomization/var-substitution/kustomization.yaml
new file mode 100644
index 00000000..8edecffd
--- /dev/null
+++ b/cmd/flux/testdata/build-kustomization/var-substitution/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+ - ./deployment.yaml
+generatorOptions:
+ labels:
+ kustomize.toolkit.fluxcd.io/substitute: disabled
+configMapGenerator:
+ - name: flux-grafana-dashboards
+ files:
+ - cluster.json
diff --git a/go.mod b/go.mod
index b3e04463..670a392f 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
github.com/fluxcd/kustomize-controller/api v0.22.3
github.com/fluxcd/notification-controller/api v0.23.2
github.com/fluxcd/pkg/apis/meta v0.12.1
- github.com/fluxcd/pkg/kustomize v0.0.3
+ github.com/fluxcd/pkg/kustomize v0.1.0
github.com/fluxcd/pkg/runtime v0.13.2
github.com/fluxcd/pkg/ssa v0.15.1
github.com/fluxcd/pkg/ssh v0.3.2
diff --git a/go.sum b/go.sum
index 27631410..2748f000 100644
--- a/go.sum
+++ b/go.sum
@@ -391,8 +391,8 @@ github.com/fluxcd/pkg/apis/kustomize v0.3.2 h1:ULoAwOOekHf5cy6mYIwL+K6v8/cfcNVVb
github.com/fluxcd/pkg/apis/kustomize v0.3.2/go.mod h1:p8iAH5TeqMBnnxkkpCNNDvWYfKlNRx89a6WKOo+hJHA=
github.com/fluxcd/pkg/apis/meta v0.12.1 h1:m5PfKAqbqWBvGp9+JRj1sv+xNkGsHwUVf+3rJ8wm6SE=
github.com/fluxcd/pkg/apis/meta v0.12.1/go.mod h1:f8YVt70/KAhqzZ7xxhjvqyzKubOYx2pAbakb/FfCEg8=
-github.com/fluxcd/pkg/kustomize v0.0.3 h1:u1uj8se4bhq0mDrD/qZ3Wbk4/a8Kcbm132tsLwJakm4=
-github.com/fluxcd/pkg/kustomize v0.0.3/go.mod h1:ezVwKj22MUktPCECK5pFvAOh57P1yh3Y6SV2NAt/cd0=
+github.com/fluxcd/pkg/kustomize v0.1.0 h1:koptEkMQoVSdEmOvOPg6EupHPQmfuAV2kgddN2ijelI=
+github.com/fluxcd/pkg/kustomize v0.1.0/go.mod h1:m4R8reRl16zf0aYJTy1uOQUQfM+/KfVaqjwTlAPcYZ4=
github.com/fluxcd/pkg/runtime v0.13.2 h1:6jkQQUbp17WxHsbozlJFCvHmOS4JIB+yB20CdCd8duE=
github.com/fluxcd/pkg/runtime v0.13.2/go.mod h1:dzWNKqFzFXeittbpFcJzR3cdC9CWlbzw+pNOgaVvF/0=
github.com/fluxcd/pkg/ssa v0.15.1 h1:HXAT+K6c9Yy8Evxdyk3DU0KTk3yZ+fwgTEEzU1W/1V8=
--
GitLab