review comment

tektoncd · Mar 25, 2020 · f45433c · f45433c
1 parent e138dd7
commit f45433c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/docs/create-ingress.yaml b/docs/create-ingress.yaml
@@ -9,14 +9,14 @@ spec:
 
   params:
   - name: CreateCertificate
-    description: "Enables/disables the creation of a self-signed certificate for $(inputs.params.ExternalDomain)"
+    description: "Enables/disables the creation of a self-signed certificate for $(params.ExternalDomain)"
     default: "true"
   - name: CertificateKeyPassphrase
     description: "Phrase that protects private key. This must be provided when the self-signed certificate is created"
   - name: CertificateSecretName
     description: "Secret name for Ingress certificate. The Secret should not exist if the self-signed certificate creation is enabled"
   - name: ExternalDomain
-    description: "The external domain for the EventListener e.g. `$(inputs.params.EventListenerName).PROXYIP.nip.io`"
+    description: "The external domain for the EventListener e.g. `$(params.EventListenerName).PROXYIP.nip.io`"
   - name: Service
     description: "The name of the Service used in the Ingress. This will also be the name of the Ingress."
   - name: ServicePort
@@ -39,13 +39,13 @@ spec:
       set -e
       cat <<EOF | sh
       #!/bin/sh
-      if [ $(inputs.params.CreateCertificate) = "false" ];then
+      if [ $(params.CreateCertificate) = "false" ];then
         exit 0
       fi
       mkdir /var/tmp/work/ingress
-      openssl genrsa -des3 -out /var/tmp/work/ingress/key.pem -passout pass:$(inputs.params.CertificateKeyPassphrase) 2048
-      openssl req -x509 -new -nodes -key /var/tmp/work/ingress/key.pem -sha256 -days 1825 -out /var/tmp/work/ingress/certificate.pem -passin pass:$(inputs.params.CertificateKeyPassphrase) -subj /CN=$(inputs.params.ExternalDomain)
-      openssl rsa -in /var/tmp/work/ingress/key.pem -out /var/tmp/work/ingress/key.pem -passin pass:$(inputs.params.CertificateKeyPassphrase)
+      openssl genrsa -des3 -out /var/tmp/work/ingress/key.pem -passout pass:$(params.CertificateKeyPassphrase) 2048
+      openssl req -x509 -new -nodes -key /var/tmp/work/ingress/key.pem -sha256 -days 1825 -out /var/tmp/work/ingress/certificate.pem -passin pass:$(params.CertificateKeyPassphrase) -subj /CN=$(params.ExternalDomain)
+      openssl rsa -in /var/tmp/work/ingress/key.pem -out /var/tmp/work/ingress/key.pem -passin pass:$(params.CertificateKeyPassphrase)
       EOF
   - name: create-certificate-secret
     image: lachlanevenson/k8s-kubectl:latest
@@ -60,10 +60,10 @@ spec:
       set -e
       cat <<EOF | sh
       #!/bin/sh
-      if [ $(inputs.params.CreateCertificate) = "false" ];then
+      if [ $(params.CreateCertificate) = "false" ];then
         exit 0
       fi
-      kubectl create secret tls $(inputs.params.CertificateSecretName) --cert=/var/tmp/work/ingress/certificate.pem --key=/var/tmp/work/ingress/key.pem || true
+      kubectl create secret tls $(params.CertificateSecretName) --cert=/var/tmp/work/ingress/certificate.pem --key=/var/tmp/work/ingress/key.pem || true
       EOF
   - name: create-ingress
     image: lachlanevenson/k8s-kubectl:latest
@@ -73,47 +73,47 @@ spec:
     - -ce
     - |
       set -e
-      if [ -n "$(inputs.params.ServiceUID)" ];then
+      if [ -n "$(params.ServiceUID)" ];then
         cat <<EOF | kubectl create -f - || true
         apiVersion: extensions/v1beta1
         kind: Ingress
         metadata:
-          name: $(inputs.params.Service)
+          name: $(params.Service)
           ownerReferences:
-          - name: $(inputs.params.Service)
+          - name: $(params.Service)
             apiVersion: v1
             kind: Service
-            uid: $(inputs.params.ServiceUID)
+            uid: $(params.ServiceUID)
         spec:
           tls:
-          - secretName: $(inputs.params.CertificateSecretName)
+          - secretName: $(params.CertificateSecretName)
             hosts:
-            - $(inputs.params.ExternalDomain)
+            - $(params.ExternalDomain)
           rules:
-          - host: $(inputs.params.ExternalDomain)
+          - host: $(params.ExternalDomain)
             http:
               paths:
               - backend:
