Updating create, delete and get to newer networking v1 extension v1 union functions #4853

mohammedzee1000 · 2021-06-25T11:20:56Z

What type of PR is this?
/kind task

What does this PR do / why we need it:
This is part 2 of the move from extensions v1beta1 ingress to networking v1 ingress

Which issue(s) this PR fixes:

Fixes #4592

PR acceptance criteria:

How to test changes / Special notes to the reviewer:

> odo create nodejs
Devfile Object Validation
 ✓  Checking devfile existence [93840ns]
 ✓  Creating a devfile component from registry: DefaultDevfileRegistry [159109ns]
Validation
 ✓  Validating if devfile name is correct [137914ns]

Please use `odo push` command to create the component with source deployed
> odo url create ingress-3001 --port 3001 --host com --protocol https --ingress --secure
 ✓  URL ingress-3001 created for component: nodejs-nodejs-ex-kfga

To apply the URL configuration changes, please use `odo push`
> odo url create ingress-3002 --port 3002 --host com --protocol http --ingress
 ✓  URL ingress-3002 created for component: nodejs-nodejs-ex-kfga

To apply the URL configuration changes, please use `odo push`
> odo url list
Found the following URLs for component nodejs-nodejs-ex-kfga
NAME             STATE          URL                          PORT     SECURE     KIND
http-3000        Not Pushed     <provided by cluster>        3000     false      route
ingress-3001     Not Pushed     https://ingress-3001.com     3001     true       ingress
ingress-3002     Not Pushed     http://ingress-3002.com      3002     false      ingress
There are local changes. Please run 'odo push'.
> odo push

Validation
 ✓  Validating the devfile [147584ns]

Creating Kubernetes resources for component nodejs-nodejs-ex-kfga
 ✓  Waiting for component to start [2s]
 ✓  Waiting for component to start [454ms]

Applying URL changes
 ✓  URL http-3000: http://http-3000-nodejs-nodejs-ex-kfga-uv.apps.testocp47.psiodo.net/ created
 ✓  URL ingress-3001: https://ingress-3001.com/ created
 ✓  URL ingress-3002: http://ingress-3002.com/ created

Syncing to component nodejs-nodejs-ex-kfga
 ✓  Checking files for pushing [10ms]
 ✓  Syncing files to the component [10s]

Executing devfile commands for component nodejs-nodejs-ex-kfga
 ✓  Waiting for component to start [460ms]
 ✓  Executing install command "npm install" [10s]
 ✓  Executing run command "npm start" [3s]

Pushing devfile component "nodejs-nodejs-ex-kfga"
 ✓  Changes successfully pushed to component
> odo url list
Found the following URLs for component nodejs-nodejs-ex-kfga
NAME             STATE      URL                                                                     PORT     SECURE     KIND
http-3000        Pushed     http://http-3000-nodejs-nodejs-ex-kfga-uv.apps.testocp47.psiodo.net     3000     false      route
ingress-3001     Pushed     https://ingress-3001.com                                                3001     true       ingress
ingress-3002     Pushed     http://ingress-3002.com                                                 3002     false      ingress
> odo url delete ingress-3002
? Are you sure you want to delete the url ingress-3002 Yes
 ✓  URL ingress-3002 removed from component nodejs-nodejs-ex-kfga
> odo url list
Found the following URLs for component nodejs-nodejs-ex-kfga
NAME             STATE               URL                                                                     PORT     SECURE     KIND
http-3000        Pushed              http://http-3000-nodejs-nodejs-ex-kfga-uv.apps.testocp47.psiodo.net     3000     false      route
ingress-3001     Pushed              https://ingress-3001.com                                                3001     true       ingress
ingress-3002     Locally Deleted     http://ingress-3002.com                                                 3002     false      ingress
There are local changes. Please run 'odo push'.
> odo push
 ✓  Waiting for component to start [539ms]

Validation
 ✓  Validating the devfile [170418ns]

Creating Kubernetes resources for component nodejs-nodejs-ex-kfga
 ✓  Waiting for component to start [13s]
 ✓  Waiting for component to start [409ms]

Applying URL changes
 ✓  URL ingress-3002 successfully deleted

Syncing to component nodejs-nodejs-ex-kfga
 ✓  Checking file changes for pushing [3ms]
 ✓  Syncing files to the component [14s]

Executing devfile commands for component nodejs-nodejs-ex-kfga
 ✓  Waiting for component to start [505ms]
 ✓  Executing install command "npm install" [12s]
 ✓  Executing run command "npm start" [4s]

Pushing devfile component "nodejs-nodejs-ex-kfga"
 ✓  Changes successfully pushed to component
> odo url list
Found the following URLs for component nodejs-nodejs-ex-kfga
NAME             STATE      URL                                                                     PORT     SECURE     KIND
http-3000        Pushed     http://http-3000-nodejs-nodejs-ex-kfga-uv.apps.testocp47.psiodo.net     3000     false      route
ingress-3001     Pushed     https://ingress-3001.com                                                3001     true       ingress

