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.

Sign up for GitHub

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

upgrade docker image versions and helm packages version of the services and plugin #1252

Merged
merged 3 commits into from
Jun 15, 2023
Merged

upgrade docker image versions and helm packages version of the services and plugin #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f1b1b4
upgrade docker image versions and helm packages version of the servic…
AngithCJ Jun 13, 2023
a295e3e
Merge pull request #50 from AngithCJ/sprint-74-odim-7550
amar-shalgar Jun 14, 2023
7b45152
Merge branch 'development' into odim-7550
jeevan-kamkar Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions build_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ eval_cmd_exec()
}

# base image for building ODIMRA services image
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.odim -t odim:5.0 ." "odim"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.odim -t odim:5.1 ." "odim"

# base image for building composition service Image
#eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.cs -t cs:1.0 ." "cs"
Expand All @@ -60,20 +60,20 @@ eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.zo

# ODIMRA services image
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.accountSession -t account-session:4.0 ." "account session"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.aggregation -t aggregation:5.0 ". "aggregation"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.api -t api:5.0 ." "api"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.events -t events:5.0 ." "events"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.fabrics -t fabrics:4.0 ." "fabrics"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.telemetry -t telemetry:3.0 ." "telemetry"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.managers -t managers:5.0 ." "managers"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.systems -t systems:5.0 ." "systems"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.task -t task:4.0 ." "task"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.update -t update:4.0 ." "update"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.aggregation -t aggregation:5.1 ". "aggregation"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.api -t api:6.0 ." "api"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.events -t events:6.0 ." "events"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.fabrics -t fabrics:4.1 ." "fabrics"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.licenses -t licenses:3.0 ." "licenses"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.managers -t managers:6.0 ." "managers"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.systems -t systems:6.0 ." "systems"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.task -t task:5.0 ." "task"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.telemetry -t telemetry:3.1 ." "telemetry"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.update -t update:5.0 ." "update"
#eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.compositionService -t composition-service:1.0 ." "composition service"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.licenses -t licenses:2.0 ." "licenses"

# ODIMRA plugins image
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.urplugin -t urplugin:3.2 ." "urplugin"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.grfplugin -t grfplugin:3.2 ." "grfplugin"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.dellplugin -t dellplugin:2.2 ." "dellplugin"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.urplugin -t urplugin:3.3 ." "urplugin"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.grfplugin -t grfplugin:4.0 ." "grfplugin"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.dellplugin -t dellplugin:3.0 ." "dellplugin"
eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.lenovoplugin -t lenovoplugin:1.2 ." "lenovoplugin"
20 changes: 10 additions & 10 deletions docker-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ declare ACTION
declare DIR_PATH
declare -A images_list=(\
["account-session"]="4.0" \
["aggregation"]="5.0" \
["api"]="5.0" \
["aggregation"]="5.1" \
["api"]="6.0" \
["etcd"]="1.16" \
["events"]="5.0" \
["fabrics"]="4.0" \
["events"]="6.0" \
["fabrics"]="4.1" \
["kafka"]="2.0" \
["managers"]="5.0" \
["managers"]="6.0" \
["redis"]="4.0" \
["systems"]="5.0" \
["task"]="4.0" \
["telemetry"]="3.0"\
["update"]="4.0" \
["systems"]="6.0" \
["task"]="5.0" \
["telemetry"]="3.1"\
["update"]="5.0" \
["zookeeper"]="2.0" \
["licenses"]="2.0" \
["licenses"]="3.0" \
)

eval_cmd_exec()
Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.accountSession
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/accountSession.sh .
RUN ./accountSession.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.aggregation
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/aggregation.sh .
RUN ./aggregation.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/api.sh .
RUN ./api.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.compositionService
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage


FROM cs:1.0 as build-stage-cs
Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.dellplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/dellplugin.sh .
RUN ./dellplugin.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.events
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/events.sh .
RUN ./events.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.fabrics
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/fabrics.sh .
RUN ./fabrics.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.grfplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/grfplugin.sh .
RUN ./grfplugin.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.lenovoplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/lenovoplugin.sh .
RUN ./lenovoplugin.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.licenses
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/licenses.sh .
RUN ./licenses.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.managers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/managers.sh .
RUN ./managers.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.systems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/systems.sh .
RUN ./systems.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.task
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/task.sh .
RUN ./task.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.telemetry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/telemetry.sh .
RUN ./telemetry.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/update.sh .
RUN ./update.sh

Expand Down
2 changes: 1 addition & 1 deletion install/Docker/dockerfiles/Dockerfile.urplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#License for the specific language governing permissions and limitations
# under the License.

FROM odim:5.0 as build-stage
FROM odim:5.1 as build-stage
COPY install/Docker/dockerfiles/build/urplugin.sh .
RUN ./urplugin.sh

Expand Down
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/aggregation/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 5.0.0
version: 5.1.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 5.0.0
appVersion: 5.1.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/aggregation/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ odimra:
namespace:
groupID:
haDeploymentEnabled:
aggregationImageTag: "5.0"
aggregationImageTag: "5.1"
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/api/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 5.0.0
version: 6.0.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 5.0.0
appVersion: 6.0.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ odimra:
groupID:
apiNodePort:
haDeploymentEnabled:
apiImageTag: "5.0"
apiImageTag: "6.0"
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/dellplugin/dellplugin/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 2.2.0
version: 3.0.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 2.2.0
appVersion: 3.0.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/dellplugin/dellplugin/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ odimra:
haDeploymentEnabled:
dellplugin:
eventListenerNodePort:
imageTag: "2.2"
imageTag: "3.0"
dellPluginRootServiceUUID:
username:
password:
Expand Down
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/events/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 5.0.0
version: 6.0.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 5.0.0
appVersion: 6.0.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/events/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ odimra:
namespace:
groupID:
haDeploymentEnabled:
eventImageTag: "5.0"
eventImageTag: "6.0"
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/fabrics/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 4.0.0
version: 4.1.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 4.0.0
appVersion: 4.1.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/fabrics/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ odimra:
namespace:
groupID:
haDeploymentEnabled:
fabricsImageTag: "4.0"
fabricsImageTag: "4.1"
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/grfplugin/grfplugin/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 3.2.0
version: 4.0.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 3.2.0
appVersion: 4.0.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/grfplugin/grfplugin/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ odimra:
haDeploymentEnabled:
grfplugin:
eventListenerNodePort:
imageTag: "3.2"
imageTag: "4.0"
logPath:
rootServiceUUID:
username:
Expand Down
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/licenses/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 2.0.0
version: 3.0.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 2.0.0
appVersion: 3.0.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/licenses/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ odimra:
namespace:
groupID:
haDeploymentEnabled:
licensesImageTag: "2.0"
licensesImageTag: "3.0"
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/managers/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 5.0.0
version: 6.0.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 5.0.0
appVersion: 6.0.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/managers/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ odimra:
namespace:
groupID:
haDeploymentEnabled:
managersImageTag: "5.0"
managersImageTag: "6.0"
4 changes: 2 additions & 2 deletions odim-controller/helmcharts/systems/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 5.0.0
version: 6.0.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 5.0.0
appVersion: 6.0.0
2 changes: 1 addition & 1 deletion odim-controller/helmcharts/systems/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ odimra:
namespace:
groupID:
haDeploymentEnabled:
systemsImageTag: "5.0"
systemsImageTag: "6.0"
Loading