-                  serviceName: $(inputs.params.Service)
-                  servicePort: $(inputs.params.ServicePort)
+                  serviceName: $(params.Service)
+                  servicePort: $(params.ServicePort)
       EOF
       else
         cat <<EOF | kubectl create -f - || true
         apiVersion: extensions/v1beta1
         kind: Ingress
         metadata:
-          name: $(inputs.params.Service)
+          name: $(params.Service)
         spec:
           tls:
-          - secretName: $(inputs.params.CertificateSecretName)
+          - secretName: $(params.CertificateSecretName)
             hosts:
-            - $(inputs.params.ExternalDomain)
+            - $(params.ExternalDomain)
           rules:
-          - host: $(inputs.params.ExternalDomain)
+          - host: $(params.ExternalDomain)
             http:
               paths:
               - backend:
-                  serviceName: $(inputs.params.Service)
-                  servicePort: $(inputs.params.ServicePort)
+                  serviceName: $(params.Service)
+                  servicePort: $(params.ServicePort)
       EOF
       fi
diff --git a/docs/create-webhook.yaml b/docs/create-webhook.yaml
@@ -6,11 +6,11 @@ spec:
   volumes:
   - name: github-secret
     secret:
-      secretName: $(inputs.params.GitHubSecretName)
+      secretName: $(params.GitHubSecretName)
 
   params:
   - name: ExternalDomain
-    description: "The external domain for the EventListener e.g. `$(inputs.params.EventListenerName).<PROXYIP>.nip.io`"
+    description: "The external domain for the EventListener e.g. `$(params.EventListenerName).<PROXYIP>.nip.io`"
   - name: GitHubUser
     description: "The GitHub user"
   - name: GitHubRepo
@@ -42,8 +42,8 @@ spec:
     - |
       set -e
       echo "Create Webhook"
-      if [ $(inputs.params.GitHubDomain) = "github.com" ];then
-        curl -v -d "{\"name\": \"web\",\"active\": true,\"events\": $(inputs.params.WebhookEvents),\"config\": {\"url\": \"https://$(inputs.params.ExternalDomain)\",\"content_type\": \"json\",\"insecure_ssl\": \"1\" ,\"secret\": \"$(cat /var/secret/$(inputs.params.GitHubSecretStringKey))\"}}" -X POST -u $(inputs.params.GitHubUser):$(cat /var/secret/$(inputs.params.GitHubAccessTokenKey)) -L https://api.github.com/repos/$(inputs.params.GitHubOrg)/$(inputs.params.GitHubRepo)/hooks
+      if [ $(params.GitHubDomain) = "github.com" ];then
+        curl -v -d "{\"name\": \"web\",\"active\": true,\"events\": $(params.WebhookEvents),\"config\": {\"url\": \"https://$(params.ExternalDomain)\",\"content_type\": \"json\",\"insecure_ssl\": \"1\" ,\"secret\": \"$(cat /var/secret/$(params.GitHubSecretStringKey))\"}}" -X POST -u $(params.GitHubUser):$(cat /var/secret/$(params.GitHubAccessTokenKey)) -L https://api.github.com/repos/$(params.GitHubOrg)/$(params.GitHubRepo)/hooks
       else
-        curl -d "{\"name\": \"web\",\"active\": true,\"events\": $(inputs.params.WebhookEvents),\"config\": {\"url\": \"https://$(inputs.params.ExternalDomain)/\",\"content_type\": \"json\",\"insecure_ssl\": \"1\" ,\"secret\": \"$(cat /var/secret/$(inputs.params.GitHubSecretStringKey))\"}}" -X POST -u $(inputs.params.GitHubUser):$(cat /var/secret/$(inputs.params.GitHubAccessTokenKey)) -L https://$(inputs.params.GitHubDomain)/api/v3/repos/$(inputs.params.GitHubOrg)/$(inputs.params.GitHubRepo)/hooks
+        curl -d "{\"name\": \"web\",\"active\": true,\"events\": $(params.WebhookEvents),\"config\": {\"url\": \"https://$(params.ExternalDomain)/\",\"content_type\": \"json\",\"insecure_ssl\": \"1\" ,\"secret\": \"$(cat /var/secret/$(params.GitHubSecretStringKey))\"}}" -X POST -u $(params.GitHubUser):$(cat /var/secret/$(params.GitHubAccessTokenKey)) -L https://$(params.GitHubDomain)/api/v3/repos/$(params.GitHubOrg)/$(params.GitHubRepo)/hooks
       fi