Skip to content

Commit e6e6cb7

Browse files
authored
Update net-istio to use KnativeCertificate instead of control-protocol secret (knative-extensions#1221)
* Update net-istio to use `KnativeCertificate` instead of control-protocol Secret * Delete `KnativeCertificate` in e2e tests
1 parent b3007f4 commit e6e6cb7

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

.github/workflows/kind-e2e.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ jobs:
8383
# Deploy Istio
8484
./third_party/istio-${{ matrix.istio-version }}/install-istio.sh istio-kind-${{ matrix.istio-profile }}
8585
86+
# Remove Knative Certificate as we are running without Serving CRs
87+
rm -f config/700-istio-knative-certificate.yaml
88+
8689
# Build and Publish our containers to the docker daemon (including test assets)
8790
ko resolve --platform=linux/amd64 -f test/config/ -f config/ | kubectl apply -f -
8891

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ko apply -f config/
9898

9999
If you want to work with `system-internal-tls` enabled you can either:
100100

101-
* Install `Knative Serving` to automatically generate the certificates. The CA will be injected in [700-istio-secret.yaml](./config/700-istio-secret.yaml).
101+
* Install `Knative Serving`, `cert-manager` and `net-certmanager` to automatically generate the certificates. The CA will be injected for the Knative Certificate in [700-istio-knative-certificate.yaml](./config/700-istio-knative-certificate.yaml).
102102
* Or use [./test/generate-upstream-cert.sh)](./test/generate-upstream-cert.sh) to manually generate the secrets.
103103

104104
You can then enable `system-internal-tls` in `config-network` like in [our test resources](./test/config/system-internal-tls/config-network.yaml)
Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
apiVersion: v1
16-
kind: Secret
15+
apiVersion: networking.internal.knative.dev/v1alpha1
16+
kind: Certificate
1717
metadata:
18+
annotations:
19+
networking.knative.dev/certificate.class: cert-manager.certificate.networking.knative.dev
20+
labels:
21+
networking.knative.dev/certificate-type: system-internal
1822
name: routing-serving-certs
1923
namespace: istio-system
20-
labels:
21-
serving-certs-ctrl: "data-plane-routing"
22-
networking.internal.knative.dev/certificate-uid: "serving-certs"
24+
spec:
25+
dnsNames:
26+
- kn-routing
27+
secretName: routing-serving-certs
2328
# The data is populated when system-internal-tls is enabled.

test/e2e-common.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ function test_setup() {
6969

7070
${istio_dir}/install-istio.sh ${istio_profile} || return 1
7171

72+
# Remove Knative Certificate as we are running without Serving CRs
73+
rm -f config/700-istio-knative-certificate.yaml
74+
7275
echo ">> Bringing up net-istio Ingress Controller"
7376
ko apply --platform=linux/amd64 -f config/ || return 1
7477

0 commit comments

Comments
 (0)