Set OPERATOR_IMAGE_VERSION env var for kube-apiserver pods

These are required for featuregate detection to function

Author: Vadim Rutkovsky

bindata/assets/kube-apiserver/pod.yaml

@@ -180,6 +180,8 @@ spec:
       valueFrom:
         fieldRef:
           fieldPath: metadata.namespace
+    - name: OPERATOR_IMAGE_VERSION
+      value: "{{ .OperatorImageVersion }}"
     image: {{.OperatorImage}}
     imagePullPolicy: IfNotPresent
     terminationMessagePolicy: FallbackToLogsOnError

pkg/cmd/certregenerationcontroller/cmd.go

@@ -112,7 +112,6 @@ func (o *Options) Run(ctx context.Context, clock clock.Clock) error {
 	// We can't start informers until after the resources have been requested. Now is the time.
 	kubeAPIServerInformersForNamespaces.Start(ctx.Done())
 	dynamicInformers.Start(ctx.Done())
-	configInformers.Start(ctx.Done())
 
 	desiredVersion := status.VersionForOperatorFromEnv()
 	missingVersion := "0.0.1-snapshot"
@@ -122,9 +121,8 @@ func (o *Options) Run(ctx context.Context, clock clock.Clock) error {
 		o.controllerContext.EventRecorder,
 	)
 
-	go func() {
-		featureGateAccessor.Run(ctx)
-	}()
+	go configInformers.Start(ctx.Done())
+	go featureGateAccessor.Run(ctx)
 
 	select {
 	case <-featureGateAccessor.InitialFeatureGatesObserved():

pkg/operator/certrotationcontroller/certrotationcontroller.go

@@ -138,6 +138,7 @@ func newCertRotationController(
 		monthPeriod = 2 * time.Hour
 		yearPeriod = 3 * time.Hour
 		tenMonthPeriod = 150 * time.Minute
+		klog.Infof("Setting monthPeriod to %v, yearPeriod to %v, tenMonthPeriod to %v", monthPeriod, yearPeriod, tenMonthPeriod)
 	}
 
 	certRotator := certrotation.NewCertRotationController(

pkg/operator/starter.go

@@ -263,6 +263,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 	targetConfigReconciler := targetconfigcontroller.NewTargetConfigController(
 		os.Getenv("IMAGE"),
 		os.Getenv("OPERATOR_IMAGE"),
+		os.Getenv("OPERATOR_IMAGE_VERSION"),
 		operatorClient,
 		kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace),
 		kubeInformersForNamespaces,

pkg/operator/targetconfigcontroller/targetconfigcontroller.go

@@ -48,6 +48,7 @@ const (
 type TargetConfigController struct {
 	targetImagePullSpec   string
 	operatorImagePullSpec string
+	operatorImageVersion  string
 
 	operatorClient v1helpers.StaticPodOperatorClient
 
@@ -59,7 +60,7 @@ type TargetConfigController struct {
 }
 
 func NewTargetConfigController(
-	targetImagePullSpec, operatorImagePullSpec string,
+	targetImagePullSpec, operatorImagePullSpec, operatorImageVersion string,
 	operatorClient v1helpers.StaticPodOperatorClient,
 	kubeInformersForOpenshiftKubeAPIServerNamespace informers.SharedInformerFactory,
 	kubeInformersForNamespaces v1helpers.KubeInformersForNamespaces,
@@ -71,6 +72,7 @@ func NewTargetConfigController(
 	c := &TargetConfigController{
 		targetImagePullSpec:          targetImagePullSpec,
 		operatorImagePullSpec:        operatorImagePullSpec,
+		operatorImageVersion:         operatorImageVersion,
 		operatorClient:               operatorClient,
 		kubeClient:                   kubeClient,
 		configMapLister:              kubeInformersForNamespaces.ConfigMapLister(),
@@ -215,7 +217,7 @@ func createTargetConfig(ctx context.Context, c TargetConfigController, recorder
 	if err != nil {
 		errors = append(errors, fmt.Errorf("%q: %v", "configmap/config", err))
 	}
-	_, _, err = managePods(ctx, c.kubeClient.CoreV1(), c.isStartupMonitorEnabledFn, recorder, operatorSpec, c.targetImagePullSpec, c.operatorImagePullSpec)
+	_, _, err = managePods(ctx, c.kubeClient.CoreV1(), c.isStartupMonitorEnabledFn, recorder, operatorSpec, c.targetImagePullSpec, c.operatorImagePullSpec, c.operatorImageVersion)
 	if err != nil {
 		errors = append(errors, fmt.Errorf("%q: %v", "configmap/kube-apiserver-pod", err))
 	}
@@ -293,8 +295,8 @@ func manageKubeAPIServerConfig(ctx context.Context, client coreclientv1.ConfigMa
 	return resourceapply.ApplyConfigMap(ctx, client, recorder, requiredConfigMap)
 }
 
-func managePods(ctx context.Context, client coreclientv1.ConfigMapsGetter, isStartupMonitorEnabledFn func() (bool, error), recorder events.Recorder, operatorSpec *operatorv1.StaticPodOperatorSpec, imagePullSpec, operatorImagePullSpec string) (*corev1.ConfigMap, bool, error) {
-	appliedPodTemplate, err := manageTemplate(string(bindata.MustAsset("assets/kube-apiserver/pod.yaml")), imagePullSpec, operatorImagePullSpec, operatorSpec)
+func managePods(ctx context.Context, client coreclientv1.ConfigMapsGetter, isStartupMonitorEnabledFn func() (bool, error), recorder events.Recorder, operatorSpec *operatorv1.StaticPodOperatorSpec, imagePullSpec, operatorImagePullSpec, operatorImageVersion string) (*corev1.ConfigMap, bool, error) {
+	appliedPodTemplate, err := manageTemplate(string(bindata.MustAsset("assets/kube-apiserver/pod.yaml")), imagePullSpec, operatorImagePullSpec, operatorImageVersion, operatorSpec)
 	if err != nil {
 		return nil, false, err
 	}
@@ -547,6 +549,7 @@ func gogcFromConfig(config map[string]interface{}) (int, error) {
 type kasTemplate struct {
 	Image                         string
 	OperatorImage                 string
+	OperatorImageVersion          string
 	Verbosity                     string
 	GracefulTerminationDuration   int
 	SetupContainerTimeoutDuration int
@@ -567,7 +570,7 @@ func effectiveConfiguration(spec *operatorv1.StaticPodOperatorSpec) (map[string]
 	return effectiveConfig, nil
 }
 
-func manageTemplate(rawTemplate string, imagePullSpec string, operatorImagePullSpec string, operatorSpec *operatorv1.StaticPodOperatorSpec) (string, error) {
+func manageTemplate(rawTemplate string, imagePullSpec string, operatorImagePullSpec, operatorImageVersion string, operatorSpec *operatorv1.StaticPodOperatorSpec) (string, error) {
 	var verbosity string
 	switch operatorSpec.LogLevel {
 	case operatorv1.Normal:
@@ -600,6 +603,7 @@ func manageTemplate(rawTemplate string, imagePullSpec string, operatorImagePullS
 	tmplVal := kasTemplate{
 		Image:                       imagePullSpec,
 		OperatorImage:               operatorImagePullSpec,
+		OperatorImageVersion:        operatorImageVersion,
 		Verbosity:                   verbosity,
 		GracefulTerminationDuration: gracefulTerminationDuration,
 		// 80s for minimum-termination-duration (10s port wait, 65s to let pending requests finish after port has been freed) + 5s extra cri-o's graceful termination period

pkg/operator/targetconfigcontroller/targetconfigcontroller_test.go

@@ -233,6 +233,7 @@ func TestManageTemplate(t *testing.T) {
 				scenario.template,
 				"CaptainAmerica",
 				"Piper",
+				"v1",
 				scenario.operatorSpec)
 
 			// validate