Merge branch 'main' into split/fn-eval-namespace-v2

Author: SurbhiAgarwal1

CONTRIBUTING.md

@@ -57,6 +57,14 @@ All submissions, including submissions by project members, require review. We
 use GitHub pull requests for this purpose. Consult [GitHub Help] for more
 information on using pull requests.
 
+Process for code reviews. Before requesting human review, a PR must:
+
+* All tests passing
+* All linting passing
+* Meeting project code quality requirements, including passing all configured static analysis / SonarCloud quality gates and not reducing automated test coverage for the affected components
+* The comments from the first run of automatically generated comments (AI generated comments, SonarCloud comments, bot generated comments, etc.) of the PR are addressed (addressing further re-runs of AI are optional)
+* If it is not possible to resolve an automatic comment, please add a sub-comment indicating why the automated comment cannot be resolved or ask for help in resolving the comment
+
 ## Community Guidelines
 
 This project follows a [Code of Conduct].
@@ -126,7 +134,7 @@ It's usually a good idea to test locally for the following:
 
 #### Update docs
 
-Docs are under [documentation/]. Refer to (the README,md)[documentation/README.md] in the folder to details about
+Docs are under [documentation/](documentation/). Refer to the [README.md](documentation/README.md) in the folder for details about
 documentation contributions. 
 
 

e2e/testdata/fn-render/basicpipeline-semver/.expected/diff.patch

@@ -1,5 +1,5 @@
 diff --git a/Kptfile b/Kptfile
-index 68ea4fc..85f42f5 100644
+index 2336da4..ca2bcea 100644
 --- a/Kptfile
 +++ b/Kptfile
 @@ -1,14 +1,16 @@
@@ -15,24 +15,28 @@ index 68ea4fc..85f42f5 100644
 -        namespace: staging
 -    - image: ghcr.io/kptdev/krm-functions-catalog/set-labels
 -      tag: "~0.2"
--      configMap:
--        tier: backend
-+apiVersion: kpt.dev/v1
-+kind: Kptfile
-+metadata:
-+  name: app
-+  labels:
-+    tier: backend
-+pipeline:
-+  mutators:
-+    - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace
-+      tag: "0.4.1 - 0.4.3"
-+      configMap:
-+        namespace: staging
-+    - image: ghcr.io/kptdev/krm-functions-catalog/set-labels
-+      tag: "~0.2"
-+      configMap:
-+        tier: backend
+       configMap:
+         tier: backend
++      tag: ~0.2
++status:
++  conditions:
++    - type: Rendered
++      status: "True"
++      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.4.3
++        exitCode: 0
++        results:
++          - message: namespace [default] updated to "staging", 1 value(s) changed
++            severity: info
++          - message: all `depends-on` annotations are up-to-date. no `namespace` changed
++            severity: info
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.2.4
++        exitCode: 0
++        results:
++          - message: set 4 labels in total
++            severity: info
 diff --git a/resources.yaml b/resources.yaml
 index ffbb3d7..936d957 100644
 --- a/resources.yaml

e2e/testdata/fn-render/krm-check-exclude-kustomize/.expected/diff.patch

@@ -1,5 +1,5 @@
 diff --git a/Kptfile b/Kptfile
-index 2985a1a..3dfdcf6 100644
+index 2985a1a..30b4376 100644
 --- a/Kptfile
 +++ b/Kptfile
 @@ -2,6 +2,8 @@ apiVersion: kpt.dev/v1
@@ -11,6 +11,17 @@ index 2985a1a..3dfdcf6 100644
  pipeline:
    mutators:
      - image: set-labels:v0.1.5
+       configMap:
+         tier: backend
++status:
++  conditions:
++    - type: Rendered
++      status: "True"
++      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
++        exitCode: 0
 diff --git a/kustomization.yaml b/kustomization.yaml
 index f3f0207..6c517af 100644
 --- a/kustomization.yaml

e2e/testdata/fn-render/missing-fn-image/.expected/diff.patch

