Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update crd version for Kptfile to v1 #2248

Merged
merged 12 commits into from
Jun 17, 2021
2 changes: 1 addition & 1 deletion e2e/live/testdata/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/continue-on-error/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/migrate-case-1a/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/migrate-case-1b/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/migrate-error/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/rbac-error-step-2/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/rg-test-case-1a/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/rg-test-case-1b/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/test-case-1a/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
2 changes: 1 addition & 1 deletion e2e/live/testdata/test-case-1b/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: test1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/Kptfile b/Kptfile
index fa1bd2d..dd352a8 100644
index 1f982e2..d815cdb 100644
--- a/Kptfile
+++ b/Kptfile
@@ -2,16 +2,7 @@ apiVersion: kpt.dev/v1alpha2
@@ -2,16 +2,7 @@ apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: nginx
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/fn-eval/consistent-formatting/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: nginx
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/fn-eval/exclude-fn-config-by-default/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/fn-eval/exclude-kptfile-by-default/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ index 7a494c9..254b9cd 100644
name: custom
+ namespace: staging
spec:
image: nginx:1.2.3
image: nginx:1.2.3
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/Kptfile b/Kptfile
deleted file mode 100644
index 39dec05..0000000
index f5bb2df..0000000
--- a/Kptfile
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: kpt.dev/v1alpha2
-apiVersion: kpt.dev/v1
-kind: Kptfile
-metadata:
- name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/Kptfile b/Kptfile
index 39dec05..47f7bf4 100644
index f5bb2df..4fad916 100644
--- a/Kptfile
+++ b/Kptfile
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1alpha2
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/Kptfile b/Kptfile
index 39dec05..47f7bf4 100644
index f5bb2df..4fad916 100644
--- a/Kptfile
+++ b/Kptfile
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1alpha2
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: FunctionResultList
metadata:
name: fnresults
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ index 7a494c9..254b9cd 100644
name: custom
+ namespace: staging
spec:
image: nginx:1.2.3
image: nginx:1.2.3
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

runCount: 2
testType: eval
image: gcr.io/kpt-fn/set-namespace:v0.1.3
includeMetaResources: true
args:
namespace: staging
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/Kptfile b/Kptfile
index 39dec05..47f7bf4 100644
--- a/Kptfile
+++ b/Kptfile
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1alpha2
kind: Kptfile
metadata:
name: app
+ namespace: staging
pipeline:
mutators:
- image: gcr.io/kpt-fn/set-labels:v0.1.4
diff --git a/labelconfig.yaml b/labelconfig.yaml
index 7ef9890..f3a8b49 100644
--- a/labelconfig.yaml
+++ b/labelconfig.yaml
@@ -15,5 +15,6 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: label-config
+ namespace: staging
data:
tier: app
diff --git a/resources.yaml b/resources.yaml
index 7a494c9..254b9cd 100644
--- a/resources.yaml
+++ b/resources.yaml
@@ -15,6 +15,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: nginx-deployment
+ namespace: staging
spec:
replicas: 3
---
@@ -22,5 +23,6 @@ apiVersion: custom.io/v1
kind: Custom
metadata:
name: custom
+ namespace: staging
spec:
image: nginx:1.2.3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.expected
8 changes: 8 additions & 0 deletions e2e/testdata/fn-eval/include-meta-resources-v1alpha2/Kptfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: kpt.dev/v1alpha2
kind: Kptfile
metadata:
name: app
pipeline:
mutators:
- image: gcr.io/kpt-fn/set-labels:v0.1.4
configPath: labelconfig.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: v1
kind: ConfigMap
metadata:
name: label-config
data:
tier: app
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: apps/v1
kind: Deployment
metadata:
name: nginx-deployment
spec:
replicas: 3
---
apiVersion: custom.io/v1
kind: Custom
metadata:
name: custom
spec:
image: nginx:1.2.3
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/Kptfile b/Kptfile
index 39dec05..47f7bf4 100644
index f5bb2df..4fad916 100644
--- a/Kptfile
+++ b/Kptfile
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1alpha2
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/fn-eval/include-meta-resources/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: FunctionResultList
metadata:
name: fnresults
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/fn-eval/out-of-place-dir/.expected/diff.patch
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ index 0000000..254b9cd
+ name: custom
+ namespace: staging
+spec:
+ image: nginx:1.2.3
+ image: nginx:1.2.3
2 changes: 1 addition & 1 deletion e2e/testdata/fn-eval/out-of-place-fnchain-unwrap/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ index 0000000..254b9cd
+ name: custom
+ namespace: staging
+spec:
+ image: nginx:1.2.3
+ image: nginx:1.2.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: FunctionResultList
metadata:
name: fnresults
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: db
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/Kptfile b/Kptfile
index 39dec05..47f7bf4 100644
index f5bb2df..4fad916 100644
--- a/Kptfile
+++ b/Kptfile
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1alpha2
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand All @@ -11,10 +11,10 @@ index 39dec05..47f7bf4 100644
mutators:
- image: gcr.io/kpt-fn/set-labels:v0.1.4
diff --git a/db/Kptfile b/db/Kptfile
index 268f438..ab19d9f 100644
index 6218d66..b776983 100644
--- a/db/Kptfile
+++ b/db/Kptfile
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1alpha2
@@ -2,6 +2,7 @@ apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: db
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/fn-eval/subpkg-include-meta-resources/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: db
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ index 6590f6c..0000000
-metadata:
- name: nginx-deployment
-spec:
- replicas: 3
- replicas: 3
2 changes: 1 addition & 1 deletion e2e/testdata/fn-render/all-resource-deletion/Kptfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kpt.dev/v1alpha2
apiVersion: kpt.dev/v1
kind: Kptfile
metadata:
name: app
Expand Down
Loading