feat: added support of new ingress apiVersion

@DmitriyStoyanov

Thank you for contributions to GitLab. We believe that everyone can contribute and contributions like yours are what make GitLab great!

Our Merge request coaches will make sure the most relevant people review it in a timely manner.

If after a few days, there's no message from a GitLab team member, feel free to ping @gitlab-org/coaches.

These resources may help you to move your Merge Request to the next steps:

added Community contribution label

added 3 commits

bf215a48...a8a5b569 - 2 commits from branch gitlab-org/cluster-integration:master
a54491c3 - Merge branch 'master' of...

Compare with previous version

added 1 commit

a91bffa6 - Added ability to use with 1.14-0 version

Compare with previous version

added 1 commit

72fedf00 - Added ability to use apiVersion networking.k8s.io/v1

Compare with previous version

added 1 commit

c0d25b6a - Removed extra dollar sign from Capabilities

Compare with previous version

marked this merge request as ready

/cc @Alexand @shinya.maeda @hfyngvason

added AutoDeploy label

mentioned in issue gitlab-org/quality/triage-reports#1614 (closed)

added devopsconfigure [DEPRECATED] featureaddition groupconfigure [DEPRECATED] typefeature labels

changed the description

@Alexand would you mind taking the first review?

@DmitriyStoyanov could you please rebase your branch on latest master and edit the commits to follow the git commit guidelines

assigned to @DmitriyStoyanov

requested review from @Alexand

Thanks a lot @DmitriyStoyanov !

I've only one significant concern, please let me know what you think.

marked this merge request as draft

added 19 commits

c0d25b6a...72ca54e6 - 13 commits from branch gitlab-org/cluster-integration:master
e0903c16 - Added support of new ingress apiVersion
e2d538d9 - Added ability to use with 1.14-0 version
204db838 - Added ability to use apiVersion networking.k8s.io/v1
d7a25c89 - Removed extra dollar sign from Capabilities
d2f3a0b7 - Merge branch 'ingress_api_version' of...
9888673c - Moved to use .Capabilities.APIVersions.Has instead of deprecated...

Compare with previous version

added 1 commit

bfc02ef6 - feat: Added support of new ingress apiVersion

Compare with previous version

added 7 commits

bfc02ef6...72ca54e6 - 6 commits from branch gitlab-org/cluster-integration:master
2a5c410f - feat: added support of new ingress apiVersion

Compare with previous version

marked this merge request as ready

changed title from Draft: Added support of new ingress apiVersion to feat: added support of new ingress apiVersion

resolved all threads

added sectionops label

approved this merge request

Thanks, @DmitriyStoyanov . LGTM!

I also manually tested this on K3s with K8s versions 1.16 and 1.19.

@hfyngvason would you like to proceed the review?

requested review from @hfyngvason

removed review request for @Alexand

Thanks again @DmitriyStoyanov for the contribution and thanks @Alexand for the review

@DmitriyStoyanov The template code looks good to me, just a couple of small things before we can merge:

(1) The chart version in assets/auto-deploy-app/Chart.yaml needs to be updated. This is a feat change, and the latest release is 2.4.0, so the next version will be 2.5.0. Could you please change it?

(We have an automated check for this, but unfortunately it doesn't work for forks #25. Sorry about that!)

(2) All of our ingress template unit tests still read the resources as extensions/v1beta1. Would you mind adding a test for each of the two newly supported API versions?

Just a small function for each, to make sure it deserializes correctly. Something like this:

func TestIngressTemplate_NetworkingV1Beta1(t *testing.T) {
	templates := []string{"templates/ingress.yaml"}
	releaseName := "ingress-networking-v1beta1"
	output := helm.RenderTemplate(t, opts, helmChartPath, releaseName, templates, "--api-versions", "networking.k8s.io/v1beta1/Ingress") 
	ingress := new(networkingv1beta1.Ingress) // need to import networkingv1beta1
	helm.UnmarshalK8SYaml(t, output, ingress)
	require.Equal(t, ...) // maybe check one or two values
}

func TestIngressTemplate_NetworkingV1(t *testing.T) {
	// ...
}

Let me know what you think!

resolved all threads

added 1 commit

53437f51 - Increased version of helm chart

Compare with previous version

added 1 commit

0923b101 - feat: added support of new ingress apiVersion

Compare with previous version

added 12 commits

0923b101...c2cde787 - 9 commits from branch gitlab-org/cluster-integration:master
cd6d2f79 - feat: added support of new ingress apiVersion
03e78709 - feat: added support of new ingress apiVersion
46504d81 - Merge branch 'ingress_api_version' of...

Compare with previous version