@@ -1,5 +1,5 @@
 diff --git a/Kptfile b/Kptfile
-index 11012de..9fadb6e 100644
+index 11012de..a0f4634 100644
 --- a/Kptfile
 +++ b/Kptfile
 @@ -7,6 +7,26 @@ pipeline:
@@ -22,11 +22,11 @@ index 11012de..9fadb6e 100644
 +    mutationSteps:
 +      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
 +        exitCode: 0
-+      - image: ghcr.io/kptdev/krm-functions-catalog/dne
++      - image: ghcr.io/kptdev/krm-functions-catalog/dne:latest
 +        stderr: |-
 +          docker: Error response from daemon: error from registry: denied
 +          denied
 +
 +          Run 'docker run --help' for more information
 +        exitCode: 125
-+    errorSummary: 'ghcr.io/kptdev/krm-functions-catalog/dne: exit code 125'
++    errorSummary: 'ghcr.io/kptdev/krm-functions-catalog/dne:latest: exit code 125'

e2e/testdata/fn-render/no-op/.expected/diff.patch

@@ -1,188 +1,17 @@
 diff --git a/Kptfile b/Kptfile
-index 1e0e356..a7a2d0b 100644
+index a7a2d0b..3dbfee4 100644
 --- a/Kptfile
 +++ b/Kptfile
-@@ -1,7 +1,7 @@
--apiVersion: kpt.dev/v1
--kind: Kptfile
--metadata:
--  name: app
--pipeline:
--  mutators:
--    - image: ghcr.io/kptdev/krm-functions-catalog/no-op
-+apiVersion: kpt.dev/v1
-+kind: Kptfile
-+metadata:
-+  name: app
-+pipeline:
-+  mutators:
-+    - image: ghcr.io/kptdev/krm-functions-catalog/no-op
-diff --git a/resources.yaml b/resources.yaml
-index c0974f0..60f96f2 100644
---- a/resources.yaml
-+++ b/resources.yaml
-@@ -1,82 +1,82 @@
--# Copyright 2021 The kpt Authors
--#
--# 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: my-nginx
--  namespace: my-space
--  labels:
--    env: dev
--    foo: bar
--spec:
--  # comment 1
--  replicas: 3
--  selector:
--    # comment 2
--    matchLabels: # comment 3
--      # comment 4
--      app: nginx # comment 5
--  template:
--    metadata:
--      labels:
--        app: nginx
--    spec:
--      # comment 6
--      containers:
--        # comment 7
--        - name: nginx
--          image: 'nginx:1.14.2' # comment 8
--          ports:
--            # comment 9
--            - containerPort: 80 # comment 10
-----
--apiVersion: v1
--kind: Service
--metadata:
--  name: my-service
--spec:
--  ports:
--    # comment 1
--    - name: etcd-server-ssl
--      port: 2380
--    # comment 2
--    - name: etcd-client-ssl
--      port: 2379
-----
--apiVersion: constraints.gatekeeper.sh/v1beta1
--kind: EnforceFoo
--metadata:
--  name: enforce-foo
--spec:
--  parameters:
--    naming_rules:
--      - kind: Folder
--        patterns:
--          # comment 1
--          - ^(dev|prod|staging|qa|shared)$
-----
--apiVersion: v1
--kind: ConfigMap
--metadata:
--  name: setters-config
--data:
--  # This should be the name of your Config Controller instance
--  cluster-name: cluster-name
--  # This should be the project where you deployed Config Controller
--  project-id: project-id
--  project-number: '1234567890123'
--  # You can leave these defaults
--  namespace: config-control
--  deployment-repo: deployment-repo
--  source-repo: source-repo
-+# Copyright 2021 The kpt Authors
-+#
-+# 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: my-nginx
-+  namespace: my-space
-+  labels:
-+    env: dev
-+    foo: bar
-+spec:
-+  # comment 1
-+  replicas: 3
-+  selector:
-+    # comment 2
-+    matchLabels: # comment 3
-+      # comment 4
-+      app: nginx # comment 5
-+  template:
-+    metadata:
-+      labels:
-+        app: nginx
-+    spec:
-+      # comment 6
-+      containers:
-+        # comment 7
-+        - name: nginx
-+          image: 'nginx:1.14.2' # comment 8
-+          ports:
-+            # comment 9
-+            - containerPort: 80 # comment 10
-+---
-+apiVersion: v1
-+kind: Service
-+metadata:
-+  name: my-service
-+spec:
-+  ports:
-+    # comment 1
-+    - name: etcd-server-ssl
-+      port: 2380
-+    # comment 2
-+    - name: etcd-client-ssl
-+      port: 2379
-+---
-+apiVersion: constraints.gatekeeper.sh/v1beta1
-+kind: EnforceFoo
-+metadata:
-+  name: enforce-foo
-+spec:
-+  parameters:
-+    naming_rules:
-+      - kind: Folder
-+        patterns:
-+          # comment 1
-+          - ^(dev|prod|staging|qa|shared)$
-+---
-+apiVersion: v1
-+kind: ConfigMap
-+metadata:
-+  name: setters-config
-+data:
-+  # This should be the name of your Config Controller instance
-+  cluster-name: cluster-name
-+  # This should be the project where you deployed Config Controller
-+  project-id: project-id
-+  project-number: '1234567890123'
-+  # You can leave these defaults
-+  namespace: config-control
-+  deployment-repo: deployment-repo
-+  source-repo: source-repo
+@@ -5,3 +5,12 @@ metadata:
+ pipeline:
+   mutators:
+     - image: ghcr.io/kptdev/krm-functions-catalog/no-op
++status:
++  conditions:
++    - type: Rendered
++      status: "True"
++      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/no-op:latest
++        exitCode: 0

