Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CN-438] Use Agent asynchronous upload API #288

Merged
merged 1 commit into from Jul 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/v1alpha1/hazelcast_types.go
Expand Up @@ -80,7 +80,7 @@ type HazelcastSpec struct {

// B&R Agent configurations
// +optional
// +kubebuilder:default:={repository: "docker.io/hazelcast/platform-operator-agent", version: "0.1.4"}
// +kubebuilder:default:={repository: "docker.io/hazelcast/platform-operator-agent", version: "0.1.5"}
Agent *AgentConfiguration `json:"agent,omitempty"`

// Custom Classes to Download into Class Path
Expand Down Expand Up @@ -113,7 +113,7 @@ type AgentConfiguration struct {
Repository string `json:"repository,omitempty"`

// Version of Hazelcast Platform Operator Agent.
// +kubebuilder:default:="0.1.4"
// +kubebuilder:default:="0.1.5"
// +optional
Version string `json:"version,omitempty"`
}
Expand Down
5 changes: 2 additions & 3 deletions api/v1alpha1/hotbackup_types.go
Expand Up @@ -11,17 +11,16 @@ const (
HotBackupInProgress HotBackupState = "InProgress"
HotBackupFailure HotBackupState = "Failure"
HotBackupSuccess HotBackupState = "Success"
HotBackupWaiting HotBackupState = "Waiting"
)

func (s HotBackupState) IsFinished() bool {
return s == HotBackupFailure || s == HotBackupSuccess || s == HotBackupWaiting
return s == HotBackupFailure || s == HotBackupSuccess
}

// IsRunning returns true if the HotBackup is scheduled to run or is running but not yet finished.
// Returns false if the HotBackup is not yet scheduled to run or finished it execution including the failure state.
func (s HotBackupState) IsRunning() bool {
return !s.IsFinished() && s != ""
return s == HotBackupInProgress || s == HotBackupPending
}

// HotBackupStatus defines the observed state of HotBackup
Expand Down
4 changes: 2 additions & 2 deletions bundle.yaml
Expand Up @@ -52,15 +52,15 @@ spec:
agent:
default:
repository: docker.io/hazelcast/platform-operator-agent
version: 0.1.4
version: 0.1.5
description: B&R Agent configurations
properties:
repository:
default: docker.io/hazelcast/platform-operator-agent
description: Repository to pull Hazelcast Platform Operator Agent(https://github.com/hazelcast/platform-operator-agent)
type: string
version:
default: 0.1.4
default: 0.1.5
description: Version of Hazelcast Platform Operator Agent.
type: string
type: object
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/hazelcast.com_hazelcasts.yaml
Expand Up @@ -54,15 +54,15 @@ spec:
agent:
default:
repository: docker.io/hazelcast/platform-operator-agent
version: 0.1.4
version: 0.1.5
description: B&R Agent configurations
properties:
repository:
default: docker.io/hazelcast/platform-operator-agent
description: Repository to pull Hazelcast Platform Operator Agent(https://github.com/hazelcast/platform-operator-agent)
type: string
version:
default: 0.1.4
default: 0.1.5
description: Version of Hazelcast Platform Operator Agent.
type: string
type: object
Expand Down
4 changes: 2 additions & 2 deletions config/samples/_v1alpha1_hotbackup_agent.yaml
Expand Up @@ -4,11 +4,11 @@ metadata:
name: hot-backup
spec:
hazelcastResourceName: hazelcast
bucketURI: "s3://operator-backup"
bucketURI: "s3://operator-e2e-external-backup"
secret: "br-secret-s3"

# bucketURI: "gs://operator-agent-backup"
# secret: "br-secret-gcp"

# bucketURI: "azblob://backup"
# secret: "br-secret-az"
# secret: "br-secret-az"
96 changes: 0 additions & 96 deletions controllers/hazelcast/br_agent_rest_client.go

This file was deleted.