Upgrade fluentbit-operator to fluent-operator #779
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
@wanjunlei pls help to review |
Collaborator
|
There have two questions：
|
wenchajun
force-pushed
the
upgrade
branch
3 times, most recently
from
253efcc to
43e7793
Compare
wanjunlei
requested changes
Jul 3, 2023
cmd/upgrade/upgrade.sh
Outdated
| echo "${name[i]}" | ||
| temp=$(echo ${name[i]} | sed 's/"//g') | ||
| echo "$temp" | ||
| kubectl delete $resource.logging.kubesphere.io $temp -n ${namespace} || error_exit "Cannot delete resource $reresource" |
Collaborator
There was a problem hiding this comment.
Here you need to ignore the error that the resource does not exist
cmd/upgrade/upgrade.sh
Outdated
| converting "outputs" "ClusterOutput" | ||
| converting "fluentbitconfigs" "ClusterFluentBitConfig" | ||
|
|
||
| fluentbit_list=$(kubectl get fluentbits.logging.kubesphere.io -A -o json) || error_exit "Cannot get resource fluentbit" |
Collaborator
There was a problem hiding this comment.
Pass the namespace as a parameter. When the namespace is not empty, it is a namespace-level resource, so you don’t have to deal with FluentBit CRD separately.
cmd/upgrade/Dockerfile
Outdated
| @@ -0,0 +1,11 @@ | |||
| FROM alpine:latest | |||
Collaborator
There was a problem hiding this comment.
There are many images of kubectl, such as bitnami/kubectl, kubesphere/kubectl, you don’t need to install kubectl and jq yourself.
wenchajun
force-pushed
the
upgrade
branch
2 times, most recently
from
ca0cf56 to
96cc49f
Compare
wanjunlei
previously approved these changes
Jul 4, 2023
Signed-off-by: dehaocheng <[email protected]>
benjaminhuo
reviewed
Jul 4, 2023
cmd/upgrade/upgrade.sh
Outdated
| @@ -0,0 +1,80 @@ | |||
| #!/bin/bash | |||
| namespace=kubesphere-logging-system | |||
| deployment="fluentbit-operator" | |||
Member
There was a problem hiding this comment.
Suggested change
| deployment="fluentbit-operator" | |
| fluentbit-operator="fluentbit-operator" |
Member
Author
There was a problem hiding this comment.
It has been modified, it is better not to have - in the shell name, I modified it to FluentbitOperator
benjaminhuo
reviewed
Jul 4, 2023
cmd/upgrade/upgrade.sh
Outdated
| converting "fluentbits" "FluentBit" | ||
|
|
||
| # Determine if Deployment exists | ||
| if kubectl get deployment -n $namespace $deployment >/dev/null 2>&1; then |
Member
There was a problem hiding this comment.
Suggested change
| if kubectl get deployment -n $namespace $deployment >/dev/null 2>&1; then | |
| if kubectl get deployment -n $namespace $fluentbit-operator >/dev/null 2>&1; then |
benjaminhuo
reviewed
Jul 4, 2023
cmd/upgrade/upgrade.sh
Outdated
| # Determine if Deployment exists | ||
| if kubectl get deployment -n $namespace $deployment >/dev/null 2>&1; then | ||
| # Delete Deployment if it exists | ||
| kubectl delete deployment -n $namespace $deployment |
Member
There was a problem hiding this comment.
Suggested change
| kubectl delete deployment -n $namespace $deployment | |
| kubectl delete deployment -n $namespace $fluentbit-operator |
benjaminhuo
reviewed
Jul 4, 2023
benjaminhuo
reviewed
Jul 4, 2023
benjaminhuo
reviewed
Jul 4, 2023
benjaminhuo
reviewed
Jul 4, 2023
cmd/upgrade/upgrade.sh
Outdated
| exit 1 | ||
| } | ||
|
|
||
| function converting(){ |
Member
There was a problem hiding this comment.
converting can be renamed to migrate
Change function name
benjaminhuo
approved these changes
Jul 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
During the process of upgrading the fluentbit-operator, this script helps the user to convert the original configuration to the new one and to uninstall the
fluentbit-operator.Which issue(s) this PR fixes:
Fixes #
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.: