THREESCALE-10882 Managed services bump

Makefile

@@ -1,6 +1,8 @@
 SHELL := /bin/bash
 # Current Operator version
 VERSION ?= 0.0.1
+# Current Threescale version
+THREESCALE_VERSION ?= 2.15
 # Default bundle image tag
 BUNDLE_IMG ?= controller-bundle:$(VERSION)
 # Options for 'bundle-build'
@@ -93,7 +95,8 @@ manager: generate fmt vet
 run: export WATCH_NAMESPACE=$(LOCAL_RUN_NAMESPACE)
 run: export THREESCALE_DEBUG=1
 run: generate fmt vet manifests
-	$(GO) run ./main.go --zap-devel
+	@-oc process THREESCALE_VERSION=$(THREESCALE_VERSION) -f config/requirements/operator-requirements.yaml | oc apply -f - -n $(WATCH_NAMESPACE)
+	$(GO) run ./main.go --zap-devel 
 
 # find or download controller-gen
 # download controller-gen if necessary

apis/apps/v1alpha1/apimanager_types.go

@@ -29,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	"github.com/3scale/3scale-operator/apis/apps"
-	"github.com/3scale/3scale-operator/pkg/3scale/amp/product"
 	"github.com/3scale/3scale-operator/pkg/apispkg/common"
 	"github.com/3scale/3scale-operator/version"
 )
