Merge pull request openshift#56 from bparees/nodeselector

update to new build nodeselector override api
stlaz · Jan 18, 2019 · 40c17d5 · 40c17d5
2 parents 4fef001 + 8970a01
commit 40c17d5
Show file tree

Hide file tree

Showing 95 changed files with 2,439 additions and 4,496 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/pkg/operator/observe_config.go b/pkg/operator/observe_config.go
@@ -207,16 +207,11 @@ func observeBuildControllerConfig(listers Listers, observedConfig map[string]int
 			return nil, fmt.Errorf("failed to observe %s: %v", "build.buildOverrides.imageLabels", err)
 		}
 	}
-	nodeSelector := build.Spec.BuildOverrides.NodeSelector
-	if len(build.Spec.BuildOverrides.NodeSelector.MatchLabels) > 0 {
-		if err = observeField(observedConfig, nodeSelector.MatchLabels, "build.buildOverrides.nodeSelector", true); err != nil {
+	if len(build.Spec.BuildOverrides.NodeSelector) > 0 {
+		if err = observeField(observedConfig, build.Spec.BuildOverrides.NodeSelector, "build.buildOverrides.nodeSelector", true); err != nil {
 			return nil, fmt.Errorf("failed to observe %s: %v", "build.buildOverrides.nodeSelector", err)
 		}
 	}
-	// Control plane config does not support MatchExpressions yet
-	if len(nodeSelector.MatchExpressions) > 0 {
-		glog.Warningf("config.Build: %s is not supported", "buildOverrides.nodeSelector.matchExpressions")
-	}
 	if len(build.Spec.BuildOverrides.Tolerations) > 0 {
 		if err = observeField(observedConfig, build.Spec.BuildOverrides.Tolerations, "build.buildOverrides.tolerations", true); err != nil {
 			return nil, fmt.Errorf("failed to observe %s: %v", "build.buildOverrides.tolerations", err)

diff --git a/pkg/operator/observe_config_test.go b/pkg/operator/observe_config_test.go
@@ -173,12 +173,12 @@ func TestObserveBuildControllerConfig(t *testing.T) {
 				},
 				Spec: configv1.BuildSpec{
 					BuildDefaults: configv1.BuildDefaults{
-						DefaultProxy: &configv1.ProxyConfig{
+						DefaultProxy: &configv1.ProxySpec{
 							HTTPProxy:  "http://user:pass@someproxy.net",
 							HTTPSProxy: "https://user:pass@someproxy.net",
 							NoProxy:    "image-resgistry.cluster.svc.local",
 						},
-						GitProxy: &configv1.ProxyConfig{
+						GitProxy: &configv1.ProxySpec{
 							HTTPProxy:  "http://my-proxy",
 							HTTPSProxy: "https://my-proxy",
 							NoProxy:    "https://no-proxy",
@@ -208,10 +208,8 @@ func TestObserveBuildControllerConfig(t *testing.T) {
 								Value: "teset2",
 							},
 						},
-						NodeSelector: metav1.LabelSelector{
-							MatchLabels: map[string]string{
-								"foo": "bar",
-							},
+						NodeSelector: map[string]string{
+							"foo": "bar",
 						},
 						Tolerations: []corev1.Toleration{
 							{
@@ -232,12 +230,12 @@ func TestObserveBuildControllerConfig(t *testing.T) {
 				},
 				Spec: configv1.BuildSpec{
 					BuildDefaults: configv1.BuildDefaults{
-						DefaultProxy: &configv1.ProxyConfig{
+						DefaultProxy: &configv1.ProxySpec{
 							HTTPProxy:  "",
 							HTTPSProxy: "https://user:pass@someproxy.net",
 							NoProxy:    "",
 						},
-						GitProxy: &configv1.ProxyConfig{
+						GitProxy: &configv1.ProxySpec{
 							HTTPProxy:  "http://my-proxy",
 							HTTPSProxy: "",
 							NoProxy:    "https://no-proxy",
@@ -246,28 +244,6 @@ func TestObserveBuildControllerConfig(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "match expressions",
-			buildConfig: &configv1.Build{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "cluster",
-				},
-				Spec: configv1.BuildSpec{
-					BuildOverrides: configv1.BuildOverrides{
-						NodeSelector: metav1.LabelSelector{
-							MatchExpressions: []metav1.LabelSelectorRequirement{
-								{
-									Key:      "mylabel",
-									Values:   []string{"foo", "bar"},
-									Operator: metav1.LabelSelectorOpIn,
-								},
-							},
-						},
-					},
-				},
-			},
-			expectError: false,
-		},
 		{
 			name: "default proxy",
 			buildConfig: &configv1.Build{
@@ -276,7 +252,7 @@ func TestObserveBuildControllerConfig(t *testing.T) {
 				},
 				Spec: configv1.BuildSpec{
 					BuildDefaults: configv1.BuildDefaults{
-						DefaultProxy: &configv1.ProxyConfig{
+						DefaultProxy: &configv1.ProxySpec{
 							HTTPProxy:  "http://user:pass@someproxy.net",
 							HTTPSProxy: "https://user:pass@someproxy.net",
 							NoProxy:    "image-resgistry.cluster.svc.local",
@@ -293,7 +269,7 @@ func TestObserveBuildControllerConfig(t *testing.T) {
 				},
 				Spec: configv1.BuildSpec{
 					BuildDefaults: configv1.BuildDefaults{
-						DefaultProxy: &configv1.ProxyConfig{
+						DefaultProxy: &configv1.ProxySpec{
 							HTTPProxy:  "http://user:pass@someproxy.net",
 							HTTPSProxy: "https://user:pass@someproxy.net",
 							NoProxy:    "image-resgistry.cluster.svc.local",
@@ -324,7 +300,7 @@ func TestObserveBuildControllerConfig(t *testing.T) {
 				},
 				Spec: configv1.BuildSpec{
 					BuildDefaults: configv1.BuildDefaults{
-						GitProxy: &configv1.ProxyConfig{
+						GitProxy: &configv1.ProxySpec{
 							HTTPProxy:  "http://user:pass@someproxy.net",
 							HTTPSProxy: "https://user:pass@someproxy.net",
 							NoProxy:    "image-resgistry.cluster.svc.local",
@@ -370,7 +346,7 @@ func TestObserveBuildControllerConfig(t *testing.T) {
 			testNestedField(observed, expectedEnv, "build.buildDefaults.env", false, t)
 			testNestedField(observed, test.buildConfig.Spec.BuildDefaults.ImageLabels, "build.buildDefaults.imageLabels", false, t)
 			testNestedField(observed, test.buildConfig.Spec.BuildOverrides.ImageLabels, "build.buildOverrides.imageLabels", false, t)
-			testNestedField(observed, test.buildConfig.Spec.BuildOverrides.NodeSelector.MatchLabels, "build.buildOverrides.nodeSelector", false, t)
+			testNestedField(observed, test.buildConfig.Spec.BuildOverrides.NodeSelector, "build.buildOverrides.nodeSelector", false, t)
 			testNestedField(observed, test.buildConfig.Spec.BuildOverrides.Tolerations, "build.buildOverrides.tolerations", false, t)
 
 			expectedGitProxy := test.buildConfig.Spec.BuildDefaults.DefaultProxy

diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
@@ -12,6 +12,7 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 
+	configv1 "github.com/openshift/api/config/v1"
 	configv1client "github.com/openshift/client-go/config/clientset/versioned"
 	configinformers "github.com/openshift/client-go/config/informers/externalversions"
 	"github.com/openshift/cluster-openshift-controller-manager-operator/pkg/apis/openshiftcontrollermanager/v1"
@@ -76,6 +77,7 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
 
 	clusterOperatorStatus := status.NewClusterOperatorStatusController(
 		"openshift-controller-manager-operator",
+		[]configv1.ObjectReference{},
 		configClient.ConfigV1(),
 		opClient,
 		ctx.EventRecorder,

diff --git a/pkg/operator/sync_openshiftcontrollermanager_v311_00.go b/pkg/operator/sync_openshiftcontrollermanager_v311_00.go
@@ -7,6 +7,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	appsclientv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
 	coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
@@ -143,7 +144,7 @@ func syncOpenShiftControllerManager_v311_00_to_latest(c OpenShiftControllerManag
 
 func manageOpenShiftAPIServerClientCA_v311_00_to_latest(client coreclientv1.CoreV1Interface, recorder events.Recorder) (bool, error) {
 	const apiserverClientCA = "client-ca"
-	_, caChanged, err := resourceapply.SyncConfigMap(client, recorder, kubeAPIServerNamespaceName, apiserverClientCA, targetNamespaceName, apiserverClientCA)
+	_, caChanged, err := resourceapply.SyncConfigMap(client, recorder, kubeAPIServerNamespaceName, apiserverClientCA, targetNamespaceName, apiserverClientCA, []metav1.OwnerReference{})
 	if err != nil {
 		return false, err
 	}

diff --git a/vendor/github.com/openshift/api/.gitattributes b/vendor/github.com/openshift/api/.gitattributes
diff --git a/...pi/apps/v1/types_swagger_doc_generated.go → .../v1/zz_generated.swagger_doc_generated.go b/...pi/apps/v1/types_swagger_doc_generated.go → .../v1/zz_generated.swagger_doc_generated.go
diff --git a/...ization/v1/types_swagger_doc_generated.go → .../v1/zz_generated.swagger_doc_generated.go b/...ization/v1/types_swagger_doc_generated.go → .../v1/zz_generated.swagger_doc_generated.go
diff --git a/...i/build/v1/types_swagger_doc_generated.go → .../v1/zz_generated.swagger_doc_generated.go b/...i/build/v1/types_swagger_doc_generated.go → .../v1/zz_generated.swagger_doc_generated.go
diff --git a/vendor/github.com/openshift/api/config/v1/register.go b/vendor/github.com/openshift/api/config/v1/register.go
diff --git a/vendor/github.com/openshift/api/config/v1/types.go b/vendor/github.com/openshift/api/config/v1/types.go
diff --git a/vendor/github.com/openshift/api/config/v1/types_authentication.go b/vendor/github.com/openshift/api/config/v1/types_authentication.go