Autosetters with Subpkgs

kptdev · Sep 2, 2020 · def5b9e · def5b9e
1 parent c2d7889
commit def5b9e
Show file tree

Hide file tree

Showing 15 changed files with 350 additions and 82 deletions.
diff --git a/go.sum b/go.sum
@@ -677,30 +677,14 @@ sigs.k8s.io/kustomize/cmd/config v0.6.1-0.20200821151426-7833c6edcf2c h1:wrtDvd0
 sigs.k8s.io/kustomize/cmd/config v0.6.1-0.20200821151426-7833c6edcf2c/go.mod h1:ZZoulwUOBeva15nGEnY9/yEc+TVg78EdW7jgADptBCc=
 sigs.k8s.io/kustomize/cmd/config v0.6.1-0.20200821211955-ff3f39d84bc8 h1:KeFdYzV+GzrsRhE7OSr2RF91h/cc86w7QLYUzs7kS/g=
 sigs.k8s.io/kustomize/cmd/config v0.6.1-0.20200821211955-ff3f39d84bc8/go.mod h1:ZZoulwUOBeva15nGEnY9/yEc+TVg78EdW7jgADptBCc=
-sigs.k8s.io/kustomize/cmd/config v0.7.0 h1:lLp+LQJB4pZtD5mgMxVlGSbdb2qjt3IiGr27mWL9nTE=
-sigs.k8s.io/kustomize/cmd/config v0.7.0/go.mod h1:ORl2Fv3uSV4Wr8FKynZUFe8Xb5ct/bVZrzbiz+/GEFs=
 sigs.k8s.io/kustomize/cmd/config v0.7.1-0.20200901182351-ba0f583ee5cc h1:UxWoxrwzhxWJjYjK9XG1hPRtT9CXxy6Te4iXuJJgJHc=
 sigs.k8s.io/kustomize/cmd/config v0.7.1-0.20200901182351-ba0f583ee5cc/go.mod h1:Hf7Qf/NCo3PEglHxO/2YkV2L9J5mL5eJTiNqzb+V5ww=
-sigs.k8s.io/kustomize/kyaml v0.4.0 h1:jMQrJOJmiUz5Y018ki0mXWpEreEXjvad1NRfXTdi9vU=
-sigs.k8s.io/kustomize/kyaml v0.4.0/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw=
-sigs.k8s.io/kustomize/kyaml v0.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
-sigs.k8s.io/kustomize/kyaml v0.6.0 h1:Z/9TxsiG21sbcd6JD4IeM6BVZ2+04001KKzbxCf+qeY=
-sigs.k8s.io/kustomize/kyaml v0.6.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
-sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200819192723-596c39b7bcb7 h1:iQG6l9KYbKkOscdCtKoqPeMNKPdAuQmYz75h8H32V3k=
-sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200819192723-596c39b7bcb7/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
-sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200821151426-7833c6edcf2c h1:T00VIgIncSB9KoELC5BKBDhEkc5iWKqPkN9BV86d2j8=
-sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200821151426-7833c6edcf2c/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
-sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200821211955-ff3f39d84bc8 h1:Taf2IRt1OB+WTN6FekOoLUtiOESpRa72vNsFdvB4ou4=
-sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200821211955-ff3f39d84bc8/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
-sigs.k8s.io/kustomize/kyaml v0.7.1 h1:Ih6SJPvfKYfZaIFWUa2YAyg/0ZSTpA3LFjR/hv7+8ao=
 sigs.k8s.io/kustomize/kyaml v0.7.1/go.mod h1:ne3F9JPhW2wrVaLslxBsEe6MQJQ9YK5rUutrdhBWXwI=
 sigs.k8s.io/kustomize/kyaml v0.7.2-0.20200901182351-ba0f583ee5cc h1:Qm8rWTBPRAILfFFws0RwkiTWq6g/sqH4sz0BITVG1u8=
 sigs.k8s.io/kustomize/kyaml v0.7.2-0.20200901182351-ba0f583ee5cc/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=
