seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert recreate strategy and probes for operator (#609) 

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/615/head
Anatolii Bazko 2021-01-06 10:17:04 +02:00 committed by GitHub
parent f73542ab93
commit 2189f6f8ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/manager/main.go
View File

@ -35,7 +35,6 @@ import (
sdkVersion "github.com/operator-framework/operator-sdk/version"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
)
@ -117,8 +116,7 @@ func main() {
// Create a new Cmd to provide shared dependencies and start components
options := manager.Options{
Namespace: namespace,
HealthProbeBindAddress: ":6789",
Namespace: namespace,
}
mgr, err := manager.New(cfg, options)
if err != nil {
@ -160,16 +158,6 @@ func main() {
os.Exit(1)
}
// Setup health checks
if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
log.Error(err, "Unable to set up health check")
os.Exit(1)
}
if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
log.Error(err, "Unable to set up ready check")
os.Exit(1)
}
logrus.Info("Starting the Cmd")
// Start the Cmd

27
deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
View File

@ -84,13 +84,13 @@ metadata:
categories: Developer Tools
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-01-05T13:27:39Z"
createdAt: "2021-01-06T07:12:37Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.24.0-60.nightly
name: eclipse-che-preview-kubernetes.v7.24.0-62.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -291,8 +291,7 @@ spec:
selector:
matchLabels:
app: che-operator
strategy:
type: Recreate
strategy: {}
template:
metadata:
labels:
@ -358,28 +357,10 @@ spec:
value: ca-certs
image: quay.io/eclipse/che-operator:nightly
imagePullPolicy: Always
livenessProbe:
failureThreshold: 10
httpGet:
path: /readyz
port: 6789
initialDelaySeconds: 15
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
name: che-operator
ports:
- containerPort: 60000
name: metrics
readinessProbe:
failureThreshold: 10
httpGet:
path: /healthz
port: 6789
initialDelaySeconds: 5
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
resources: {}
restartPolicy: Always
serviceAccountName: che-operator
@ -513,4 +494,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.24.0-60.nightly
version: 7.24.0-62.nightly

27
deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View File

@ -75,13 +75,13 @@ metadata:
categories: Developer Tools, OpenShift Optional
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-01-05T13:27:48Z"
createdAt: "2021-01-06T07:12:47Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces in OpenShift.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.24.0-58.nightly
name: eclipse-che-preview-openshift.v7.24.0-62.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -306,8 +306,7 @@ spec:
selector:
matchLabels:
app: che-operator
strategy:
type: Recreate
strategy: {}
template:
metadata:
labels:
@ -371,28 +370,10 @@ spec:
value: ca-certs
image: quay.io/eclipse/che-operator:nightly
imagePullPolicy: Always
livenessProbe:
failureThreshold: 10
httpGet:
path: /readyz
port: 6789
initialDelaySeconds: 15
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
name: che-operator
ports:
- containerPort: 60000
name: metrics
readinessProbe:
failureThreshold: 10
httpGet:
path: /healthz
port: 6789
initialDelaySeconds: 5
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
resources: {}
restartPolicy: Always
serviceAccountName: che-operator
@ -532,4 +513,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.24.0-58.nightly
version: 7.24.0-62.nightly

20
deploy/operator.yaml
View File

@ -17,8 +17,6 @@ spec:
selector:
matchLabels:
app: che-operator
strategy:
type: Recreate
template:
metadata:
labels:
@ -88,24 +86,6 @@ spec:
value: che-postgres-secret
- name: CHE_SERVER_TRUST_STORE_CONFIGMAP_NAME
value: ca-certs
livenessProbe:
httpGet:
path: /readyz
port: 6789
initialDelaySeconds: 15
periodSeconds: 10
failureThreshold: 10
successThreshold: 1
timeoutSeconds: 5
readinessProbe:
httpGet:
path: /healthz
port: 6789
initialDelaySeconds: 5
periodSeconds: 10
failureThreshold: 10
successThreshold: 1
timeoutSeconds: 5
restartPolicy: Always
serviceAccountName: che-operator
terminationGracePeriodSeconds: 5