From bc31166d8c752a808a351639b2a2e18663e9647e Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Fri, 29 May 2020 14:16:25 -0700
Subject: [PATCH 1/2] ingress edit

---
 components/form/MatchExpressions.vue             |  2 +-
 edit/networking.k8s.io.ingress/Rule.vue          | 12 ++++++------
 edit/networking.k8s.io.ingress/RulePath.vue      |  2 +-
 shared/networking.k8s.io.ingress/Certificate.vue | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/form/MatchExpressions.vue b/components/form/MatchExpressions.vue
index af94b009ad..2deb778938 100644
--- a/components/form/MatchExpressions.vue
+++ b/components/form/MatchExpressions.vue
@@ -145,7 +145,7 @@ export default {
         <button
           v-if="!isView"
           type="button"
-          class="btn btn-sm role-link col remove-rule-button"
+          class="btn role-link col remove-rule-button"
           :style="{padding:'0px'}"
           :disabled="mode==='view'"
           @click="removeRule(i)"
diff --git a/edit/networking.k8s.io.ingress/Rule.vue b/edit/networking.k8s.io.ingress/Rule.vue
index 1ba43de1ea..4f30860f7c 100644
--- a/edit/networking.k8s.io.ingress/Rule.vue
+++ b/edit/networking.k8s.io.ingress/Rule.vue
@@ -65,10 +65,10 @@ export default {
 <template>
   <div class="rule mt-20" @input="update">
     <div class="row">
-      <div id="host" class="col span-11">
+      <div id="host" class="col span-6">
         <LabeledInput v-model="host" label="Request Host" placeholder="e.g. example.com" />
       </div>
-      <div class="col span-1">
+      <div class="col span-6">
         <button class="btn role-link close" @click="removeRule">
           <i class="icon icon-2x icon-x" />
         </button>
@@ -85,7 +85,7 @@ export default {
         @remove="e=>removePath(i)"
       />
     </template>
-    <button v-if="ruleMode === 'setHost'" :style="{'padding':'0px 0px 0px 5px'}" class="btn btn-sm role-link" @click="addPath">
+    <button v-if="ruleMode === 'setHost'" class="btn btn-sm role-link" @click="addPath">
       add path
     </button>
   </div>
@@ -96,7 +96,7 @@ export default {
     background: var(--tabbed-container-bg);
     border: 1px solid var(--tabbed-border);
     border-radius: var(--border-radius);
-    padding: 40px;
+    padding: 20px;
   }
 
   #host {
@@ -107,7 +107,7 @@ export default {
     float:right;
     padding: 0px;
     position: relative;
-    top: -25px;
-    right: -25px;
+    top: -10px;
+    right: -10px;
   }
 </style>
diff --git a/edit/networking.k8s.io.ingress/RulePath.vue b/edit/networking.k8s.io.ingress/RulePath.vue
index 64752695f8..b48eac770f 100644
--- a/edit/networking.k8s.io.ingress/RulePath.vue
+++ b/edit/networking.k8s.io.ingress/RulePath.vue
@@ -48,7 +48,7 @@ export default {
     <div class="col span-3" :style="{'margin-right': '0px'}">
       <LabeledInput v-model.number="servicePort" label="Port" placeholder="e.g. 80" />
     </div>
-    <button class="btn btn-sm role-link col" @click="$emit('remove')">
+    <button class="btn role-link col" @click="$emit('remove')">
       remove
     </button>
   </div>
diff --git a/shared/networking.k8s.io.ingress/Certificate.vue b/shared/networking.k8s.io.ingress/Certificate.vue
index 0f070f89db..4bdc3a7bdf 100644
--- a/shared/networking.k8s.io.ingress/Certificate.vue
+++ b/shared/networking.k8s.io.ingress/Certificate.vue
@@ -78,14 +78,14 @@ export default {
       </div>
     </div>
     <div v-for="(host, i) in hosts" :key="i" class="row mb-10">
-      <div :style="{'margin-right': '0px'}" class="col span-11">
+      <div :style="{'margin-right': '0px'}" class="col span-6">
         <LabeledInput :value="host" label="Host" placeholder="e.g. example.com" @input="e=>$set(hosts, i, e)" />
       </div>
-      <button class="btn btn-sm role-link col" @click="e=>remove(i)">
+      <button class="btn role-link col remove" @click="e=>remove(i)">
         remove
       </button>
     </div>
-    <button :style="{'padding':'0px 0px 0px 5px'}" class="bn btn-sm role-link" @click="addHost">
+    <button class="btn btn-sm role-link" @click="addHost">
       add host
     </button>
   </div>
@@ -96,8 +96,8 @@ export default {
     float:right;
     padding: 0px;
     position: relative;
-    top: -25px;
-    right: -25px;
+    top: -10px;
+    right: -10px;
   }
   .cert:not(:last-of-type) {
     padding-bottom: 10px;
@@ -105,7 +105,7 @@ export default {
     border-bottom: 1px solid var(--border);
   }
 
-  button {
+  button.remove {
     line-height: 40px;
   }
 </style>

From fbb0e57505310161d05caec621763d12a1cf4977 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Fri, 29 May 2020 13:59:08 -0700
Subject: [PATCH 2/2] increase timeout for Gatekeeper enable `waitForCondition`

rancher/dashboard#706
---
 components/GatekeeperConfig.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/GatekeeperConfig.vue b/components/GatekeeperConfig.vue
index 9397f6053d..200c6f96b2 100644
--- a/components/GatekeeperConfig.vue
+++ b/components/GatekeeperConfig.vue
@@ -189,7 +189,7 @@ export default {
         this.saving = true;
         await this.ensureNamespace();
         await this.config.save();
-        await this.config.waitForCondition('Deployed');
+        await this.config.waitForCondition('Deployed', 'True', 300000);
         this.showYamlEditor = false;
         this.saving = false;
         this.$emit('gatekeeperEnabled', this.gatekeeperEnabled = true);