-sigs.k8s.io/testing_frameworks v0.1.2 h1:vK0+tvjF0BZ/RYFeZ1E6BYBwHJJXhjuZ3TdsEKH+UQM=
 sigs.k8s.io/testing_frameworks v0.1.2/go.mod h1:ToQrwSC3s8Xf/lADdZp3Mktcql9CG0UAmdJG9th5i0w=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=

diff --git a/internal/testutil/testdata/dataset-with-autosetters-set/mysql/Kptfile b/internal/testutil/testdata/dataset-with-autosetters-set/mysql/Kptfile
@@ -0,0 +1,22 @@
+apiVersion: krm.dev/v1alpha1
+kind: Kptfile
+metadata:
+  name: mysql
+packageMetadata:
+  shortDescription: sample description
+openAPI:
+  definitions:
+    io.k8s.cli.setters.gcloud.core.project:
+      x-k8s-cli:
+        setter:
+          name: gcloud.core.project
+          value: my-project
+          setBy: kpt
+          isSet: true
+    io.k8s.cli.setters.gcloud.project.projectNumber:
+      x-k8s-cli:
+        setter:
+          name: gcloud.project.projectNumber
+          value: "1234"
+          setBy: kpt
+          isSet: true
diff --git a/internal/testutil/testdata/dataset-with-autosetters-set/mysql/deployment.yaml b/internal/testutil/testdata/dataset-with-autosetters-set/mysql/deployment.yaml
@@ -0,0 +1,16 @@
+# Copyright 2019 The Kubernetes Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: my-project # {"$openapi":"gcloud.core.project"}
+  name: mysql-deployment
+spec:
+  replicas: 3
+  foo: "1234" # {"$openapi":"gcloud.project.projectNumber"}
+  template:
+    spec:
+      containers:
+      - name: mysql
+        image: mysql:1.7.9
diff --git a/internal/testutil/testdata/dataset-with-autosetters-set/mysql/nosetters/Kptfile b/internal/testutil/testdata/dataset-with-autosetters-set/mysql/nosetters/Kptfile
@@ -0,0 +1,6 @@
+apiVersion: krm.dev/v1alpha1
+kind: Kptfile
+metadata:
+  name: storage
+packageMetadata:
+  shortDescription: sample description
diff --git a/internal/testutil/testdata/dataset-with-autosetters-set/mysql/nosetters/deployment.yaml b/internal/testutil/testdata/dataset-with-autosetters-set/mysql/nosetters/deployment.yaml
@@ -0,0 +1,15 @@
+# Copyright 2019 The Kubernetes Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: myspace
+  name: nosetters-deployment
+spec:
+  replicas: 4
+  template:
+    spec:
+      containers:
+      - name: nosetters
+        image: nosetters:1.7.7
diff --git a/internal/testutil/testdata/dataset-with-autosetters-set/mysql/storage/Kptfile b/internal/testutil/testdata/dataset-with-autosetters-set/mysql/storage/Kptfile
@@ -0,0 +1,22 @@
+apiVersion: krm.dev/v1alpha1
+kind: Krmfile
+metadata:
+  name: storage
+packageMetadata:
+  shortDescription: sample description
+openAPI:
+  definitions:
+    io.k8s.cli.setters.gcloud.core.project:
+      x-k8s-cli:
+        setter:
+          name: gcloud.core.project
+          value: my-project
+          setBy: kpt
+          isSet: true
+    io.k8s.cli.setters.gcloud.project.projectNumber:
+      x-k8s-cli:
+        setter:
+          name: gcloud.project.projectNumber
+          value: "1234"
+          setBy: kpt
+          isSet: true
diff --git a/internal/testutil/testdata/dataset-with-autosetters-set/mysql/storage/deployment.yaml b/internal/testutil/testdata/dataset-with-autosetters-set/mysql/storage/deployment.yaml
@@ -0,0 +1,16 @@
+# Copyright 2019 The Kubernetes Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: my-project # {"$openapi":"gcloud.core.project"}
+  name: storage-deployment
+spec:
+  replicas: 4
+  foo: "1234" # {"$openapi":"gcloud.project.projectNumber"}
+  template:
+    spec:
+      containers:
+      - name: storage
+        image: storage:1.7.7
diff --git a/internal/testutil/testdata/dataset-with-autosetters/mysql/Kptfile b/internal/testutil/testdata/dataset-with-autosetters/mysql/Kptfile
@@ -0,0 +1,18 @@
+apiVersion: krm.dev/v1alpha1
+kind: Kptfile
+metadata:
+  name: mysql
+packageMetadata:
+  shortDescription: sample description
+openAPI:
+  definitions:
+    io.k8s.cli.setters.gcloud.core.project:
+      x-k8s-cli:
+        setter:
+          name: gcloud.core.project
+          value: PROJECT_ID
+    io.k8s.cli.setters.gcloud.project.projectNumber:
+      x-k8s-cli:
+        setter:
+          name: gcloud.project.projectNumber
+          value: PROJECT_NUMBER
diff --git a/internal/testutil/testdata/dataset-with-autosetters/mysql/deployment.yaml b/internal/testutil/testdata/dataset-with-autosetters/mysql/deployment.yaml
@@ -0,0 +1,16 @@
+# Copyright 2019 The Kubernetes Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: myspace # {"$openapi":"gcloud.core.project"}
+  name: mysql-deployment
+spec:
+  replicas: 3
+  foo: bar # {"$openapi":"gcloud.project.projectNumber"}
+  template:
+    spec:
+      containers:
+      - name: mysql
+        image: mysql:1.7.9
diff --git a/internal/testutil/testdata/dataset-with-autosetters/mysql/nosetters/Kptfile b/internal/testutil/testdata/dataset-with-autosetters/mysql/nosetters/Kptfile
@@ -0,0 +1,6 @@
+apiVersion: krm.dev/v1alpha1
+kind: Kptfile
+metadata:
+  name: storage
+packageMetadata:
+  shortDescription: sample description
diff --git a/internal/testutil/testdata/dataset-with-autosetters/mysql/nosetters/deployment.yaml b/internal/testutil/testdata/dataset-with-autosetters/mysql/nosetters/deployment.yaml
@@ -0,0 +1,15 @@
+# Copyright 2019 The Kubernetes Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: myspace
+  name: nosetters-deployment
+spec:
+  replicas: 4
+  template:
+    spec:
+      containers:
+      - name: nosetters
+        image: nosetters:1.7.7
diff --git a/internal/testutil/testdata/dataset-with-autosetters/mysql/storage/Kptfile b/internal/testutil/testdata/dataset-with-autosetters/mysql/storage/Kptfile
@@ -0,0 +1,18 @@
+apiVersion: krm.dev/v1alpha1
+kind: Krmfile
+metadata:
+  name: storage
+packageMetadata:
+  shortDescription: sample description
+openAPI:
+  definitions:
+    io.k8s.cli.setters.gcloud.core.project:
+      x-k8s-cli:
+        setter:
+          name: gcloud.core.project
+          value: PROJECT_ID
+    io.k8s.cli.setters.gcloud.project.projectNumber:
+      x-k8s-cli:
+        setter:
+          name: gcloud.project.projectNumber
+          value: PROJECT_NUMBER
diff --git a/internal/testutil/testdata/dataset-with-autosetters/mysql/storage/deployment.yaml b/internal/testutil/testdata/dataset-with-autosetters/mysql/storage/deployment.yaml
@@ -0,0 +1,16 @@
+# Copyright 2019 The Kubernetes Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: myspace # {"$openapi":"gcloud.core.project"}
+  name: storage-deployment
+spec:
+  replicas: 4
+  foo: bar # {"$openapi":"gcloud.project.projectNumber"}
+  template:
+    spec:
+      containers:
+      - name: storage
+        image: storage:1.7.7