From c970332c7826805ad01e03971746e085e4edd607 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 5 Oct 2018 08:14:24 -0400 Subject: [PATCH] fixes --- app.yml | 4 ++-- build.yml | 2 +- deploy/knative-registry.yml | 29 +++++++++++++++++++++++++---- test.bat | 5 +++++ 4 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 test.bat diff --git a/app.yml b/app.yml index e06e7dd..99b417e 100644 --- a/app.yml +++ b/app.yml @@ -16,11 +16,11 @@ spec: name: bob-builder arguments: - name: REGISTRY - value: knative-registry.knative-build.svc.cluster.local:80 + value: knative-registry.knative-build.svc.cluster.local - name: IMAGE value: httpbin:latest revisionTemplate: spec: container: - image: knative-registry.knative-build.svc.cluster.local:80/httpbin:latest + image: knative-registry.knative-build.svc.cluster.local/httpbin:latest imagePullPolicy: Always diff --git a/build.yml b/build.yml index a2d3e4f..30d5b3c 100644 --- a/build.yml +++ b/build.yml @@ -22,7 +22,7 @@ spec: - /workspace - ${REGISTRY}/${IMAGE} - --push - - --allow-insecure + # - --allow-insecure # As an implementation detail, this template mounts the host's daemon socket. diff --git a/deploy/knative-registry.yml b/deploy/knative-registry.yml index bca39b3..d48c81c 100644 --- a/deploy/knative-registry.yml +++ b/deploy/knative-registry.yml @@ -39,19 +39,41 @@ spec: containers: - env: - name: REGISTRY_HTTP_ADDR - value: 0.0.0.0:80 + value: 0.0.0.0:443 + - name: REGISTRY_HTTP_TLS_CERTIFICATE + value: /certs/cert.crt + - name: REGISTRY_HTTP_TLS_KEY + value: /certs/cert.key image: registry:2 name: registry resources: {} volumeMounts: - mountPath: /var/lib/registry name: knative-registry-data + - mountPath: /certs + name: certs + ports: + - containerPort: 443 restartPolicy: Always volumes: - name: knative-registry-data persistentVolumeClaim: claimName: knative-registry-data + - name: certs + configMap: + name: knative-registry-certs + status: {} +# --- +# kind: ConfigMap +# apiVersion: v1 +# metadata: +# name: knative-registry-certs +# namespace: knative-build +# data: +# tls.crt: +# tls.key: +# --- --- apiVersion: v1 kind: Service @@ -68,11 +90,10 @@ spec: clusterIP: None ports: - name: knative-registry-http - port: 80 + port: 443 # nodePort: 80 - targetPort: 80 + targetPort: 443 selector: io.kompose.service: knative-registry status: loadBalancer: {} ---- diff --git a/test.bat b/test.bat new file mode 100644 index 0000000..9f95dcd --- /dev/null +++ b/test.bat @@ -0,0 +1,5 @@ +kubectl delete -f app.yml +kubectl delete -f build.yml +kubectl apply -f build.yml +kubectl apply -f app.yml +kubectl describe builds