@@ -38,9 +37,10 @@ import (
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 const (
-	ThreescaleVersionAnnotation = "apps.3scale.net/apimanager-threescale-version"
-	OperatorVersionAnnotation   = "apps.3scale.net/threescale-operator-version"
-	Default3scaleAppLabel       = "3scale-api-management"
+	ThreescaleVersionAnnotation     = "apps.3scale.net/apimanager-threescale-version"
+	OperatorVersionAnnotation       = "apps.3scale.net/threescale-operator-version"
+	Default3scaleAppLabel           = "3scale-api-management"
+	ThreescaleRequirementsConfirmed = "apps.3scale.net/apimanager-confirmed-requirements-version"
 )
 
 const (
@@ -147,8 +147,9 @@ type APIManager struct {
 }
 
 const (
-	APIManagerAvailableConditionType common.ConditionType = "Available"
-	APIManagerWarningConditionType   common.ConditionType = "Warning"
+	APIManagerAvailableConditionType  common.ConditionType = "Available"
+	APIManagerWarningConditionType    common.ConditionType = "Warning"
+	APIManagerPreflightsConditionType common.ConditionType = "Preflights"
 )
 
 type APIManagerCommonSpec struct {
@@ -885,6 +886,81 @@ func (apimanager *APIManager) SetDefaults() (bool, error) {
 	return changed, err
 }
 
+func (apimanager *APIManager) IsInFreshInstallationScenario() bool {
+	threescaleAnnotationFound := true
+
+	if _, ok := apimanager.Annotations[ThreescaleVersionAnnotation]; ok {
+		threescaleAnnotationFound = false
+	}
+
+	return threescaleAnnotationFound
+}
+
+func (apimanager *APIManager) IsHealthyUpgradeScenario() bool {
+	threescaleAnnotationFound := false
+
+	// is the version annotation present
+	if _, ok := apimanager.Annotations[ThreescaleVersionAnnotation]; ok {
+		threescaleAnnotationFound = true
+	}
+
+	// is the condition set to "available" = "true"
+	conditionAvailable := apimanager.IsExistingInstallationHealthy()
+
+	if threescaleAnnotationFound && conditionAvailable {
+		return true
+	}
+
+	return false
+}
+
+func (apimanager *APIManager) IsExistingInstallationHealthy() bool {
+	// Fetch ready condition
+	availableCondition := apimanager.Status.Conditions.GetCondition(APIManagerAvailableConditionType)
+
+	// return true if the ready condition is set to true
+	if availableCondition != nil && availableCondition.Status == v1.ConditionTrue {
+		return true
+	}
+
+	return false
+}
+
+func (apimanager *APIManager) RequirementsConfirmed(requirementsConfigMapResourceVersion string) bool {
+	if val, ok := apimanager.Annotations[ThreescaleRequirementsConfirmed]; ok && val == requirementsConfigMapResourceVersion {
+		return true
+	}
+
+	return false
+}
+
+func (apimanager *APIManager) RetrieveRHTVersion() string {
+	if val, ok := apimanager.Annotations[ThreescaleVersionAnnotation]; ok && val != "" {
+		return val
+	}
+
+	return ""
+}
+
+func (apimanager *APIManager) IsMultiMinorHopDetected() (bool, error) {
+	var currentlyInstalledVersion string
+	var multiMinorHopDetected bool
+
+	if val, ok := apimanager.Annotations[ThreescaleVersionAnnotation]; ok && val != "" {
+		currentlyInstalledVersion = val
+	}
+
+	if currentlyInstalledVersion != "" {
+		multiMinorHop, err := common.CompareMinorVersions(currentlyInstalledVersion, version.ThreescaleVersionMajorMinor())
+		if err != nil {
+			return true, err
+		}
+		multiMinorHopDetected = multiMinorHop
+	}
+
+	return multiMinorHopDetected, nil
+}
+
 func (apimanager *APIManager) setAPIManagerAnnotationsDefaults() bool {
 	changed := false
 
@@ -898,8 +974,8 @@ func (apimanager *APIManager) setAPIManagerAnnotationsDefaults() bool {
 		changed = true
 	}
 
-	if v, ok := apimanager.Annotations[ThreescaleVersionAnnotation]; !ok || v != product.ThreescaleRelease {
-		apimanager.Annotations[ThreescaleVersionAnnotation] = product.ThreescaleRelease
+	if v, ok := apimanager.Annotations[ThreescaleVersionAnnotation]; !ok || v != version.ThreescaleVersionMajorMinorPatch() {
+		apimanager.Annotations[ThreescaleVersionAnnotation] = version.ThreescaleVersionMajorMinorPatch()
 		changed = true
 	}
 

apis/apps/v1alpha1/apimanager_types_test.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/3scale/3scale-operator/pkg/3scale/amp/product"
 	"github.com/3scale/3scale-operator/version"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -26,7 +25,7 @@ func TestSetDefaults(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Annotations: map[string]string{
 				OperatorVersionAnnotation:   version.Version,
-				ThreescaleVersionAnnotation: product.ThreescaleRelease,
+				ThreescaleVersionAnnotation: version.ThreescaleVersionMajorMinorPatch(),
 			},
 		},
 		Spec: APIManagerSpec{

apis/capabilities/v1beta1/applicationauth_types.go

@@ -0,0 +1,105 @@
+/*
+Copyright 2020 Red Hat.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1
+
+import (
+	"github.com/3scale/3scale-operator/pkg/apispkg/common"
+	"github.com/go-logr/logr"
+	"github.com/google/go-cmp/cmp"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+const (
+	ApplicationAuthReadyConditionType  common.ConditionType = "Ready"
+	ApplicationAuthFailedConditionType common.ConditionType = "Failed"
+)
+
+// ApplicationAuthSpec defines the desired state of ApplicationAuth
+type ApplicationAuthSpec struct {
+	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+
+	// application CR metadata.name
+	ApplicationCRName string `json:"applicationCRName"`
+
+	// GenerateSecret Secret is generated if true and empty
+	// +optional
+	GenerateSecret *bool `json:"generateSecret,omitempty"`
+
+	// AuthSecretRef references account provider credentials
+	AuthSecretRef *corev1.LocalObjectReference `json:"authSecretRef"`
+
+	// ProviderAccountRef references account provider credentials
+	// +optional
+	ProviderAccountRef *corev1.LocalObjectReference `json:"providerAccountRef,omitempty"`
+}
+
+// ApplicationAuthStatus defines the observed state of ApplicationAuth
+type ApplicationAuthStatus struct {
+	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+
+	// Current state of the ApplicationAuth resource.
+	// Conditions represent the latest available observations of an object's state
+	// +optional
+	// +patchMergeKey=type
+	// +patchStrategy=merge
+	Conditions common.Conditions `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,2,rep,name=conditions"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+
+// ApplicationAuth is the Schema for the applicationauths API
+type ApplicationAuth struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ApplicationAuthSpec   `json:"spec,omitempty"`
+	Status ApplicationAuthStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// ApplicationAuthList contains a list of ApplicationAuth
+type ApplicationAuthList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ApplicationAuth `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&ApplicationAuth{}, &ApplicationAuthList{})
+}
+
+func (a *ApplicationAuthStatus) Equals(other *ApplicationAuthStatus, logger logr.Logger) bool {
+
+	// Marshalling sorts by condition type
+	currentMarshaledJSON, _ := a.Conditions.MarshalJSON()
+	otherMarshaledJSON, _ := other.Conditions.MarshalJSON()
+	if string(currentMarshaledJSON) != string(otherMarshaledJSON) {
+		diff := cmp.Diff(string(currentMarshaledJSON), string(otherMarshaledJSON))
+		logger.V(1).Info("Conditions not equal", "difference", diff)
+		return false
+	}
+
+	return true
+}

apis/capabilities/v1beta1/proxyconfigpromote_types.go

@@ -70,7 +70,7 @@ type ProxyConfigPromoteStatus struct {
 	//+optional
 	LatestStagingVersion int `json:"latestStagingVersion,omitempty"`
 
-	// Current state of the activedoc resource.
+	// Current state of the ProxyConfigPromote resource.
 	// Conditions represent the latest available observations of an object's state
 	// +optional
 	// +patchMergeKey=type