Merge pull request #7310 from phantomjinx/1.8.x

Backport fix for thrift dependency issue & fix for ENTESB-12350

install/operator/go.mod

@@ -7,7 +7,6 @@ module github.com/syndesisio/syndesis/install/operator
 // replace github.com/chirino/hawtgo => /Users/chirino/sandbox/hawtgo
 
 require (
-	github.com/NYTimes/gziphandler v1.0.1 // indirect
 	github.com/chirino/hawtgo v0.0.1
 	github.com/go-logr/logr v0.1.0
 	github.com/go-openapi/spec v0.19.2
@@ -52,4 +51,6 @@ replace (
 	sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
 )
 
-replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0
+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
+
+go 1.13

install/operator/go.sum

@@ -33,6 +33,7 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 h1:Kn3rqvbUFqSepE2OqVu0Pn1CbDw9IuMlONapol0zuwk=
 github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30/go.mod h1:4AJxUpXUhv4N+ziTvIcWWXgeorXpxPZOfk9HdEVr96M=

install/operator/pkg/apis/syndesis/v1alpha1/syndesis_types.go

@@ -73,7 +73,8 @@ type ComponentsSpec struct {
 }
 
 type OauthConfiguration struct {
-	Tag string `json:"tag,omitempty"`
+	DisableSarCheck *bool  `json:"disableSarCheck,omitempty"`
+	Tag             string `json:"tag,omitempty"`
 }
 
 type PostgresExporterConfiguration struct {

install/operator/pkg/generator/assets/infrastructure/04-syndesis-oauth-proxy.yml.tmpl

@@ -74,7 +74,9 @@
             - --skip-auth-preflight
             - --openshift-ca=/etc/pki/tls/certs/ca-bundle.crt
             - --openshift-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+            {{ if (not .Syndesis.Spec.Components.Oauth.DisableSarCheck) }}
             - --openshift-sar={"namespace":"{{.Syndesis.Spec.SarNamespace}}","resource":"pods","verb":"get"}
+            {{ end }}
             # Disabled for now: --pass-user-bearer-token as this requires extra permission which only
             # can be given by a cluster-admin
           env:

install/operator/pkg/syndesis/configuration/configuration.go

@@ -25,6 +25,7 @@ const (
 	EnvPostgresqlVolumeCapacity      SyndesisEnvVar = "POSTGRESQL_VOLUME_CAPACITY"
 	EnvPostgresqlSampledbPassword    SyndesisEnvVar = "POSTGRESQL_SAMPLEDB_PASSWORD"
 	EnvTestSupport                   SyndesisEnvVar = "TEST_SUPPORT_ENABLED"
+	EnvOauthDisableSarCheck          SyndesisEnvVar = "OAUTH_DISABLE_SAR_CHECK"
 	EnvOauthCookieSecret             SyndesisEnvVar = "OAUTH_COOKIE_SECRET"
 	EnvSyndesisEncryptKey            SyndesisEnvVar = "SYNDESIS_ENCRYPT_KEY"
 	EnvPrometheusVolumeCapacity      SyndesisEnvVar = "PROMETHEUS_VOLUME_CAPACITY"
@@ -85,6 +86,7 @@ var AllConfigOptions = map[SyndesisEnvVar]ConfigSpec{
 	EnvPostgresqlVolumeCapacity:      ConfigSpec{Value: "1Gi", Required: true, Description: "Volume space available for PostgreSQL data, e.g. 512Mi, 2Gi"},
 	EnvPostgresqlSampledbPassword:    ConfigSpec{Generate: "expression", FromLen: 16, Required: true, Description: "Password for the PostgreSQL sampledb user"},
 	EnvTestSupport:                   ConfigSpec{Value: "false", Required: true, Description: "Enables test-support endpoint on backend API"},
+	EnvOauthDisableSarCheck:          ConfigSpec{Value: "false", Description: "Disables SAR checks made by the syndesis operator"},
 	EnvOauthCookieSecret:             ConfigSpec{Generate: "expression", FromLen: 32, Description: "Secret to use to encrypt oauth cookies"},
 	EnvSyndesisEncryptKey:            ConfigSpec{Generate: "expression", FromLen: 64, Required: true, Description: "The encryption key used to encrypt/decrypt stored secrets"},
 	EnvPrometheusVolumeCapacity:      ConfigSpec{Value: "1Gi", Required: true, Description: "Volume space available for Prometheus data, e.g. 512Mi, 2Gi"},
@@ -162,6 +164,7 @@ var (
 		postgresExporterTagFromEnv,
 
 		komodoTagFromEnv,
+		oauthDisableSarCheckFromEnv,
 		oauthProxyTagFromEnv,
 		prometheusTagFromEnv,
 
@@ -249,6 +252,12 @@ func komodoTagFromEnv(config map[string]string, syndesis *v1alpha1.Syndesis) {
 	}
 }
 
+func oauthDisableSarCheckFromEnv(config map[string]string, syndesis *v1alpha1.Syndesis) {
+	if v, ok := getBool(config, EnvOauthDisableSarCheck); ok && syndesis.Spec.Components.Oauth.DisableSarCheck == nil {
+		syndesis.Spec.Components.Oauth.DisableSarCheck = &v
+	}
+}
+
 func oauthProxyTagFromEnv(config map[string]string, syndesis *v1alpha1.Syndesis) {
 	if v, ok := getString(config, EnvOauthProxyTag); ok && syndesis.Spec.Components.Oauth.Tag == "" {
 		syndesis.Spec.Components.Oauth.Tag = v