Skip to content

Commit

Permalink
Merge branch 'vmware-tanzu:main' into fixGkeVersion
Browse files Browse the repository at this point in the history
  • Loading branch information
antgamdia authored Feb 9, 2024
2 parents e4a32b7 + 56d6155 commit 981587a
Show file tree
Hide file tree
Showing 14 changed files with 105 additions and 99 deletions.
8 changes: 4 additions & 4 deletions chart/kubeapps/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: redis
repository: oci://registry-1.docker.io/bitnamicharts
version: 18.9.0
version: 18.12.0
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 13.4.2
version: 13.4.4
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.14.1
digest: sha256:8e3bca1e89c1636d458f26344cfda867f26cabcecd3c31c4e38918fc7e442181
generated: "2024-01-27T19:39:01.29349326Z"
digest: sha256:ca023ab4f20b7a77e612af0ce3d62ba092f82f4007706b05ffe27fa432a0c677
generated: "2024-02-03T00:30:46.579772593Z"
18 changes: 9 additions & 9 deletions chart/kubeapps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ annotations:
licenses: Apache-2.0
images: |
- name: kubeapps-apis
image: docker.io/bitnami/kubeapps-apis:2.9.0-debian-11-r18
image: docker.io/bitnami/kubeapps-apis:2.9.0-debian-11-r20
- name: kubeapps-apprepository-controller
image: docker.io/bitnami/kubeapps-apprepository-controller:2.9.0-debian-11-r17
image: docker.io/bitnami/kubeapps-apprepository-controller:2.9.0-debian-11-r19
- name: kubeapps-asset-syncer
image: docker.io/bitnami/kubeapps-asset-syncer:2.9.0-debian-11-r18
image: docker.io/bitnami/kubeapps-asset-syncer:2.9.0-debian-11-r20
- name: kubeapps-oci-catalog
image: docker.io/bitnami/kubeapps-oci-catalog:2.9.0-debian-11-r9
image: docker.io/bitnami/kubeapps-oci-catalog:2.9.0-debian-11-r12
- name: kubeapps-pinniped-proxy
image: docker.io/bitnami/kubeapps-pinniped-proxy:2.9.0-debian-11-r13
image: docker.io/bitnami/kubeapps-pinniped-proxy:2.9.0-debian-11-r16
- name: kubeapps-dashboard
image: docker.io/bitnami/kubeapps-dashboard:2.9.0-debian-11-r21
image: docker.io/bitnami/kubeapps-dashboard:2.9.0-debian-11-r22
- name: nginx
image: docker.io/bitnami/nginx:1.25.3-debian-11-r5
image: docker.io/bitnami/nginx:1.25.3-debian-11-r7
- name: oauth2-proxy
image: docker.io/bitnami/oauth2-proxy:7.5.1-debian-11-r15
image: docker.io/bitnami/oauth2-proxy:7.5.1-debian-11-r17
apiVersion: v2
appVersion: DEVEL
dependencies:
Expand Down Expand Up @@ -52,4 +52,4 @@ maintainers:
name: kubeapps
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/kubeapps
version: 14.3.3-dev
version: 14.3.4-dev
2 changes: 1 addition & 1 deletion chart/kubeapps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1166,4 +1166,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
4 changes: 2 additions & 2 deletions chart/kubeapps/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ frontend:
image:
registry: docker.io
repository: bitnami/nginx
tag: 1.25.3-debian-11-r5
tag: 1.25.3-debian-11-r7
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down Expand Up @@ -1214,7 +1214,7 @@ authProxy:
image:
registry: docker.io
repository: bitnami/oauth2-proxy
tag: 7.5.1-debian-11-r15
tag: 7.5.1-debian-11-r17
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down
24 changes: 12 additions & 12 deletions cmd/oci-catalog/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cmd/oci-catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
clap = { version = "4.4", features = ["derive", "env"] }
clap = { version = "4.5", features = ["derive", "env"] }
env_logger = "0.11"
futures-core = "0.3"
log = "0.4"
Expand All @@ -25,7 +25,7 @@ tonic-health = "0.10"
url = "2.5"

[build-dependencies]
tonic-build = "0.10"
tonic-build = "0.11"

[dev-dependencies]
rstest = "0.18.2"
42 changes: 24 additions & 18 deletions cmd/pinniped-proxy/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/pinniped-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tokio = { version = "1", features = ["full"] }
tokio-native-tls = "0.3"
url = "2.5"
http = "0.2.11"
clap = { version = "4.4", features = ["derive", "env"] }
clap = { version = "4.5", features = ["derive", "env"] }

[features]
default = ["v1_27"]
Expand Down
12 changes: 6 additions & 6 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@cds/city": "^1.1.0",
"@cds/core": "^6.9.2",
"@cds/react": "^6.9.2",
"@clr/ui": "^16.3.1",
"@clr/ui": "^16.3.2",
"@connectrpc/connect": "^1.2.0",
"@connectrpc/connect-web": "^1.2.0",
"@paciolan/remote-component": "^2.13.0",
Expand All @@ -46,7 +46,7 @@
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"modern-normalize": "^2.0.0",
"monaco-editor": "^0.45.0",
"monaco-editor": "^0.46.0",
"prop-types": "^15.8.1",
"protobufjs": "^7.2.6",
"qs": "^6.11.2",
Expand All @@ -68,7 +68,7 @@
"remark-breaks": "^3.0.3",
"remark-gfm": "^3.0.1",
"rxjs": "^7.8.1",
"swagger-ui-react": "^5.11.2",
"swagger-ui-react": "^5.11.3",
"typesafe-actions": "^5.1.0",
"yaml": "^2.3.4"
},
Expand All @@ -80,7 +80,7 @@
"@craco/craco": "^7.1.0",
"@formatjs/cli": "^6.2.7",
"@reduxjs/toolkit": "^1.9.7",
"@testing-library/jest-dom": "^6.4.1",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^14.5.2",
"@types/enzyme": "^3.10.18",
Expand Down Expand Up @@ -113,7 +113,7 @@
"npm-run-all": "^4.1.5",
"postcss": "^8.4.33",
"postcss-scss": "^4.0.9",
"prettier": "^3.2.4",
"prettier": "^3.2.5",
"react-dom": "^17.0.2",
"react-scripts": "^5.0.1",
"react-test-renderer": "^17.0.2",
Expand All @@ -127,7 +127,7 @@
"stylelint-config-standard-scss": "^13.0.0",
"stylelint-scss": "^6.1.0",
"ts-jest": "^29.1.2",
"ts-proto": "^1.167.2",
"ts-proto": "^1.167.3",
"typescript": "^5.3.3"
},
"resolutions": {
Expand Down
Loading

0 comments on commit 981587a

Please sign in to comment.