Skip to content

Commit

Permalink
Merge pull request #235 from qijianshuai/v0-3-2
Browse files Browse the repository at this point in the history
Modify the version number
  • Loading branch information
qijianshuai authored Apr 11, 2023
2 parents 69c7edb + 428aaa7 commit 35ee038
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ KUBECTLCMD=$(shell which kubectl)
SWAGGER := $(DOCKERCMD) run --rm -it -v $(HOME):$(HOME) -w $(shell pwd) quay.io/goswagger/swagger

REGISTRY ?= projects.registry.vmware.com/cnsi
IMG_TAG = 0.3.1
IMG_TAG = 0.3.2
# Image URL to use all building/pushing image targets
IMG_MANAGER ?= $(REGISTRY)/manager:$(IMG_TAG)
IMG_EXPORTER ?= $(REGISTRY)/exporter:$(IMG_TAG)
Expand Down
2 changes: 1 addition & 1 deletion cnsi-manager/config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ kind: Kustomization
images:
- name: controller
newName: projects.registry.vmware.com/cnsi/manager
newTag: 0.3.1
newTag: 0.3.2
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
serviceAccountName: cnsi-portal-serviceaccount
containers:
- name: cloud-native-security-inspector-frontend
image: projects.registry.vmware.com/cnsi/portal:0.3.1
image: projects.registry.vmware.com/cnsi/portal:0.3.2
imagePullPolicy: Always
ports:
- containerPort: 3800
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,13 @@ export class RiskReportViewComponent implements OnInit, AfterViewInit {
callback(data, this, query)
this.pageMaxCount = Math.ceil( data.hits.total.value / this.defaultSize)
},
err => {}
err => {
this.echartsLoading = false
this.dgLoading = false
}
)
} else {
this.echartsLoading = false
this.dgLoading = false
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ export class PolicySettingPageComponent implements OnInit {
imageList = [
{
name: 'inspector',
url: 'projects.registry.vmware.com/cnsi/dev/inspector:vac'
url: 'projects.registry.vmware.com/cnsi/inspector:0.3.2'
},
{
name: 'kubebench',
url: 'projects.registry.vmware.com/cnsi/kubebench:0.3.1'
url: 'projects.registry.vmware.com/cnsi/kubebench:0.3.2'
},
{
name: 'risk',
url: 'projects.registry.vmware.com/cnsi/risk:0.3.1'
url: 'projects.registry.vmware.com/cnsi/risk:0.3.2'
}

]
Expand Down Expand Up @@ -344,7 +344,7 @@ export class PolicySettingPageComponent implements OnInit {
this.policyForm.get('inspectionSetting')?.get('historyLimit')?.setValue(5)
this.policyForm.get('inspectionSetting')?.get('suspend')?.setValue(false)
this.policyForm.get('inspectionSetting')?.get('concurrencyRule')?.setValue('Forbid')
this.policyForm.get('inspectionSetting')?.get('image')?.setValue('projects.registry.vmware.com/cnsi/inspector:0.3.1')
this.policyForm.get('inspectionSetting')?.get('image')?.setValue('projects.registry.vmware.com/cnsi/inspector:0.3.2')
this.policyForm.get('inspectionSetting')?.get('imagePullPolicy')?.setValue('IfNotPresent')
this.policyForm.get('inspectionSetting')?.get('settingsName')?.setValue('')
this.policyForm.get('inspectionResult')?.get('actions')?.setValue(true)
Expand Down
4 changes: 2 additions & 2 deletions deployments/charts/cnsi/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ 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: 0.3.1
version: 0.3.2

# 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.
# It is recommended to use it with quotes.
appVersion: "0.3.1"
appVersion: "0.3.2"

dependencies:
- name: opensearch
Expand Down
2 changes: 1 addition & 1 deletion deployments/charts/cnsi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
image:
repository: "projects.registry.vmware.com/cnsi"
# override image tag, which is .Chart.AppVersion by default
tag: "0.3.1"
tag: "0.3.2"
pullPolicy: "IfNotPresent"

opensearch:
Expand Down
2 changes: 1 addition & 1 deletion deployments/yaml/data-exporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
control-plane: cnsi-exporter
spec:
containers:
- image: projects.registry.vmware.com/cnsi/exporter:0.3.1
- image: projects.registry.vmware.com/cnsi/exporter:0.3.2
imagePullPolicy: IfNotPresent
ports:
- containerPort: 6780
Expand Down

0 comments on commit 35ee038

Please sign in to comment.