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

Allow custom cert for ingress to be overwritten #12897

Merged
merged 2 commits into from
Nov 10, 2021

Conversation

sharifelgamal
Copy link
Collaborator

@sharifelgamal sharifelgamal commented Nov 9, 2021

If you wanted to overwrite a custom cert for ingress before, you would need to recreate the cluster itself. Assuming the existing cert is called foo/bar:

Before:

$ minikube addons configure ingress
✅  ingress was successfully configured

$ cat ~/.minikube/profiles/minikube/config.json | grep Ingress
        "CustomIngressCert": "foo/bar",
        "IngressController": "ingress-nginx/controller:v1.0.4@sha256:545cff00370f28363dad31e3b59a94ba377854d3a11f18988f5f9e56841ef9ef",

After:

$ minikube addons configure ingress
-- Enter custom cert (format is "namespace/secret"): baz/bat
A custom cert for ingress has already been set. Do you want overwrite it? [y/n]: n
✅  ingress was successfully configured

$ cat ~/.minikube/profiles/minikube/config.json | grep Ingress
        "CustomIngressCert": "foo/bar",
        "IngressController": "ingress-nginx/controller:v1.0.4@sha256:545cff00370f28363dad31e3b59a94ba377854d3a11f18988f5f9e56841ef9ef",
$ minikube addons configure ingress
-- Enter custom cert (format is "namespace/secret"): baz/bat
A custom cert for ingress has already been set. Do you want overwrite it? [y/n]: y
✅  ingress was successfully configured

$ cat ~/.minikube/profiles/minikube/config.json | grep Ingress
        "CustomIngressCert": "baz/bat",
        "IngressController": "ingress-nginx/controller:v1.0.4@sha256:545cff00370f28363dad31e3b59a94ba377854d3a11f18988f5f9e56841ef9ef",

Fixes #12896

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 9, 2021
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 9, 2021
Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for making cert and ingress experience better, how about link to binary of this PR to the user to see if it fixes it for them?

@medyagh
Copy link
Member

medyagh commented Nov 9, 2021

/ok-to-test

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: medyagh, sharifelgamal

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 [medyagh,sharifelgamal]

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

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Nov 9, 2021
@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12897) |
+----------------+----------+---------------------+
| minikube start | 71.0s    | 70.5s               |
| enable ingress | 31.8s    | 31.6s               |
+----------------+----------+---------------------+

Times for minikube ingress: 32.9s 31.3s 30.8s 32.2s 31.8s
Times for minikube (PR 12897) ingress: 31.3s 31.7s 32.3s 30.8s 31.7s

Times for minikube start: 72.9s 69.7s 69.9s 71.4s 71.3s
Times for minikube (PR 12897) start: 71.0s 70.5s 70.5s 70.4s 70.3s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12897) |
+----------------+----------+---------------------+
| minikube start | 36.5s    | 36.7s               |
| enable ingress | 25.5s    | 25.3s               |
+----------------+----------+---------------------+

Times for minikube (PR 12897) start: 36.6s 35.9s 36.5s 37.4s 37.2s
Times for minikube start: 34.9s 37.8s 36.8s 36.7s 36.4s

Times for minikube ingress: 27.0s 25.5s 24.0s 24.5s 26.5s
Times for minikube (PR 12897) ingress: 24.5s 26.5s 25.8s 25.0s 25.0s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12897) |
+----------------+----------+---------------------+
| minikube start | 39.7s    | 39.9s               |
| enable ingress | 32.2s    | 31.6s               |
+----------------+----------+---------------------+

Times for minikube start: 38.5s 42.8s 38.2s 40.4s 38.6s
Times for minikube (PR 12897) start: 43.0s 38.1s 39.7s 39.7s 39.1s

Times for minikube (PR 12897) ingress: 28.5s 31.0s 32.5s 33.5s 32.4s
Times for minikube ingress: 33.4s 28.2s 33.5s 33.5s 32.4s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Docker_Windows TestDownloadOnlyKic (gopogh) 0.85 (chart)
Docker_Linux_containerd TestDownloadOnlyKic (gopogh) 1.95 (chart)
Docker_Linux TestDownloadOnlyKic (gopogh) 1.96 (chart)
Docker_Windows TestNetworkPlugins/group/cilium/Start (gopogh) 3.42 (chart)
Docker_Windows TestStartStop/group/no-preload/serial/AddonExistsAfterStop (gopogh) 3.42 (chart)
Docker_Windows TestStartStop/group/no-preload/serial/SecondStart (gopogh) 3.42 (chart)
Docker_Windows TestStartStop/group/no-preload/serial/UserAppExistsAfterStop (gopogh) 3.42 (chart)
Docker_Windows TestStartStop/group/no-preload/serial/VerifyKubernetesImages (gopogh) 3.42 (chart)
Docker_Windows TestStartStop/group/no-preload/serial/Pause (gopogh) 5.13 (chart)
Docker_Linux TestFunctional/serial/ComponentHealth (gopogh) 9.80 (chart)
Docker_Linux_containerd TestScheduledStopUnix (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/RestartStopped (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/StartWithMountFirst (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/StartWithMountSecond (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/Stop (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/VerifyMountFirst (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/VerifyMountPostDelete (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/VerifyMountPostStop (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/VerifyMountSecond (gopogh) 100.00 (chart)
Docker_Windows TestPause/serial/VerifyDeletedResources (gopogh) 100.00 (chart)

To see the flake rates of all tests by environment, click here.

@sharifelgamal sharifelgamal merged commit 7d28cfa into kubernetes:master Nov 10, 2021
Copy link

@nwaf999 nwaf999 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sharifelgamal:overwrite-ingress-crt

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

minikube can't re-configure ingress to use a different ssl certificate
5 participants