Merge pull request #957 from kubeovn/vpc-nat-gw

append pod/exec resource for vpc nat gw
kubeovn · Aug 5, 2021 · 63d391d · 63d391d
2 parents 2340495 + 59869da
commit 63d391d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -761,6 +761,7 @@ rules:
       - ""
     resources:
       - pods
+      - pods/exec
       - namespaces
       - nodes
       - configmaps
@@ -1241,6 +1242,7 @@ rules:
       - ""
     resources:
       - pods
+      - pods/exec
       - namespaces
       - nodes
       - configmaps

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -1014,9 +1014,8 @@ func (c *Controller) deleteStaticRoute(ip, router string, subnet *kubeovnv1.Subn
 }
 
 func (c *Controller) reconcileVlan(subnet *kubeovnv1.Subnet) error {
-	klog.Infof("reconcile vlan, %v", subnet.Spec.Vlan)
-
 	if subnet.Spec.Vlan != "" {
+		klog.Infof("reconcile vlan, %v", subnet.Spec.Vlan)
 		//create subnet localnet
 		if err := c.addLocalnet(subnet); err != nil {
 			klog.Errorf("failed add localnet to subnet, %v", err)

diff --git a/pkg/controller/vpc_nat_gateway.go b/pkg/controller/vpc_nat_gateway.go
@@ -730,7 +730,7 @@ func (c *Controller) genNatGwDeployment(gw *kubeovnv1.VpcNatGateway) (dp *v1.Dep
 							Image:           vpcNatImage,
 							Command:         []string{"bash"},
 							Args:            []string{"-c", "while true; do sleep 10000; done"},
-							ImagePullPolicy: corev1.PullAlways,
+							ImagePullPolicy: corev1.PullIfNotPresent,
 							SecurityContext: &corev1.SecurityContext{
 								Privileged:               &privileged,
 								AllowPrivilegeEscalation: &allowPrivilegeEscalation,

diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
@@ -71,6 +71,7 @@ rules:
       - ""
     resources:
       - pods
+      - pods/exec
       - namespaces
       - nodes
       - configmaps

diff --git a/yamls/ovn-ha.yaml b/yamls/ovn-ha.yaml
@@ -70,6 +70,7 @@ rules:
       - ""
     resources:
       - pods
+      - pods/exec
       - namespaces
       - nodes
       - configmaps