From 72b6c40f2f7dd0d327f52fc34f72a436e60d2503 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Mon, 24 Jun 2019 19:56:48 +0000 Subject: [PATCH 01/65] Adding logger to controller main.go --- cmd/controller/main.go | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index fc1a6315c90b..9baed78ae292 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -17,6 +17,13 @@ limitations under the License. package main import ( + "log" + "os" + "github.com/knative/pkg/configmap" + "github.com/knative/serving/pkg/logging" + "github.com/knative/pkg/metrics" + "go.uber.org/zap" + "github.com/knative/pkg/logging/logkey" // The set of controllers this controller process runs. "github.com/knative/serving/pkg/reconciler/configuration" "github.com/knative/serving/pkg/reconciler/labeler" @@ -29,7 +36,25 @@ import ( "github.com/knative/pkg/injection/sharedmain" ) +const ( + component = "controller" +) + func main() { + cm, err := configmap.Load("/etc/config-logging") + if err != nil { + log.Fatal("Error loading logging configuration:", err) + } + logConfig, err := logging.NewConfigFromMap(cm) + if err != nil { + log.Fatal("Error loading logging configuration:", err) + } + createdLogger, _ := logging.NewLoggerFromConfig(logConfig, component) + logger := createdLogger.With(zap.String(logkey.ControllerType, "activator")) + defer flush(logger) + + logger.Error("Wolverine") + log.Fatal("Wolverine") sharedmain.Main("controller", configuration.NewController, labeler.NewRouteToConfigurationController, @@ -39,3 +64,11 @@ func main() { service.NewController, ) } + +func flush(logger *zap.SugaredLogger) { + logger.Sync() + os.Stdout.Sync() + os.Stderr.Sync() + metrics.FlushExporter() +} + From 44d63ddf5839de88a7d723e3740d78f3e8c83845 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Mon, 24 Jun 2019 22:37:15 +0000 Subject: [PATCH 02/65] Adding some test statements --- cmd/activator/main.go | 1 + cmd/controller/main.go | 1 - pkg/reconciler/clusteringress/clusteringress.go | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/activator/main.go b/cmd/activator/main.go index df58fc70d5bd..8c1ec2bac6f6 100644 --- a/cmd/activator/main.go +++ b/cmd/activator/main.go @@ -126,6 +126,7 @@ func main() { logger := createdLogger.With(zap.String(logkey.ControllerType, "activator")) defer flush(logger) + logger.Error("Cyclops") logger.Info("Starting the sandwich knative activator") clusterConfig, err := clientcmd.BuildConfigFromFlags(*masterURL, *kubeconfig) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 9baed78ae292..7bc1f1192595 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -54,7 +54,6 @@ func main() { defer flush(logger) logger.Error("Wolverine") - log.Fatal("Wolverine") sharedmain.Main("controller", configuration.NewController, labeler.NewRouteToConfigurationController, diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 7d647a738052..6b4f12e5bf88 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -177,6 +177,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) ci.Status.MarkLoadBalancerReady(getLBStatus(gatewayServiceURLFromContext(ctx, ci))) ci.Status.ObservedGeneration = ci.Generation + logger.Infof("Magneto") if enablesAutoTLS(ctx) { if !ci.IsPublic() { logger.Infof("ClusterIngress %s is not public. So no need to configure TLS.", ci.Name) From 2f292995cb3367ff9a71141940b4c7f32a9386d8 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Mon, 24 Jun 2019 15:41:50 -0700 Subject: [PATCH 03/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 6b4f12e5bf88..aab8d67ee1d4 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -177,7 +177,9 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) ci.Status.MarkLoadBalancerReady(getLBStatus(gatewayServiceURLFromContext(ctx, ci))) ci.Status.ObservedGeneration = ci.Generation - logger.Infof("Magneto") + if checkExistingCerts(ctx) { + logger.Info("Checking for existing certs") + } if enablesAutoTLS(ctx) { if !ci.IsPublic() { logger.Infof("ClusterIngress %s is not public. So no need to configure TLS.", ci.Name) @@ -223,6 +225,10 @@ func enablesAutoTLS(ctx context.Context) bool { return config.FromContext(ctx).Network.AutoTLS } +func checkExistingCerts(ctx context.Context) bool { + return config.FromContext(ctx).Network.checkExistingCerts +} + func getLBStatus(gatewayServiceURL string) []v1alpha1.LoadBalancerIngressStatus { // The ClusterIngress isn't load-balanced by any particular // Service, but through a Service mesh. From 541a364108b194b141554d4e215781e89b52b1b2 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Mon, 24 Jun 2019 15:46:44 -0700 Subject: [PATCH 04/65] Check for config --- pkg/network/network.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/network/network.go b/pkg/network/network.go index f696362a15d0..0f22aec04c5e 100644 --- a/pkg/network/network.go +++ b/pkg/network/network.go @@ -109,6 +109,8 @@ var ( // that specifies enabling auto-TLS or not. AutoTLSKey = "autoTLS" + CheckExistingCertsKey = "checkExistingCerts" + // HTTPProtocolKey is the name of the configuration entry that // specifies the HTTP endpoint behavior of Knative ingress. HTTPProtocolKey = "httpProtocol" @@ -153,6 +155,8 @@ type Config struct { // AutoTLS specifies if auto-TLS is enabled or not. AutoTLS bool + CheckExistingCerts bool + // HTTPProtocol specifics the behavior of HTTP endpoint of Knative // ingress. HTTPProtocol HTTPProtocol From 301837ac04cd5ac54f6e7a2514538d3f5a135b7b Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Mon, 24 Jun 2019 15:47:15 -0700 Subject: [PATCH 05/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index aab8d67ee1d4..28cdbffe8541 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -226,7 +226,7 @@ func enablesAutoTLS(ctx context.Context) bool { } func checkExistingCerts(ctx context.Context) bool { - return config.FromContext(ctx).Network.checkExistingCerts + return config.FromContext(ctx).Network.CheckExistingCerts } func getLBStatus(gatewayServiceURL string) []v1alpha1.LoadBalancerIngressStatus { From 4b20ed9db4b12fe80fc165694695f97bcdbc1ba7 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Mon, 24 Jun 2019 15:49:42 -0700 Subject: [PATCH 06/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 28cdbffe8541..97126e44f421 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -179,6 +179,8 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if checkExistingCerts(ctx) { logger.Info("Checking for existing certs") + } else { + logger.Info("Flag to check for existing certs was not set.") } if enablesAutoTLS(ctx) { if !ci.IsPublic() { From 22ebe45d970240ec787be37b367c86cc4d5f6f26 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Mon, 24 Jun 2019 15:51:59 -0700 Subject: [PATCH 07/65] Check for config --- pkg/network/network.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/network/network.go b/pkg/network/network.go index 0f22aec04c5e..297318319f38 100644 --- a/pkg/network/network.go +++ b/pkg/network/network.go @@ -251,6 +251,7 @@ func NewConfigFromConfigMap(configMap *corev1.ConfigMap) (*Config, error) { } nc.AutoTLS = strings.ToLower(configMap.Data[AutoTLSKey]) == "enabled" + nc.CheckExistingCerts = strings.ToLower(configMap.Data[CheckExistingCertsKey]) == "enabled" switch strings.ToLower(configMap.Data[HTTPProtocolKey]) { case string(HTTPEnabled): From face3d361718c76d7ea43ff70778d60307e37e59 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 08:49:46 -0700 Subject: [PATCH 08/65] Check for config --- pkg/network/network.go | 1 + pkg/reconciler/clusteringress/clusteringress.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/pkg/network/network.go b/pkg/network/network.go index 297318319f38..8caa1b8866ca 100644 --- a/pkg/network/network.go +++ b/pkg/network/network.go @@ -251,6 +251,7 @@ func NewConfigFromConfigMap(configMap *corev1.ConfigMap) (*Config, error) { } nc.AutoTLS = strings.ToLower(configMap.Data[AutoTLSKey]) == "enabled" + nc.CheckExistingCerts = strings.ToLower(configMap.Data[CheckExistingCertsKey]) == "enabled" switch strings.ToLower(configMap.Data[HTTPProtocolKey]) { diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 97126e44f421..9a0434216587 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -198,6 +198,10 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if err != nil { return err } + // keys := make([]int, 0, len(originSecrets)) + for k := range originSecrets { + logger.Infof("Key: %s", k) + } targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) if err := c.reconcileCertSecrets(ctx, ci, targetSecrets); err != nil { return err From e303df88cbf2b6a75129304e4c108a8b48c88685 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 08:54:22 -0700 Subject: [PATCH 09/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 9a0434216587..08c32baa0475 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -202,6 +202,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) for k := range originSecrets { logger.Infof("Key: %s", k) } + fmt.Println("map: ", originSecrets) targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) if err := c.reconcileCertSecrets(ctx, ci, targetSecrets); err != nil { return err From 78b75d4a8d6292a9640d0f0d628c377e070595c9 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 09:01:51 -0700 Subject: [PATCH 10/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 08c32baa0475..af9d6219b17b 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -198,6 +198,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if err != nil { return err } + fmt.Println("ClusterIngress: ", originSecrets) // keys := make([]int, 0, len(originSecrets)) for k := range originSecrets { logger.Infof("Key: %s", k) From eefe9f7c3f9b940b2769bb0d6f9eb343281256f4 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 09:03:04 -0700 Subject: [PATCH 11/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index af9d6219b17b..cae5b2b7d173 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -198,7 +198,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if err != nil { return err } - fmt.Println("ClusterIngress: ", originSecrets) + fmt.Println("ClusterIngress: ", ci) // keys := make([]int, 0, len(originSecrets)) for k := range originSecrets { logger.Infof("Key: %s", k) From bcfd16b1c786fc4a4fdedf154f0cdfc1940a3219 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 09:12:34 -0700 Subject: [PATCH 12/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index cae5b2b7d173..cfa7450ebeba 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -198,6 +198,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if err != nil { return err } + fmt.Println("Secrets: ", c.secretLister.Secrets.List()) fmt.Println("ClusterIngress: ", ci) // keys := make([]int, 0, len(originSecrets)) for k := range originSecrets { From cd46ffa826fc1766e0f1cacbc2ff36c212c72300 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 09:54:15 -0700 Subject: [PATCH 13/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index cfa7450ebeba..3b7abb7e7745 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -198,7 +198,13 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if err != nil { return err } - fmt.Println("Secrets: ", c.secretLister.Secrets.List()) + for _, rules := range ci.Spec.Rules { + + hostnames, err := secretLister.Secrets("default").Get(rules.Hosts) + fmt.Println("hostnames: ", hostnames) + + } + // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) fmt.Println("ClusterIngress: ", ci) // keys := make([]int, 0, len(originSecrets)) for k := range originSecrets { From 5eaa41b7491a91f179464d29e9de496128807b73 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 09:54:53 -0700 Subject: [PATCH 14/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 3b7abb7e7745..13aff3b2d05d 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -200,7 +200,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } for _, rules := range ci.Spec.Rules { - hostnames, err := secretLister.Secrets("default").Get(rules.Hosts) + hostnames, err := c.secretLister.Secrets("default").Get(rules.Hosts) fmt.Println("hostnames: ", hostnames) } From fe26fdc7d319c588a16050eecd03d4486d299478 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 10:41:58 -0700 Subject: [PATCH 15/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 13aff3b2d05d..5c2e141e1ee3 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -200,8 +200,8 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } for _, rules := range ci.Spec.Rules { - hostnames, err := c.secretLister.Secrets("default").Get(rules.Hosts) - fmt.Println("hostnames: ", hostnames) + // hostnames, err := c.secretLister.Secrets("default").Get(rules.Hosts) + fmt.Println("rules: ", rules) } // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) From c4e563c0c050201a063269fdba9c065ee95945f8 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 10:44:16 -0700 Subject: [PATCH 16/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 5c2e141e1ee3..a00220b62e5f 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -204,13 +204,14 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Println("rules: ", rules) } + fmt.Println("TLS: ", ci.Spec.TLS) // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) fmt.Println("ClusterIngress: ", ci) // keys := make([]int, 0, len(originSecrets)) - for k := range originSecrets { - logger.Infof("Key: %s", k) - } - fmt.Println("map: ", originSecrets) + // for k := range originSecrets { + // logger.Infof("Key: %s", k) + // } + // fmt.Println("map: ", originSecrets) targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) if err := c.reconcileCertSecrets(ctx, ci, targetSecrets); err != nil { return err From 66e6871ffa9c66b8478dc2921b40de7e6ee1ed13 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 10:50:57 -0700 Subject: [PATCH 17/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index a00220b62e5f..01ce5f22ec9e 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -200,7 +200,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } for _, rules := range ci.Spec.Rules { - // hostnames, err := c.secretLister.Secrets("default").Get(rules.Hosts) + hostnames, err := c.secretLister.Secrets("istio-system").Get(rules[0]) fmt.Println("rules: ", rules) } From d6a825e98c1c1976bc6072dfd071aff587713aa7 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 10:51:42 -0700 Subject: [PATCH 18/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 01ce5f22ec9e..002bc10594ea 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -198,12 +198,13 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if err != nil { return err } - for _, rules := range ci.Spec.Rules { + for _, rules := range ci.Spec.Rules { hostnames, err := c.secretLister.Secrets("istio-system").Get(rules[0]) - fmt.Println("rules: ", rules) - + fmt.Println("hostnames: ", hostnames) } + + fmt.Println("rules: ", ci.Spec.Rules) fmt.Println("TLS: ", ci.Spec.TLS) // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) fmt.Println("ClusterIngress: ", ci) From 907e17a1a0aacbd8de2e1bf182c53c4f725137fc Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 10:53:26 -0700 Subject: [PATCH 19/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 002bc10594ea..cde1b97ad0e5 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -200,11 +200,12 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } for _, rules := range ci.Spec.Rules { - hostnames, err := c.secretLister.Secrets("istio-system").Get(rules[0]) - fmt.Println("hostnames: ", hostnames) + // hostnames, err := c.secretLister.Secrets("istio-system").Get(rules.Host) + // fmt.Println("hostnames: ", hostnames) } fmt.Println("rules: ", ci.Spec.Rules) + fmt.Println("Host: ", ci.Spec.Rules.Host) fmt.Println("TLS: ", ci.Spec.TLS) // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) fmt.Println("ClusterIngress: ", ci) From acd12daf3b0e7a2f4c2fd26ddafa9a7dd30c9d2c Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 10:54:28 -0700 Subject: [PATCH 20/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index cde1b97ad0e5..b0fb0caf1686 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -205,7 +205,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } fmt.Println("rules: ", ci.Spec.Rules) - fmt.Println("Host: ", ci.Spec.Rules.Host) + fmt.Println("Hosts: ", ci.Spec.Rules.Hosts) fmt.Println("TLS: ", ci.Spec.TLS) // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) fmt.Println("ClusterIngress: ", ci) From b20a5e72855691b061fcc2f6c912869eb1ec2a2e Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 10:59:21 -0700 Subject: [PATCH 21/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index b0fb0caf1686..1f96d69f0d7a 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -205,8 +205,10 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } fmt.Println("rules: ", ci.Spec.Rules) - fmt.Println("Hosts: ", ci.Spec.Rules.Hosts) + fmt.Printf("%T\n", ci.Spec.Rules) + // fmt.Println("Hosts: ", ci.Spec.Rules.Hosts) fmt.Println("TLS: ", ci.Spec.TLS) + fmt.Printf("%T\n", ci.Spec.TLS.SecretName) // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) fmt.Println("ClusterIngress: ", ci) // keys := make([]int, 0, len(originSecrets)) From 873476bdd8027dd5f0bb60f28d563b279a688af6 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:02:05 -0700 Subject: [PATCH 22/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 1f96d69f0d7a..a99614886994 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -208,7 +208,10 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Printf("%T\n", ci.Spec.Rules) // fmt.Println("Hosts: ", ci.Spec.Rules.Hosts) fmt.Println("TLS: ", ci.Spec.TLS) - fmt.Printf("%T\n", ci.Spec.TLS.SecretName) + for _, tls := range ci.Spec.TLS { + fmt.Println("tls.SecretName: ", tls.SecretName) + fmt.Printf("%T\n", tls.SecretName) + } // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) fmt.Println("ClusterIngress: ", ci) // keys := make([]int, 0, len(originSecrets)) From a3b92c35971f9625e025d5fe4c88bc88e9c12b23 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:02:29 -0700 Subject: [PATCH 23/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index a99614886994..7b11c2fd4cc0 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -199,10 +199,10 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) return err } - for _, rules := range ci.Spec.Rules { - // hostnames, err := c.secretLister.Secrets("istio-system").Get(rules.Host) - // fmt.Println("hostnames: ", hostnames) - } + // for _, rules := range ci.Spec.Rules { + // hostnames, err := c.secretLister.Secrets("istio-system").Get(rules.Host) + // fmt.Println("hostnames: ", hostnames) + // } fmt.Println("rules: ", ci.Spec.Rules) fmt.Printf("%T\n", ci.Spec.Rules) From 9387efc0f42791eb9e814242c0583371434079b2 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:10:06 -0700 Subject: [PATCH 24/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 7b11c2fd4cc0..6375c2a0fc2c 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -212,7 +212,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Println("tls.SecretName: ", tls.SecretName) fmt.Printf("%T\n", tls.SecretName) } - // fmt.Println("Secrets: ", c.secretLister.Secrets("default").List("")) + fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(ci.Spec.Rules[0].Hosts[0])) fmt.Println("ClusterIngress: ", ci) // keys := make([]int, 0, len(originSecrets)) // for k := range originSecrets { From d965efc19d0f0f802980a216408b5b808aad93ad Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:18:36 -0700 Subject: [PATCH 25/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 6375c2a0fc2c..b705e293253d 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -45,6 +45,7 @@ import ( "k8s.io/apimachinery/pkg/api/equality" apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" @@ -205,19 +206,16 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) // } fmt.Println("rules: ", ci.Spec.Rules) - fmt.Printf("%T\n", ci.Spec.Rules) + fmt.Printf("rules type %T\n", ci.Spec.Rules) // fmt.Println("Hosts: ", ci.Spec.Rules.Hosts) fmt.Println("TLS: ", ci.Spec.TLS) for _, tls := range ci.Spec.TLS { fmt.Println("tls.SecretName: ", tls.SecretName) - fmt.Printf("%T\n", tls.SecretName) + fmt.Printf("tls.SecretName type %T\n", tls.SecretName) } + var sel = new Selector() fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(ci.Spec.Rules[0].Hosts[0])) fmt.Println("ClusterIngress: ", ci) - // keys := make([]int, 0, len(originSecrets)) - // for k := range originSecrets { - // logger.Infof("Key: %s", k) - // } // fmt.Println("map: ", originSecrets) targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) if err := c.reconcileCertSecrets(ctx, ci, targetSecrets); err != nil { From 417509388209defc9bff7a80bd48ea6354b591e5 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:20:32 -0700 Subject: [PATCH 26/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index b705e293253d..1cbecd17ae1f 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -45,7 +45,6 @@ import ( "k8s.io/apimachinery/pkg/api/equality" apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" @@ -213,8 +212,8 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Println("tls.SecretName: ", tls.SecretName) fmt.Printf("tls.SecretName type %T\n", tls.SecretName) } - var sel = new Selector() - fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(ci.Spec.Rules[0].Hosts[0])) + // fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(ci.Spec.Rules[0].Hosts[0])) + fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) fmt.Println("ClusterIngress: ", ci) // fmt.Println("map: ", originSecrets) targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) From 17f4c5872272ba22f77f677116f9e8ccfafd0fbc Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:23:10 -0700 Subject: [PATCH 27/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 1cbecd17ae1f..17342b5102fe 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -211,10 +211,13 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) for _, tls := range ci.Spec.TLS { fmt.Println("tls.SecretName: ", tls.SecretName) fmt.Printf("tls.SecretName type %T\n", tls.SecretName) + fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(tls.SecretName) } - // fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(ci.Spec.Rules[0].Hosts[0])) + fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - fmt.Println("ClusterIngress: ", ci) + fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(ci.Spec.Rules[0].Hosts[0])) + + // fmt.Println("ClusterIngress: ", ci) // fmt.Println("map: ", originSecrets) targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) if err := c.reconcileCertSecrets(ctx, ci, targetSecrets); err != nil { From 56767604a623aefac6f4e3fe32c9f158b578a53c Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:23:44 -0700 Subject: [PATCH 28/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 17342b5102fe..9bc114a01d50 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -211,12 +211,12 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) for _, tls := range ci.Spec.TLS { fmt.Println("tls.SecretName: ", tls.SecretName) fmt.Printf("tls.SecretName type %T\n", tls.SecretName) - fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(tls.SecretName) + fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(tls.SecretName)) } fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(ci.Spec.Rules[0].Hosts[0])) - + // fmt.Println("ClusterIngress: ", ci) // fmt.Println("map: ", originSecrets) targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) From 86ca01bd365cf75b357f2323fcd94bfec9bdeafb Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:24:03 -0700 Subject: [PATCH 29/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 9bc114a01d50..47c8c7644ad8 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -211,11 +211,11 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) for _, tls := range ci.Spec.TLS { fmt.Println("tls.SecretName: ", tls.SecretName) fmt.Printf("tls.SecretName type %T\n", tls.SecretName) - fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(tls.SecretName)) + fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").Get(tls.SecretName)) } fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").List(ci.Spec.Rules[0].Hosts[0])) + fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0])) // fmt.Println("ClusterIngress: ", ci) // fmt.Println("map: ", originSecrets) From feac1796c27a0cf4b616ce0d0e44d5990ad1ad9e Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:25:22 -0700 Subject: [PATCH 30/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 47c8c7644ad8..c48528592c5a 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -211,11 +211,11 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) for _, tls := range ci.Spec.TLS { fmt.Println("tls.SecretName: ", tls.SecretName) fmt.Printf("tls.SecretName type %T\n", tls.SecretName) - fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").Get(tls.SecretName)) + fmt.Printf("Secrets: ", c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName)) } fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - fmt.Println("Secrets: ", c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0])) + fmt.Printf("Secrets: ", c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0])) // fmt.Println("ClusterIngress: ", ci) // fmt.Println("map: ", originSecrets) From e666f37c437d80aac1fcaa7f8345196a51b0c132 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:26:56 -0700 Subject: [PATCH 31/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index c48528592c5a..47d73ed5bd4b 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -211,11 +211,13 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) for _, tls := range ci.Spec.TLS { fmt.Println("tls.SecretName: ", tls.SecretName) fmt.Printf("tls.SecretName type %T\n", tls.SecretName) - fmt.Printf("Secrets: ", c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName)) + secret, err := c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName) + fmt.Printf("Secrets: ", secret) } fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - fmt.Printf("Secrets: ", c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0])) + secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0] + fmt.Printf("Host Secrets: ", secret) // fmt.Println("ClusterIngress: ", ci) // fmt.Println("map: ", originSecrets) From 57ec49739fc23729c9475c32343ad8ceeda4b9a0 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:27:18 -0700 Subject: [PATCH 32/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 47d73ed5bd4b..5dac52dbed52 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -216,7 +216,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0] + secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Host Secrets: ", secret) // fmt.Println("ClusterIngress: ", ci) From e2cb3ed1ad0768cbb6888f7367b249ee600e25b0 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 11:28:05 -0700 Subject: [PATCH 33/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 5dac52dbed52..e879df1e77a4 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -211,12 +211,12 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) for _, tls := range ci.Spec.TLS { fmt.Println("tls.SecretName: ", tls.SecretName) fmt.Printf("tls.SecretName type %T\n", tls.SecretName) - secret, err := c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName) + secret, _ := c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName) fmt.Printf("Secrets: ", secret) } fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) + secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Host Secrets: ", secret) // fmt.Println("ClusterIngress: ", ci) From cffee9c0533bc39e0703ea36e1a0f4603e9b929d Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:02:01 -0700 Subject: [PATCH 34/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index e879df1e77a4..fc3d5c03d13a 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -215,9 +215,10 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Printf("Secrets: ", secret) } + fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) - fmt.Printf("Host Secrets: ", secret) + fmt.Printf("Host Secrets: \n", secret) // fmt.Println("ClusterIngress: ", ci) // fmt.Println("map: ", originSecrets) From c29b07dcdad35fc13d9d4009598f131fdccd1be8 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:04:01 -0700 Subject: [PATCH 35/65] Check for config --- .../clusteringress/clusteringress.go | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index fc3d5c03d13a..d9f09640d34a 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -179,6 +179,23 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if checkExistingCerts(ctx) { logger.Info("Checking for existing certs") + + fmt.Println("rules: ", ci.Spec.Rules) + fmt.Printf("rules type %T\n", ci.Spec.Rules) + + fmt.Println("TLS: ", ci.Spec.TLS) + for _, tls := range ci.Spec.TLS { + fmt.Println("tls.SecretName: ", tls.SecretName) + fmt.Printf("tls.SecretName type %T\n", tls.SecretName) + secret, _ := c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName) + fmt.Printf("Secrets: ", secret) + } + + fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) + fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) + secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) + fmt.Printf("Host Secrets: \n", secret) + } else { logger.Info("Flag to check for existing certs was not set.") } @@ -204,22 +221,6 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) // fmt.Println("hostnames: ", hostnames) // } - fmt.Println("rules: ", ci.Spec.Rules) - fmt.Printf("rules type %T\n", ci.Spec.Rules) - // fmt.Println("Hosts: ", ci.Spec.Rules.Hosts) - fmt.Println("TLS: ", ci.Spec.TLS) - for _, tls := range ci.Spec.TLS { - fmt.Println("tls.SecretName: ", tls.SecretName) - fmt.Printf("tls.SecretName type %T\n", tls.SecretName) - secret, _ := c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName) - fmt.Printf("Secrets: ", secret) - } - - fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) - fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) - fmt.Printf("Host Secrets: \n", secret) - // fmt.Println("ClusterIngress: ", ci) // fmt.Println("map: ", originSecrets) targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) From 26e9a7bf6b195978c7db65e0291b8843905ba842 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:16:47 -0700 Subject: [PATCH 36/65] Check for config --- .../clusteringress/clusteringress.go | 14 +++++++++ .../clusteringress/resources/gateway.go | 31 +++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index d9f09640d34a..afb39e131c50 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -196,6 +196,20 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Host Secrets: \n", secret) + for _, gatewayName := range gatewayNames { + ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) + if err != nil { + return err + } + desired, err := resources.MakeServersFromExistingCerts(ci, ns, originSecrets) + if err != nil { + return err + } + if err := c.reconcileGateway(ctx, ci, gatewayName, desired); err != nil { + return err + } + } + } else { logger.Info("Flag to check for existing certs was not set.") } diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 03979deb51f2..b90c29dcb17e 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -118,6 +118,37 @@ func MakeServers(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, or return SortServers(servers), nil } +func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, originSecrets map[string]*corev1.Secret) ([]v1alpha3.Server, error) { + servers := []v1alpha3.Server{} + // TODO(zhiminx): for the hosts that does not included in the ClusterIngressTLS but listed in the ClusterIngressRule, + // do we consider them as hosts for HTTP? + for i, rules := range ci.Spec.Rules { + // credentialName := tls.SecretName + // // If the origin secret is not in the target namespace, then it should have been + // // copied into the target namespace. So we use the name of the copy. + // if tls.SecretNamespace != gatewayServiceNamespace { + // originSecret, ok := originSecrets[secretKey(tls)] + // if !ok { + // return nil, fmt.Errorf("unable to get the original secret %s/%s", tls.SecretNamespace, tls.SecretName) + // } + // credentialName = targetSecret(originSecret, ci) + // } + servers = append(servers, v1alpha3.Server{ + Hosts: rules.Hosts[0], + Port: v1alpha3.Port{ + Name: fmt.Sprintf("%s:%d", ci.Name, i), + Number: 443, + Protocol: v1alpha3.ProtocolHTTPS, + }, + TLS: &v1alpha3.TLSOptions{ + Mode: v1alpha3.TLSModeMutual, + CredentialName: rules.Hosts[0], + }, + }) + } + return SortServers(servers), nil +} + // MakeHTTPServer creates a HTTP Gateway `Server` based on the HTTPProtocol // configureation. func MakeHTTPServer(httpProtocol network.HTTPProtocol) *v1alpha3.Server { From e7fe46196d64bd52f2742d3dfc2d59ce09c28329 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:17:41 -0700 Subject: [PATCH 37/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index b90c29dcb17e..dcd90cb1f62e 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -134,7 +134,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // credentialName = targetSecret(originSecret, ci) // } servers = append(servers, v1alpha3.Server{ - Hosts: rules.Hosts[0], + Hosts: rules.Hosts, Port: v1alpha3.Port{ Name: fmt.Sprintf("%s:%d", ci.Name, i), Number: 443, From 9b229715ddee51ec4118b85e0ac5809e0828ac53 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:18:45 -0700 Subject: [PATCH 38/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index afb39e131c50..cfe9043fdb42 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -193,7 +193,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) + secrets, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Host Secrets: \n", secret) for _, gatewayName := range gatewayNames { @@ -201,7 +201,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if err != nil { return err } - desired, err := resources.MakeServersFromExistingCerts(ci, ns, originSecrets) + desired, err := resources.MakeServersFromExistingCerts(ci, ns, secrets) if err != nil { return err } From 3cc4aa0dc16d250fe9c617c75ccaa7807094132f Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:20:31 -0700 Subject: [PATCH 39/65] Check for config --- .../clusteringress/clusteringress.go | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index cfe9043fdb42..e5e3b825e714 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -193,22 +193,23 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - secrets, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) + secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Host Secrets: \n", secret) - - for _, gatewayName := range gatewayNames { - ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) - if err != nil { - return err - } - desired, err := resources.MakeServersFromExistingCerts(ci, ns, secrets) - if err != nil { - return err - } - if err := c.reconcileGateway(ctx, ci, gatewayName, desired); err != nil { - return err - } - } + fmt.Sprintf("%s/%s", "istio-system", ci.Spec.Rules[0].Hosts[0]) + + // for _, gatewayName := range gatewayNames { + // ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) + // if err != nil { + // return err + // } + // desired, err := resources.MakeServersFromExistingCerts(ci, ns, secrets) + // if err != nil { + // return err + // } + // if err := c.reconcileGateway(ctx, ci, gatewayName, desired); err != nil { + // return err + // } + // } } else { logger.Info("Flag to check for existing certs was not set.") From 5c123f31392fb3007046739174fd6118cf53169d Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:24:13 -0700 Subject: [PATCH 40/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index e5e3b825e714..5cf2c5ad0c3a 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -195,7 +195,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Host Secrets: \n", secret) - fmt.Sprintf("%s/%s", "istio-system", ci.Spec.Rules[0].Hosts[0]) + fmt.Sprintf("Weird print statement %s/%s\n", "istio-system", ci.Spec.Rules[0].Hosts[0]) // for _, gatewayName := range gatewayNames { // ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) From a668f4f0a593f6a68bd171bfece856886884a4c0 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:27:52 -0700 Subject: [PATCH 41/65] Check for config --- .../clusteringress/clusteringress.go | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 5cf2c5ad0c3a..84136650e3ae 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -197,19 +197,24 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Printf("Host Secrets: \n", secret) fmt.Sprintf("Weird print statement %s/%s\n", "istio-system", ci.Spec.Rules[0].Hosts[0]) - // for _, gatewayName := range gatewayNames { - // ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) - // if err != nil { - // return err - // } - // desired, err := resources.MakeServersFromExistingCerts(ci, ns, secrets) - // if err != nil { - // return err - // } - // if err := c.reconcileGateway(ctx, ci, gatewayName, desired); err != nil { - // return err - // } - // } + secrets := map[string]*corev1.Secret{} + ref := fmt.Sprintf("%s/%s", "istio-system", ci.Spec.Rules[0].Hosts[0]) + fmt.Printf("ref: \n", ref) + secrets[ref] = secret + + for _, gatewayName := range gatewayNames { + ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) + if err != nil { + return err + } + desired, err := resources.MakeServersFromExistingCerts(ci, ns, secrets) + if err != nil { + return err + } + if err := c.reconcileGateway(ctx, ci, gatewayName, desired); err != nil { + return err + } + } } else { logger.Info("Flag to check for existing certs was not set.") From 9bd4c0d7fb74ec741c211c9546226ae68058073a Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:51:01 -0700 Subject: [PATCH 42/65] Check for config --- .../clusteringress/clusteringress.go | 19 +++++++++++-------- .../clusteringress/resources/gateway.go | 13 +------------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 84136650e3ae..81d4781ba822 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -183,17 +183,20 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) fmt.Println("rules: ", ci.Spec.Rules) fmt.Printf("rules type %T\n", ci.Spec.Rules) - fmt.Println("TLS: ", ci.Spec.TLS) - for _, tls := range ci.Spec.TLS { - fmt.Println("tls.SecretName: ", tls.SecretName) - fmt.Printf("tls.SecretName type %T\n", tls.SecretName) - secret, _ := c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName) - fmt.Printf("Secrets: ", secret) - } + // fmt.Println("TLS: ", ci.Spec.TLS) + // for _, tls := range ci.Spec.TLS { + // fmt.Println("tls.SecretName: ", tls.SecretName) + // fmt.Printf("tls.SecretName type %T\n", tls.SecretName) + // secret, _ := c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName) + // fmt.Printf("Secrets: ", secret) + // } fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - secret, _ := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) + secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) + if err != nil { + return err + } fmt.Printf("Host Secrets: \n", secret) fmt.Sprintf("Weird print statement %s/%s\n", "istio-system", ci.Spec.Rules[0].Hosts[0]) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index dcd90cb1f62e..7aee69ff8bcf 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -118,21 +118,10 @@ func MakeServers(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, or return SortServers(servers), nil } +// MakeServersFromExistingCerts is used to update gateway with non-cert-manager created certs. func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, originSecrets map[string]*corev1.Secret) ([]v1alpha3.Server, error) { servers := []v1alpha3.Server{} - // TODO(zhiminx): for the hosts that does not included in the ClusterIngressTLS but listed in the ClusterIngressRule, - // do we consider them as hosts for HTTP? for i, rules := range ci.Spec.Rules { - // credentialName := tls.SecretName - // // If the origin secret is not in the target namespace, then it should have been - // // copied into the target namespace. So we use the name of the copy. - // if tls.SecretNamespace != gatewayServiceNamespace { - // originSecret, ok := originSecrets[secretKey(tls)] - // if !ok { - // return nil, fmt.Errorf("unable to get the original secret %s/%s", tls.SecretNamespace, tls.SecretName) - // } - // credentialName = targetSecret(originSecret, ci) - // } servers = append(servers, v1alpha3.Server{ Hosts: rules.Hosts, Port: v1alpha3.Port{ From 6912218e1ca1a2660a2942a48e39f3500e02b92a Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 12:54:19 -0700 Subject: [PATCH 43/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 81d4781ba822..47ed88d6b6fe 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -178,6 +178,13 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) ci.Status.ObservedGeneration = ci.Generation if checkExistingCerts(ctx) { + + // Add the finalizer before adding `Servers` into Gateway so that we can be sure + // the `Servers` get cleaned up from Gateway. + if err := c.ensureFinalizer(ci); err != nil { + return err + } + logger.Info("Checking for existing certs") fmt.Println("rules: ", ci.Spec.Rules) From a651af89779d3a00df929e04863f1b63ecf60ba5 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:05:21 -0700 Subject: [PATCH 44/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 ++++ pkg/reconciler/clusteringress/resources/gateway.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 47ed88d6b6fe..cf8d6f622b0a 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -21,6 +21,7 @@ import ( "encoding/json" "fmt" "reflect" + "strings" "github.com/knative/pkg/tracker" @@ -198,7 +199,10 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) // fmt.Printf("Secrets: ", secret) // } + var host = ci.Spec.Rules[0].Hosts[0] fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) + host = strings.SplitAfterN(host, ",", 2) + fmt.Printf("Host after formatting \n", ci.Spec.Rules[0].Hosts[0]) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) if err != nil { diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 7aee69ff8bcf..c903a5dcafd1 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -122,6 +122,10 @@ func MakeServers(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, or func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, originSecrets map[string]*corev1.Secret) ([]v1alpha3.Server, error) { servers := []v1alpha3.Server{} for i, rules := range ci.Spec.Rules { + // var hosts []string + // for host in rules.Hosts{ + // hosts = append(hosts, ) + // } servers = append(servers, v1alpha3.Server{ Hosts: rules.Hosts, Port: v1alpha3.Port{ From 7edf561f775abcaac4f19e7521a3292d1cca9167 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:06:05 -0700 Subject: [PATCH 45/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index cf8d6f622b0a..6c56d1f25721 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -201,8 +201,8 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) var host = ci.Spec.Rules[0].Hosts[0] fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) - host = strings.SplitAfterN(host, ",", 2) - fmt.Printf("Host after formatting \n", ci.Spec.Rules[0].Hosts[0]) + var hostarray = strings.SplitAfterN(host, ",", 2) + fmt.Printf("Host after formatting \n", hostarray) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) if err != nil { From ee25fcb52e1ef5028637e67a62d783c68a0c9a9c Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:07:37 -0700 Subject: [PATCH 46/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 6c56d1f25721..d953fb839a45 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -188,7 +188,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) logger.Info("Checking for existing certs") - fmt.Println("rules: ", ci.Spec.Rules) + fmt.Println("rules: %s \n ", ci.Spec.Rules) fmt.Printf("rules type %T\n", ci.Spec.Rules) // fmt.Println("TLS: ", ci.Spec.TLS) @@ -200,20 +200,20 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) // } var host = ci.Spec.Rules[0].Hosts[0] - fmt.Printf("Host \n", ci.Spec.Rules[0].Hosts[0]) - var hostarray = strings.SplitAfterN(host, ",", 2) - fmt.Printf("Host after formatting \n", hostarray) + fmt.Printf("Host %s \n", ci.Spec.Rules[0].Hosts[0]) + var hostarray = strings.SplitAfterN(host, ".", 2) + fmt.Printf("Host after formatting %s\n", hostarray) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) if err != nil { return err } - fmt.Printf("Host Secrets: \n", secret) + fmt.Printf("Host Secrets: %s \n", secret) fmt.Sprintf("Weird print statement %s/%s\n", "istio-system", ci.Spec.Rules[0].Hosts[0]) secrets := map[string]*corev1.Secret{} ref := fmt.Sprintf("%s/%s", "istio-system", ci.Spec.Rules[0].Hosts[0]) - fmt.Printf("ref: \n", ref) + fmt.Printf("ref: %s \n", ref) secrets[ref] = secret for _, gatewayName := range gatewayNames { From 28ac63ab48978d8150fd10eb1608d4047f12c593 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:09:31 -0700 Subject: [PATCH 47/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- pkg/reconciler/clusteringress/resources/gateway.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index d953fb839a45..2459c3b878e0 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -201,7 +201,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) var host = ci.Spec.Rules[0].Hosts[0] fmt.Printf("Host %s \n", ci.Spec.Rules[0].Hosts[0]) - var hostarray = strings.SplitAfterN(host, ".", 2) + var domainName = strings.SplitAfterN(host, ".", 2) fmt.Printf("Host after formatting %s\n", hostarray) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index c903a5dcafd1..9be58811fbb9 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -126,8 +126,9 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // for host in rules.Hosts{ // hosts = append(hosts, ) // } + var domainName = strings.SplitAfterN(rules.Hosts[0], ".", 2) servers = append(servers, v1alpha3.Server{ - Hosts: rules.Hosts, + Hosts: domainName, Port: v1alpha3.Port{ Name: fmt.Sprintf("%s:%d", ci.Name, i), Number: 443, From 8438973f5d49049caff9bb134f1e591a49461c70 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:10:01 -0700 Subject: [PATCH 48/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 2459c3b878e0..b83a24ff4c53 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -202,7 +202,7 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) var host = ci.Spec.Rules[0].Hosts[0] fmt.Printf("Host %s \n", ci.Spec.Rules[0].Hosts[0]) var domainName = strings.SplitAfterN(host, ".", 2) - fmt.Printf("Host after formatting %s\n", hostarray) + fmt.Printf("domainName %s\n", domainName) fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) if err != nil { From 65e95ee28ae247072722a9f38dd6ed3822f60e1e Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:12:47 -0700 Subject: [PATCH 49/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 9be58811fbb9..bf96456d81cc 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -127,6 +127,10 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // hosts = append(hosts, ) // } var domainName = strings.SplitAfterN(rules.Hosts[0], ".", 2) + fmt.Printf("domainName %s\n", domainName) + fmt.Printf("domainName Type %T\n", domainName) + fmt.Printf("rules.Hosts %s\n", rules.Hosts) + fmt.Printf("rules.Hosts Type %T\n", rules.Hosts) servers = append(servers, v1alpha3.Server{ Hosts: domainName, Port: v1alpha3.Port{ From 899606973b9d4e43350dc83c163b96318f514318 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:13:56 -0700 Subject: [PATCH 50/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index bf96456d81cc..3a9f1a5a6af4 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -132,7 +132,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam fmt.Printf("rules.Hosts %s\n", rules.Hosts) fmt.Printf("rules.Hosts Type %T\n", rules.Hosts) servers = append(servers, v1alpha3.Server{ - Hosts: domainName, + Hosts: domainName[1], Port: v1alpha3.Port{ Name: fmt.Sprintf("%s:%d", ci.Name, i), Number: 443, From 90630ad85cb1d54cbf116cc6c13cffd710f47b2f Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:20:06 -0700 Subject: [PATCH 51/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 3a9f1a5a6af4..31280865b0bc 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -126,7 +126,8 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // for host in rules.Hosts{ // hosts = append(hosts, ) // } - var domainName = strings.SplitAfterN(rules.Hosts[0], ".", 2) + var slice = strings.SplitAfterN(rules.Hosts[0], ".", 2) + var domainName = slice[strings.Index(slice, " "):len(slice)] fmt.Printf("domainName %s\n", domainName) fmt.Printf("domainName Type %T\n", domainName) fmt.Printf("rules.Hosts %s\n", rules.Hosts) From 6dedab93d5c17252419302d1a7cc18f3c3b81b40 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:21:15 -0700 Subject: [PATCH 52/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 31280865b0bc..a6a3318ac4a5 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -126,8 +126,8 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // for host in rules.Hosts{ // hosts = append(hosts, ) // } - var slice = strings.SplitAfterN(rules.Hosts[0], ".", 2) - var domainName = slice[strings.Index(slice, " "):len(slice)] + // var slice = strings.SplitAfterN(rules.Hosts[0], ".", 2) + var domainName = rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(slice)] fmt.Printf("domainName %s\n", domainName) fmt.Printf("domainName Type %T\n", domainName) fmt.Printf("rules.Hosts %s\n", rules.Hosts) From 7416c90255c9283dc508fa38c2a42b6c66f59d3a Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:21:37 -0700 Subject: [PATCH 53/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index a6a3318ac4a5..79f788faf76b 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -127,7 +127,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // hosts = append(hosts, ) // } // var slice = strings.SplitAfterN(rules.Hosts[0], ".", 2) - var domainName = rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(slice)] + var domainName = rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])] fmt.Printf("domainName %s\n", domainName) fmt.Printf("domainName Type %T\n", domainName) fmt.Printf("rules.Hosts %s\n", rules.Hosts) From 059f01489766c8a9dde748d6bcf13cbd58585cff Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:22:05 -0700 Subject: [PATCH 54/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 79f788faf76b..08462781ff2a 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -133,7 +133,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam fmt.Printf("rules.Hosts %s\n", rules.Hosts) fmt.Printf("rules.Hosts Type %T\n", rules.Hosts) servers = append(servers, v1alpha3.Server{ - Hosts: domainName[1], + Hosts: domainName, Port: v1alpha3.Port{ Name: fmt.Sprintf("%s:%d", ci.Name, i), Number: 443, From dafc23f2010959baa8d1bfc6fac8c1b019904cd6 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:25:32 -0700 Subject: [PATCH 55/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 08462781ff2a..0a4226aa5580 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -132,8 +132,10 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam fmt.Printf("domainName Type %T\n", domainName) fmt.Printf("rules.Hosts %s\n", rules.Hosts) fmt.Printf("rules.Hosts Type %T\n", rules.Hosts) + hostname = make([string[], len(domainName)) + hostname.append(hostname, domainName) servers = append(servers, v1alpha3.Server{ - Hosts: domainName, + Hosts: hostname, Port: v1alpha3.Port{ Name: fmt.Sprintf("%s:%d", ci.Name, i), Number: 443, From 3c151c82cd4848df16818971915960356e23a2c2 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:29:32 -0700 Subject: [PATCH 56/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 0a4226aa5580..08462781ff2a 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -132,10 +132,8 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam fmt.Printf("domainName Type %T\n", domainName) fmt.Printf("rules.Hosts %s\n", rules.Hosts) fmt.Printf("rules.Hosts Type %T\n", rules.Hosts) - hostname = make([string[], len(domainName)) - hostname.append(hostname, domainName) servers = append(servers, v1alpha3.Server{ - Hosts: hostname, + Hosts: domainName, Port: v1alpha3.Port{ Name: fmt.Sprintf("%s:%d", ci.Name, i), Number: 443, From 23dc42213e48408e9f25c9176210ff65caca1e11 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:30:58 -0700 Subject: [PATCH 57/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 08462781ff2a..c3f6b7c9f96c 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -128,6 +128,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // } // var slice = strings.SplitAfterN(rules.Hosts[0], ".", 2) var domainName = rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])] + hostname := []string{domainName} fmt.Printf("domainName %s\n", domainName) fmt.Printf("domainName Type %T\n", domainName) fmt.Printf("rules.Hosts %s\n", rules.Hosts) From 67c715db73fbcb6fb058fe34a13e352c9ba3e66e Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:31:14 -0700 Subject: [PATCH 58/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index c3f6b7c9f96c..fbe5289d3ae3 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -134,7 +134,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam fmt.Printf("rules.Hosts %s\n", rules.Hosts) fmt.Printf("rules.Hosts Type %T\n", rules.Hosts) servers = append(servers, v1alpha3.Server{ - Hosts: domainName, + Hosts: hostname, Port: v1alpha3.Port{ Name: fmt.Sprintf("%s:%d", ci.Name, i), Number: 443, From 49e39093f0d70f40cfba700dc98c5a5b37a20c1f Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:32:19 -0700 Subject: [PATCH 59/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index fbe5289d3ae3..bf48c890e5c1 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -127,7 +127,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // hosts = append(hosts, ) // } // var slice = strings.SplitAfterN(rules.Hosts[0], ".", 2) - var domainName = rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])] + var domainName = rules.Hosts[0][strings.Index(rules.Hosts[0], ".")+1 : len(rules.Hosts[0])] hostname := []string{domainName} fmt.Printf("domainName %s\n", domainName) fmt.Printf("domainName Type %T\n", domainName) From f3402751e7c15aa35a20ebf3af20331a222da0ae Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 13:34:18 -0700 Subject: [PATCH 60/65] Check for config --- pkg/reconciler/clusteringress/resources/gateway.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index bf48c890e5c1..5a16af1b2704 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -127,7 +127,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam // hosts = append(hosts, ) // } // var slice = strings.SplitAfterN(rules.Hosts[0], ".", 2) - var domainName = rules.Hosts[0][strings.Index(rules.Hosts[0], ".")+1 : len(rules.Hosts[0])] + var domainName = "*" + rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])] hostname := []string{domainName} fmt.Printf("domainName %s\n", domainName) fmt.Printf("domainName Type %T\n", domainName) From dcf569823d971d81e8e0bfe406ad55d0f32a0434 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 14:39:23 -0700 Subject: [PATCH 61/65] Check for config --- .../clusteringress/clusteringress.go | 43 ++++--------------- .../clusteringress/resources/gateway.go | 16 ++----- .../clusteringress/resources/secret.go | 15 +++++++ 3 files changed, 28 insertions(+), 46 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index b83a24ff4c53..21456db8a555 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -21,7 +21,6 @@ import ( "encoding/json" "fmt" "reflect" - "strings" "github.com/knative/pkg/tracker" @@ -186,35 +185,18 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) return err } - logger.Info("Checking for existing certs") + logger.Info("Reconciling gateway with manually added secrets/certs.") - fmt.Println("rules: %s \n ", ci.Spec.Rules) - fmt.Printf("rules type %T\n", ci.Spec.Rules) - - // fmt.Println("TLS: ", ci.Spec.TLS) - // for _, tls := range ci.Spec.TLS { - // fmt.Println("tls.SecretName: ", tls.SecretName) - // fmt.Printf("tls.SecretName type %T\n", tls.SecretName) - // secret, _ := c.secretLister.Secrets(tls.SecretNamespace).Get(tls.SecretName) - // fmt.Printf("Secrets: ", secret) + // var host = ci.Spec.Rules[0].Hosts[0] + // secret, err := c.secretLister.Secrets("istio-system").Get(host) + // if err != nil { + // return err // } - var host = ci.Spec.Rules[0].Hosts[0] - fmt.Printf("Host %s \n", ci.Spec.Rules[0].Hosts[0]) - var domainName = strings.SplitAfterN(host, ".", 2) - fmt.Printf("domainName %s\n", domainName) - fmt.Printf("Hosts Type %T\n", ci.Spec.Rules[0].Hosts[0]) - secret, err := c.secretLister.Secrets("istio-system").Get(ci.Spec.Rules[0].Hosts[0]) - if err != nil { - return err - } - fmt.Printf("Host Secrets: %s \n", secret) - fmt.Sprintf("Weird print statement %s/%s\n", "istio-system", ci.Spec.Rules[0].Hosts[0]) - - secrets := map[string]*corev1.Secret{} - ref := fmt.Sprintf("%s/%s", "istio-system", ci.Spec.Rules[0].Hosts[0]) - fmt.Printf("ref: %s \n", ref) - secrets[ref] = secret + // secrets := map[string]*corev1.Secret{} + // ref := fmt.Sprintf("%s/%s", "istio-system", host) + // secrets[ref] = secret + secrets, err := resources.GetCINamespaceSecrets(ci, c.secretLister, "istio-system") for _, gatewayName := range gatewayNames { ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) @@ -250,13 +232,6 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) return err } - // for _, rules := range ci.Spec.Rules { - // hostnames, err := c.secretLister.Secrets("istio-system").Get(rules.Host) - // fmt.Println("hostnames: ", hostnames) - // } - - // fmt.Println("ClusterIngress: ", ci) - // fmt.Println("map: ", originSecrets) targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) if err := c.reconcileCertSecrets(ctx, ci, targetSecrets); err != nil { return err diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 5a16af1b2704..1e3fc0d123c7 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -118,21 +118,13 @@ func MakeServers(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, or return SortServers(servers), nil } -// MakeServersFromExistingCerts is used to update gateway with non-cert-manager created certs. +// MakeServersFromExistingCerts creates the expected Gateway Servers that are referenced by the ClusterIngree. +// This method builds these Servers with manually added secrets instead of AutoTLS created ones. func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, originSecrets map[string]*corev1.Secret) ([]v1alpha3.Server, error) { servers := []v1alpha3.Server{} for i, rules := range ci.Spec.Rules { - // var hosts []string - // for host in rules.Hosts{ - // hosts = append(hosts, ) - // } - // var slice = strings.SplitAfterN(rules.Hosts[0], ".", 2) - var domainName = "*" + rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])] - hostname := []string{domainName} - fmt.Printf("domainName %s\n", domainName) - fmt.Printf("domainName Type %T\n", domainName) - fmt.Printf("rules.Hosts %s\n", rules.Hosts) - fmt.Printf("rules.Hosts Type %T\n", rules.Hosts) + // var domainName = "*" + rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])] + hostname := []string{"*" + rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])]} servers = append(servers, v1alpha3.Server{ Hosts: hostname, Port: v1alpha3.Port{ diff --git a/pkg/reconciler/clusteringress/resources/secret.go b/pkg/reconciler/clusteringress/resources/secret.go index 174866089e98..a0d578533f03 100644 --- a/pkg/reconciler/clusteringress/resources/secret.go +++ b/pkg/reconciler/clusteringress/resources/secret.go @@ -46,6 +46,21 @@ func GetSecrets(ci *v1alpha1.ClusterIngress, secretLister corev1listers.SecretLi return secrets, nil } +func GetCINamespaceSecrets(ci *v1alpha1.ClusterIngress, secretLister corev1listers.SecretLister, ns string) (map[string]*corev1.Secret, error) { + + secrets := map[string]*corev1.Secret{} + var host = ci.Spec.Rules[0].Hosts[0] + secret, err := c.secretLister.Secrets(ns).Get(host) + if err != nil { + return nil, err + } + + ref := fmt.Sprintf("%s/%s", ns, host) + secrets[ref] = secret + + return secrets, nil +} + // MakeSecrets makes copies of the origin Secrets under the namespace of Istio gateway service. func MakeSecrets(ctx context.Context, originSecrets map[string]*corev1.Secret, ci *v1alpha1.ClusterIngress) []*corev1.Secret { gatewaySvcNamespaces := getAllGatewaySvcNamespaces(ctx) From 7ff2299f73927b14c6984bfd8087ebec9a2c4a17 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 14:40:16 -0700 Subject: [PATCH 62/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 10 ---------- pkg/reconciler/clusteringress/resources/secret.go | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 21456db8a555..28b25d43f533 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -186,16 +186,6 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } logger.Info("Reconciling gateway with manually added secrets/certs.") - - // var host = ci.Spec.Rules[0].Hosts[0] - // secret, err := c.secretLister.Secrets("istio-system").Get(host) - // if err != nil { - // return err - // } - - // secrets := map[string]*corev1.Secret{} - // ref := fmt.Sprintf("%s/%s", "istio-system", host) - // secrets[ref] = secret secrets, err := resources.GetCINamespaceSecrets(ci, c.secretLister, "istio-system") for _, gatewayName := range gatewayNames { diff --git a/pkg/reconciler/clusteringress/resources/secret.go b/pkg/reconciler/clusteringress/resources/secret.go index a0d578533f03..a1330dc04b4d 100644 --- a/pkg/reconciler/clusteringress/resources/secret.go +++ b/pkg/reconciler/clusteringress/resources/secret.go @@ -50,7 +50,7 @@ func GetCINamespaceSecrets(ci *v1alpha1.ClusterIngress, secretLister corev1liste secrets := map[string]*corev1.Secret{} var host = ci.Spec.Rules[0].Hosts[0] - secret, err := c.secretLister.Secrets(ns).Get(host) + secret, err := secretLister.Secrets(ns).Get(host) if err != nil { return nil, err } From 3cde19bdee6db455adb0bd7427205f222d112bd7 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 14:40:37 -0700 Subject: [PATCH 63/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 28b25d43f533..edbb6adbe84f 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -187,7 +187,9 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) logger.Info("Reconciling gateway with manually added secrets/certs.") secrets, err := resources.GetCINamespaceSecrets(ci, c.secretLister, "istio-system") - + if err != nil { + return err + } for _, gatewayName := range gatewayNames { ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) if err != nil { From d34e1b76e3226a0e7ec9d072c2b54675e6fa0f22 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Wed, 26 Jun 2019 15:00:38 -0700 Subject: [PATCH 64/65] Check for config --- pkg/reconciler/clusteringress/clusteringress.go | 8 ++++---- pkg/reconciler/clusteringress/resources/secret.go | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index edbb6adbe84f..74f35e1130f0 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -185,11 +185,12 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) return err } - logger.Info("Reconciling gateway with manually added secrets/certs.") - secrets, err := resources.GetCINamespaceSecrets(ci, c.secretLister, "istio-system") + // This works under the assumption the secrets/certs exist under istio-system namespace + secrets, err := resources.GetClusterIngressHostSecrets(ci, c.secretLister, "istio-system") if err != nil { return err } + for _, gatewayName := range gatewayNames { ns, err := resources.GatewayServiceNamespace(config.FromContext(ctx).Istio.IngressGateways, gatewayName) if err != nil { @@ -204,9 +205,8 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) } } - } else { - logger.Info("Flag to check for existing certs was not set.") } + if enablesAutoTLS(ctx) { if !ci.IsPublic() { logger.Infof("ClusterIngress %s is not public. So no need to configure TLS.", ci.Name) diff --git a/pkg/reconciler/clusteringress/resources/secret.go b/pkg/reconciler/clusteringress/resources/secret.go index a1330dc04b4d..92bbc3bc69eb 100644 --- a/pkg/reconciler/clusteringress/resources/secret.go +++ b/pkg/reconciler/clusteringress/resources/secret.go @@ -46,7 +46,8 @@ func GetSecrets(ci *v1alpha1.ClusterIngress, secretLister corev1listers.SecretLi return secrets, nil } -func GetCINamespaceSecrets(ci *v1alpha1.ClusterIngress, secretLister corev1listers.SecretLister, ns string) (map[string]*corev1.Secret, error) { +// GetClusterIngressHostSecrets gets the secrets whose name matches the host listed in the given ClusterIngress. +func GetClusterIngressHostSecrets(ci *v1alpha1.ClusterIngress, secretLister corev1listers.SecretLister, ns string) (map[string]*corev1.Secret, error) { secrets := map[string]*corev1.Secret{} var host = ci.Spec.Rules[0].Hosts[0] From eadf7c0bc93ededa599900231c8ed49d46fb6f57 Mon Sep 17 00:00:00 2001 From: Ross Wagner Date: Thu, 27 Jun 2019 08:51:06 -0700 Subject: [PATCH 65/65] Getting rid of test log statements and fixing up formatting for some methods --- cmd/activator/main.go | 1 - cmd/controller/main.go | 32 ------------------- pkg/network/network.go | 2 ++ .../clusteringress/clusteringress.go | 1 - .../clusteringress/resources/gateway.go | 7 ++-- 5 files changed, 6 insertions(+), 37 deletions(-) diff --git a/cmd/activator/main.go b/cmd/activator/main.go index 8c1ec2bac6f6..df58fc70d5bd 100644 --- a/cmd/activator/main.go +++ b/cmd/activator/main.go @@ -126,7 +126,6 @@ func main() { logger := createdLogger.With(zap.String(logkey.ControllerType, "activator")) defer flush(logger) - logger.Error("Cyclops") logger.Info("Starting the sandwich knative activator") clusterConfig, err := clientcmd.BuildConfigFromFlags(*masterURL, *kubeconfig) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 7bc1f1192595..fc1a6315c90b 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -17,13 +17,6 @@ limitations under the License. package main import ( - "log" - "os" - "github.com/knative/pkg/configmap" - "github.com/knative/serving/pkg/logging" - "github.com/knative/pkg/metrics" - "go.uber.org/zap" - "github.com/knative/pkg/logging/logkey" // The set of controllers this controller process runs. "github.com/knative/serving/pkg/reconciler/configuration" "github.com/knative/serving/pkg/reconciler/labeler" @@ -36,24 +29,7 @@ import ( "github.com/knative/pkg/injection/sharedmain" ) -const ( - component = "controller" -) - func main() { - cm, err := configmap.Load("/etc/config-logging") - if err != nil { - log.Fatal("Error loading logging configuration:", err) - } - logConfig, err := logging.NewConfigFromMap(cm) - if err != nil { - log.Fatal("Error loading logging configuration:", err) - } - createdLogger, _ := logging.NewLoggerFromConfig(logConfig, component) - logger := createdLogger.With(zap.String(logkey.ControllerType, "activator")) - defer flush(logger) - - logger.Error("Wolverine") sharedmain.Main("controller", configuration.NewController, labeler.NewRouteToConfigurationController, @@ -63,11 +39,3 @@ func main() { service.NewController, ) } - -func flush(logger *zap.SugaredLogger) { - logger.Sync() - os.Stdout.Sync() - os.Stderr.Sync() - metrics.FlushExporter() -} - diff --git a/pkg/network/network.go b/pkg/network/network.go index 8caa1b8866ca..0a81ac8d9ed8 100644 --- a/pkg/network/network.go +++ b/pkg/network/network.go @@ -109,6 +109,8 @@ var ( // that specifies enabling auto-TLS or not. AutoTLSKey = "autoTLS" + // CheckExistingCertsKey is the name of the configuration entry + // that specifies creation of TLS entries in gateway with existing secrets. CheckExistingCertsKey = "checkExistingCerts" // HTTPProtocolKey is the name of the configuration entry that diff --git a/pkg/reconciler/clusteringress/clusteringress.go b/pkg/reconciler/clusteringress/clusteringress.go index 74f35e1130f0..9c938dae3ab8 100644 --- a/pkg/reconciler/clusteringress/clusteringress.go +++ b/pkg/reconciler/clusteringress/clusteringress.go @@ -223,7 +223,6 @@ func (c *Reconciler) reconcile(ctx context.Context, ci *v1alpha1.ClusterIngress) if err != nil { return err } - targetSecrets := resources.MakeSecrets(ctx, originSecrets, ci) if err := c.reconcileCertSecrets(ctx, ci, targetSecrets); err != nil { return err diff --git a/pkg/reconciler/clusteringress/resources/gateway.go b/pkg/reconciler/clusteringress/resources/gateway.go index 1e3fc0d123c7..18f84762692e 100644 --- a/pkg/reconciler/clusteringress/resources/gateway.go +++ b/pkg/reconciler/clusteringress/resources/gateway.go @@ -123,8 +123,9 @@ func MakeServers(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, or func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNamespace string, originSecrets map[string]*corev1.Secret) ([]v1alpha3.Server, error) { servers := []v1alpha3.Server{} for i, rules := range ci.Spec.Rules { - // var domainName = "*" + rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])] - hostname := []string{"*" + rules.Hosts[0][strings.Index(rules.Hosts[0], "."):len(rules.Hosts[0])]} + // Replace first part of fqdn with wildcard to be used as the Hosts field. + credName = rules.Hosts[0] + hostname := []string{"*" + credName[strings.Index(credName, "."):len(credName)]} servers = append(servers, v1alpha3.Server{ Hosts: hostname, Port: v1alpha3.Port{ @@ -134,7 +135,7 @@ func MakeServersFromExistingCerts(ci *v1alpha1.ClusterIngress, gatewayServiceNam }, TLS: &v1alpha3.TLSOptions{ Mode: v1alpha3.TLSModeMutual, - CredentialName: rules.Hosts[0], + CredentialName: credName, }, }) }