> odo list
Devfile Components: 
APP     NAME                      PROJECT     TYPE       STATE
app     nodejs-nodejs-ex-kfga     uv          nodejs     Pushed

> odo list -o json
{
	"kind": "List",
	"apiVersion": "odo.dev/v1alpha1",
	"metadata": {},
	"s2iComponents": [],
	"devfileComponents": [
		{
			"kind": "Component",
			"apiVersion": "odo.dev/v1alpha1",
			"metadata": {
				"name": "nodejs-nodejs-ex-kfga",
				"namespace": "uv",
				"creationTimestamp": null
			},
			"spec": {
				"app": "app",
				"type": "nodejs",
				"sourceType": "local",
				"url": [
					"http-3000",
					"ingress-3001"
				],
				"env": [
					{
						"name": "PROJECTS_ROOT",
						"value": "/project"
					},
					{
						"name": "PROJECT_SOURCE",
						"value": "/project"
					},
					{
						"name": "DEBUG_PORT",
						"value": "5858"
					}
				]
			},
			"status": {
				"state": "Pushed"
			}
		}
	],
	"otherComponents": []
}

> odo version
odo v2.2.2 (8b135744e)

Server: https://api.testocp47.psiodo.net:6443
Kubernetes: v1.20.0+bafe72f
> time odo version
odo v2.2.2 (8b135744e)

Server: https://api.testocp47.psiodo.net:6443
Kubernetes: v1.20.0+bafe72f
odo version  0.22s user 0.04s system 9% cpu 2.749 total
> odo version -v 9
I0701 16:31:15.994282  113297 preference.go:220] The path for preference file is /home/mzee1000/.odo/preference.yaml
I0701 16:31:15.994436  113297 util.go:761] HTTPGetRequest: https://raw.githubusercontent.com/openshift/odo/master/build/VERSION
I0701 16:31:15.994606  113297 util.go:782] Response will be cached in /tmp/odohttpcache for 1h0m0s
I0701 16:31:15.995124  113297 util.go:795] Cached response used.
I0701 16:31:16.003994  113297 preference.go:220] The path for preference file is /home/mzee1000/.odo/preference.yaml
I0701 16:31:16.004236  113297 occlient.go:337] Trying to connect to server api.testocp47.psiodo.net:6443
I0701 16:31:16.367498  113297 occlient.go:344] Server https://api.testocp47.psiodo.net:6443 is up
I0701 16:31:17.961146  113297 occlient.go:1202] Unable to get OpenShift Version - endpoint '/version/openshift' doesn't exist
odo v2.2.2 (8b135744e)

Server: https://api.testocp47.psiodo.net:6443
Kubernetes: v1.20.0+bafe72f
I0701 16:31:18.317514  113297 odo.go:75] Could not get the latest release information in time. Never mind, exiting gracefully :)

mohammedzee1000 · 2021-07-01T11:09:37Z

Seems to be unrelated to code changes
/retest

mohammedzee1000 · 2021-07-01T14:24:40Z

Prow error
/retest

mohammedzee1000 · 2021-07-01T15:17:57Z

psi error
/retest

mohammedzee1000 · 2021-07-01T16:57:56Z

Unrelated
/retest

mik-dass · 2021-07-02T07:06:43Z

pkg/kclient/kclient.go

