Skip to content

Commit

Permalink
Merge pull request #473 from pb82/update-solution-explorer
Browse files Browse the repository at this point in the history
update solution explorer to 2.22.0
  • Loading branch information
openshift-merge-robot authored Mar 5, 2020
2 parents 5ab142c + a4c4f1d commit df5bf90
Show file tree
Hide file tree
Showing 5 changed files with 208 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
annotations:
capabilities: Basic Install
name: solution-explorer-operator.v0.0.45
namespace: placeholder
spec:
apiservicedefinitions: {}
customresourcedefinitions:
owned:
- kind: WebApp
name: webapps.integreatly.org
version: v1alpha1
displayName: SolutionExplorer
description: SolutionExplorer
description: Placeholder description
displayName: Tutorial Web App Operator
install:
spec:
deployments:
- name: tutorial-web-app-operator
spec:
replicas: 1
selector:
matchLabels:
name: tutorial-web-app-operator
strategy: {}
template:
metadata:
labels:
name: tutorial-web-app-operator
spec:
containers:
- command:
- tutorial-web-app-operator
env:
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: OPERATOR_NAME
value: tutorial-web-app-operator
image: quay.io/integreatly/tutorial-web-app-operator:v0.0.45
imagePullPolicy: Always
name: tutorial-web-app-operator
ports:
- containerPort: 60000
name: metrics
resources: {}
serviceAccountName: tutorial-web-app-operator
permissions:
- rules:
- apiGroups:
- integreatly.org
resources:
- '*'
verbs:
- '*'
- apiGroups:
- ""
resources:
- pods
- services
- endpoints
- persistentvolumeclaims
- events
- configmaps
- secrets
- serviceaccounts
verbs:
- '*'
- apiGroups:
- apps
resources:
- deployments
- daemonsets
- replicasets
- statefulsets
verbs:
- '*'
- apiGroups:
- template.openshift.io
resources:
- processedtemplates
verbs:
- get
- list
- create
- update
- delete
- deletecollection
- watch
- apiGroups:
- image.openshift.io
resources:
- imagestreams
verbs:
- get
- list
- create
- update
- delete
- deletecollection
- watch
- apiGroups:
- apps.openshift.io
resources:
- deploymentconfigs
verbs:
- get
- list
- create
- update
- delete
- deletecollection
- watch
- apiGroups:
- route.openshift.io
resources:
- routes
- routes/custom-host
verbs:
- get
- list
- create
- update
- delete
- deletecollection
- watch
serviceAccountName: tutorial-web-app-operator
strategy: deployment
installModes:
- supported: true
type: OwnNamespace
- supported: true
type: SingleNamespace
- supported: false
type: MultiNamespace
- supported: true
type: AllNamespaces
maturity: alpha
provider: {}
version: 0.0.45
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: webapps.integreatly.org
spec:
group: integreatly.org
names:
kind: WebApp
listKind: WebAppList
plural: webapps
singular: webapp
shortNames:
- wa
scope: Namespaced
version: v1alpha1
additionalPrinterColumns:
- name: status
description: webapp current status
type: string
JSONPath: .status.message
- name: created
description: webapp date creation
type: date
JSONPath: .metadata.creationTimestamp
validation:
openAPIV3Schema:
properties:
spec:
properties:
app_label:
type: string
template:
type: object
properties:
path:
type: string
parameters:
type: object
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packageName: rhmi-solution-explorer
channels:
- currentCSV: solution-explorer-operator.v0.0.44
- currentCSV: solution-explorer-operator.v0.0.45
name: rhmi
2 changes: 1 addition & 1 deletion pkg/apis/integreatly/v1alpha1/rhmi_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var (
OperatorVersionAMQStreams OperatorVersion = "1.1.0"
OperatorVersionAMQOnline OperatorVersion = "1.3.1"
OperatorVersionMonitoring OperatorVersion = "1.1.4"
OperatorVersionSolutionExplorer OperatorVersion = "0.0.44"
OperatorVersionSolutionExplorer OperatorVersion = "0.0.45"
OperatorVersionRHSSO OperatorVersion = "8.0.1"
OperatorVersionRHSSOUser OperatorVersion = "8.0.1"
OperatorVersionCodeReadyWorkspaces OperatorVersion = "2.0.0"
Expand Down
45 changes: 24 additions & 21 deletions pkg/products/solutionexplorer/reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,21 @@ import (
)

const (
defaultName = "solution-explorer"
defaultSubNameAndPkg = "rhmi-solution-explorer"
defaultTemplateLoc = "/home/tutorial-web-app-operator/deploy/template/tutorial-web-app.yml"
paramOpenShiftHost = "OPENSHIFT_HOST"
paramOpenShiftOauthHost = "OPENSHIFT_OAUTH_HOST"
paramOauthClient = "OPENSHIFT_OAUTHCLIENT_ID"
paramOpenShiftVersion = "OPENSHIFT_VERSION"
paramInstalledServices = "INSTALLED_SERVICES"
paramSSORoute = "SSO_ROUTE"
paramIntegreatlyVersion = "INTEGREATLY_VERSION"
paramClusterType = "CLUSTER_TYPE"
defaultRouteName = "tutorial-web-app"
manifestPackage = "integreatly-solution-explorer"
defaultName = "solution-explorer"
defaultSubNameAndPkg = "rhmi-solution-explorer"
defaultTemplateLoc = "/home/tutorial-web-app-operator/deploy/template/tutorial-web-app.yml"
defaultWalkthroughsLoc = "https://github.com/integr8ly/solution-patterns.git#v1.0.0"
paramOpenShiftHost = "OPENSHIFT_HOST"
paramOpenShiftOauthHost = "OPENSHIFT_OAUTH_HOST"
paramOauthClient = "OPENSHIFT_OAUTHCLIENT_ID"
paramOpenShiftVersion = "OPENSHIFT_VERSION"
paramInstalledServices = "INSTALLED_SERVICES"
paramSSORoute = "SSO_ROUTE"
paramIntegreatlyVersion = "INTEGREATLY_VERSION"
paramClusterType = "CLUSTER_TYPE"
paramWalkthroughLocations = "WALKTHROUGH_LOCATIONS"
defaultRouteName = "tutorial-web-app"
manifestPackage = "integreatly-solution-explorer"
)

type Reconciler struct {
Expand Down Expand Up @@ -365,14 +367,15 @@ func (r *Reconciler) ReconcileCustomResource(ctx context.Context, installation *
seCR.Spec.AppLabel = "tutorial-web-app"
seCR.Spec.Template.Path = defaultTemplateLoc
seCR.Spec.Template.Parameters = map[string]string{
paramOauthClient: r.getOAuthClientName(),
paramSSORoute: ssoConfig.GetHost(),
paramOpenShiftHost: installation.Spec.MasterURL,
paramOpenShiftOauthHost: oauthURL,
paramOpenShiftVersion: "4",
paramClusterType: "osd",
paramInstalledServices: installedServices,
paramIntegreatlyVersion: version.IntegreatlyVersion,
paramOauthClient: r.getOAuthClientName(),
paramSSORoute: ssoConfig.GetHost(),
paramOpenShiftHost: installation.Spec.MasterURL,
paramOpenShiftOauthHost: oauthURL,
paramOpenShiftVersion: "4",
paramClusterType: "osd",
paramInstalledServices: installedServices,
paramIntegreatlyVersion: version.IntegreatlyVersion,
paramWalkthroughLocations: defaultWalkthroughsLoc,
}
return nil
})
Expand Down

0 comments on commit df5bf90

Please sign in to comment.