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.

Sign up for GitHub

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

Cleanup net-certmanager integration #15168

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Cleanup net-certmanager integration #15168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
202cb67
Cleanup net-certmanager integration
ReToCode Apr 29, 2024
d46df3e
Remove additional /
ReToCode Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions config/core/configmaps/logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ metadata:
app.kubernetes.io/component: logging
app.kubernetes.io/name: knative-serving
annotations:
knative.dev/example-checksum: "53fda05f"
knative.dev/example-checksum: "9f25d429"
data:
_example: |
################################
Expand Down Expand Up @@ -73,7 +73,6 @@ data:
loglevel.webhook: "info"
loglevel.activator: "info"
loglevel.hpaautoscaler: "info"
loglevel.net-certmanager-controller: "info"
loglevel.net-istio-controller: "info"
loglevel.net-contour-controller: "info"
loglevel.net-kourier-controller: "info"
Expand Down
0 .../cert-manager-latest/net-certmanager.yaml → ...t/certmanager/net-certmanager-config.yaml
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion test/config/ytt/core/overlay-config-logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,4 @@ data:
loglevel.activator: "debug"
loglevel.hpaautoscaler: "debug"
loglevel.net-istio-controller: "debug"
loglevel.net-certmanager-controller: "debug"
loglevel.net-contour-controller: "debug"
14 changes: 0 additions & 14 deletions test/config/ytt/ingress/istio/istio-certmanager-webhook.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/e2e-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ function install() {
YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/ingress/${ingress}")
YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/certmanager/kapp-order.yaml")
YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/certmanager/kapp-secret-upgrade.yaml")
YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt//certmanager/net-certmanager-config.yaml")
ReToCode marked this conversation as resolved.
Show resolved Hide resolved
YTT_FILES+=("${REPO_ROOT_DIR}/third_party/cert-manager-${CERT_MANAGER_VERSION}/cert-manager.yaml")
YTT_FILES+=("${REPO_ROOT_DIR}/third_party/cert-manager-${CERT_MANAGER_VERSION}/net-certmanager.yaml")

if (( MESH )); then
YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/mesh")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/certmanager/e2e-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function test_setup() {
kubectl apply -f third_party/cert-manager-latest/cert-manager.yaml || return 1
wait_until_pods_running cert-manager || return 1

echo ">> Bringing up net-certmanager Controller"
echo ">> Bringing up serving controller with net-certmanager enabled"
ko apply -f config || return 1
echo ">> Waiting for Serving components to be running..."
wait_until_pods_running knative-serving || return 1
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/externaldomaintls/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ feature documentation.

# Prerequisites
* Have `cert-manager` installed
* Have `net-certmanager` installed
* Have the Knative certmanager integration enabled
* Upload test images with `./test/upload-test-images.sh`
* Enable `external-domain-tls` with `kubectl patch cm config-network -n knative-serving -p '{"data":{"external-domain-tls": "enabled"}}'`

Expand Down
Loading