@@ -55,6 +55,7 @@ type Client struct {
 	// Is server side apply supported by cluster
 	// Use IsSSASupported()
 	isSSASupported                     *bool
+	checkIngressSupports               bool


Please add a comment describing the variable.

mik-dass · 2021-07-02T07:07:33Z

pkg/kclient/kclient.go

-	c.isExtensionV1Beta1IngressSupported, err = c.IsResourceSupported("extensions", "v1beta1", "ingresses")
-	if err != nil {
-		return fmt.Errorf("failed to check extensions v1beta1 ingress support %w", err)
+	if c.checkIngressSupports {


Once the check is done, I think we should mark it to false.

Hmm i guess it makes sense, updating

pkg/odogenerator/ingressgenerator.go

mik-dass · 2021-07-02T07:09:07Z

pkg/unions/kubernetes_ingress.go

@@ -43,3 +44,64 @@ func NewKubernetesIngressFromParams(ingressParams generator.IngressParams) *Kube
 func (ki *KubernetesIngress) IsGenerated() bool {
 	return ki.isGenerated
 }
+
+func (ki *KubernetesIngress) GetName() string {


Please add comments for this and the functions below

mik-dass · 2021-07-02T07:09:59Z

pkg/unions/kubernetes_ingress.go

+	return &KubernetesIngressList{}
+}
+
+func (kil *KubernetesIngressList) GetNetworkingV1IngressList(skipIfExtensionV1Set bool) *v1.IngressList {


Please add a comment describing the varaible skipIfExtensionV1Set in this and the function below

mik-dass · 2021-07-02T07:11:14Z

pkg/url/types.go

+func NewURLsFromKubernetesIngressList(kil *unions.KubernetesIngressList) []URL {
+	var ul []URL
+	for _, it := range kil.Items {
+		ul = append(ul, NewURLFromKubernetesIngress(it))


if NewURLFromKubernetesIngress() returns URL{}, we should continue instead of adding the empty ingress to the list.

valaparthvi · 2021-07-02T07:56:25Z

/approve
Functionality lgtm. I did not see the warning messages in any of the commands(ones in the description, odo describe, odo url list -o json) that I ran.

openshift-ci · 2021-07-02T07:56:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: valaparthvi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [valaparthvi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

This also upgrades uts for listingress to use netv1 ingress with a single case to validate extensionv1 ingress Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

sonarcloud · 2021-07-02T08:15:09Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

mik-dass

/lgtm

openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. Required by Prow. kind/task Issue is actionable task labels Jun 25, 2021

openshift-ci bot requested review from dharmit and valaparthvi June 25, 2021 11:21

mohammedzee1000 force-pushed the v1ingressp2 branch 4 times, most recently from 8d95e77 to d57b7a4 Compare July 1, 2021 05:55

mohammedzee1000 changed the title ~~[WIP] Updating create, delete and get to newer networking v1 extension v1 union functions~~ Updating create, delete and get to newer networking v1 extension v1 union functions Jul 1, 2021

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. Required by Prow. label Jul 1, 2021

mik-dass reviewed Jul 2, 2021

View reviewed changes

pkg/odogenerator/ingressgenerator.go Show resolved Hide resolved

mik-dass reviewed Jul 2, 2021

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. Required by Prow. label Jul 2, 2021

mohammedzee1000 added 7 commits July 2, 2021 13:43

Moving to KubernetesIngressList for list ops

e2f8423

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Cleaning up

b859f85

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Localizing check ingress support

95cf2b1

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Fixing gosimple issue

a38db3e

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Removing remaining refs for old list ingress func

9668777

This also upgrades uts for listingress to use netv1 ingress with a single case to validate extensionv1 ingress Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Removing GetIngressExtensionv1 and updating tests

2b142f5

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Updating create, delete ingress

fc178cd

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

mohammedzee1000 added 7 commits July 2, 2021 13:43

Fixing code smells

e237546

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Using kubernetesingress func to get urlstring

ae196cc

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Fixing generator as per errors and commenting as needed

b10ea20

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Remove unneeded line

89eb716

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Removing unnessasary comments

8c18f1c

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Addressing comments by @mrdas

029cb91

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Adding changelog entry

062f13f

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

mohammedzee1000 force-pushed the v1ingressp2 branch from bf597f3 to 062f13f Compare July 2, 2021 08:14

mohammedzee1000 requested a review from mik-dass July 2, 2021 09:13

mik-dass approved these changes Jul 2, 2021

View reviewed changes

openshift-ci bot assigned mik-dass Jul 2, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. Required by Prow. label Jul 2, 2021

openshift-merge-robot merged commit 34c11ca into redhat-developer:main Jul 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updating create, delete and get to newer networking v1 extension v1 union functions #4853

Updating create, delete and get to newer networking v1 extension v1 union functions #4853

mohammedzee1000 commented Jun 25, 2021 •

edited

Loading

mohammedzee1000 commented Jul 1, 2021

mohammedzee1000 commented Jul 1, 2021

mohammedzee1000 commented Jul 1, 2021

mohammedzee1000 commented Jul 1, 2021

mik-dass Jul 2, 2021

mohammedzee1000 Jul 2, 2021

mik-dass Jul 2, 2021

mohammedzee1000 Jul 2, 2021

mik-dass Jul 2, 2021

mohammedzee1000 Jul 2, 2021

mik-dass Jul 2, 2021

mohammedzee1000 Jul 2, 2021

mik-dass Jul 2, 2021

mohammedzee1000 Jul 2, 2021

valaparthvi commented Jul 2, 2021 •

edited

Loading

openshift-ci bot commented Jul 2, 2021

sonarcloud bot commented Jul 2, 2021

mik-dass left a comment

Updating create, delete and get to newer networking v1 extension v1 union functions #4853

Updating create, delete and get to newer networking v1 extension v1 union functions #4853

Conversation

mohammedzee1000 commented Jun 25, 2021 • edited Loading

mohammedzee1000 commented Jul 1, 2021

mohammedzee1000 commented Jul 1, 2021

mohammedzee1000 commented Jul 1, 2021

mohammedzee1000 commented Jul 1, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

valaparthvi commented Jul 2, 2021 • edited Loading

openshift-ci bot commented Jul 2, 2021

sonarcloud bot commented Jul 2, 2021

mik-dass left a comment

Choose a reason for hiding this comment

mohammedzee1000 commented Jun 25, 2021 •

edited

Loading

valaparthvi commented Jul 2, 2021 •

edited

Loading