e2e/testdata/fn-render/short-image-path/.expected/diff.patch

@@ -1,5 +1,5 @@
 diff --git a/Kptfile b/Kptfile
-index 5e29eb2..37954f5 100644
+index d4e5935..24022da 100644
 --- a/Kptfile
 +++ b/Kptfile
 @@ -2,6 +2,8 @@ apiVersion: kpt.dev/v1
@@ -10,7 +10,22 @@ index 5e29eb2..37954f5 100644
 +    tier: backend
  pipeline:
    mutators:
-     - image: set-namespace:latest
+     - image: set-namespace:v0.2.0
+@@ -10,3 +13,14 @@ pipeline:
+     - image: set-labels:v0.1.5
+       configMap:
+         tier: backend
++status:
++  conditions:
++    - type: Rendered
++      status: "True"
++      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
++        exitCode: 0
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
++        exitCode: 0
 diff --git a/resources.yaml b/resources.yaml
 index f2eec52..e7f0c0b 100644
 --- a/resources.yaml

internal/fnruntime/container.go

@@ -80,7 +80,6 @@ type ContainerFn struct {
 
 	// Image is the container image to run
 	Image string
-	Tag   string
 	// ImagePullPolicy controls the image pulling behavior.
 	ImagePullPolicy runneroptions.ImagePullPolicy
 	// Container function will be killed after this timeour.
@@ -152,21 +151,6 @@ func (f *ContainerFn) Run(reader io.Reader, writer io.Writer) error {
 		return err
 	}
 
-	if f.Tag != "" {
-		tagResolver := &TagResolver{
-			lister: &RegClientLister{
-				client: regclient.New(
-					regclient.WithUserAgent(UserAgent),
-					regclient.WithDockerCreds(),
-				),
-			},
-		}
-		f.Image, err = tagResolver.ResolveFunctionImage(f.Ctx, f.Image, f.Tag)
-		if err != nil {
-			return err
-		}
-	}
-
 	switch runtime {
 	case Podman:
 		return f.runCLI(reader, writer, podmanBin, filterPodmanCLIOutput)