Merge "crdb.k0: add sso client"
diff --git a/WORKSPACE b/WORKSPACE
index d3755c0..a2125c8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2090,3 +2090,8 @@
commit = "06500030e7d26826f68caa5ca7d98c315c4caa28",
importpath = "github.com/gabriel-vasile/mimetype",
)
+go_repository(
+ name = "com_github_kevinburke_go_bindata",
+ commit = "a606d617e1d1546a2342de6fc4ed95c78e171d68",
+ importpath = "github.com/kevinburke/go-bindata",
+)
diff --git a/bgpwtf/invoice/templates/invoice_en.html b/bgpwtf/invoice/templates/invoice_en.html
index d661732..6a92022 100644
--- a/bgpwtf/invoice/templates/invoice_en.html
+++ b/bgpwtf/invoice/templates/invoice_en.html
@@ -142,7 +142,7 @@
{{ if .USCustomer }}
<li>EIN: {{ .InvoiceeVAT }}</li>
<li><b>(VAT zero rate)</b></li>
- {{ else }}
+ {{ else if .InvoiceeVAT }}
<li><b>NIP:</b> {{ .InvoiceeVAT }}</li>
{{ end }}
diff --git a/bgpwtf/invoice/templates/invoice_pl.html b/bgpwtf/invoice/templates/invoice_pl.html
index df49da8..15f5d08 100644
--- a/bgpwtf/invoice/templates/invoice_pl.html
+++ b/bgpwtf/invoice/templates/invoice_pl.html
@@ -143,7 +143,7 @@
{{ if .USCustomer }}
<li>EIN: {{ .InvoiceeVAT }}</li>
<li><b>(VAT zero rate)</b></li>
- {{ else }}
+ {{ else if .InvoiceeVAT }}
<li><b>NIP:</b> {{ .InvoiceeVAT }}</li>
{{ end }}
diff --git a/cluster/kube/lib/calico.libsonnet b/cluster/kube/lib/calico.libsonnet
index 001052e..b5c83a7 100644
--- a/cluster/kube/lib/calico.libsonnet
+++ b/cluster/kube/lib/calico.libsonnet
@@ -56,9 +56,6 @@
typha_service_name: "none",
- # Existing nodes are already named without an FQDN (just the local, before .hswaw.net part),
- # future ones will hopefully use the full FQDN instead.
- # At some point, we might want to port existing calico nodes to their full FQDN instead.
cni_network_config: |||
{
"name": "k8s-pod-network",
@@ -72,7 +69,6 @@
"etcd_cert_file": "__ETCD_CERT_FILE__",
"etcd_ca_cert_file": "__ETCD_CA_CERT_FILE__",
"datastore_type": "etcdv3",
- "nodename": "__KUBERNETES_NODE_NAME__",
"mtu": __CNI_MTU__,
"ipam": {
"type": "calico-ipam"
@@ -174,15 +170,10 @@
rules: [
{
apiGroups: [""],
- resources: ["nodes"],
+ resources: ["nodes", "pods", "namespaces", "serviceaccounts"],
verbs: ["watch", "list", "get"],
},
{
- apiGroups: [""],
- resources: ["pods"],
- verbs: ["get"],
- },
- {
apiGroups: ["networking.k8s.io"],
resources: ["networkpolicies"],
verbs: ["watch", "list"],