Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
barry cho
Rancher
Commits
f5e26438
Commit
f5e26438
authored
3 years ago
by
Steven Crespo
Browse files
Options
Download
Email Patches
Plain Diff
Change KDM branches to dev
parent
bdd0a7a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile.dapper
+1
-1
Dockerfile.dapper
package/Dockerfile
+1
-1
package/Dockerfile
pkg/settings/setting.go
+1
-1
pkg/settings/setting.go
with
3 additions
and
3 deletions
+3
-3
Dockerfile.dapper
+
1
-
1
View file @
f5e26438
...
...
@@ -15,7 +15,7 @@ ENV HELM_VERSION v3.3.1
ENV KUSTOMIZE_VERSION v3.5.4
# kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go
ENV RANCHER_METADATA_BRANCH=
release-v2.5
ENV RANCHER_METADATA_BRANCH=
dev-v2.5-1021-patches
RUN apt-get update && \
apt-get install -y gcc ca-certificates git wget curl vim less file xz-utils unzip && \
...
...
This diff is collapsed.
Click to expand it.
package/Dockerfile
+
1
-
1
View file @
f5e26438
...
...
@@ -17,7 +17,7 @@ ARG SYSTEM_CHART_DEFAULT_BRANCH=release-v2.5
ARG
CHART_DEFAULT_BRANCH=release-v2.5
ARG
PARTNER_CHART_DEFAULT_BRANCH=main
# kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go
ARG
RANCHER_METADATA_BRANCH=
release-v2.5
ARG
RANCHER_METADATA_BRANCH=
dev-v2.5-1021-patches
ENV
CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH
ENV
CATTLE_CHART_DEFAULT_BRANCH=$CHART_DEFAULT_BRANCH
...
...
This diff is collapsed.
Click to expand it.
pkg/settings/setting.go
+
1
-
1
View file @
f5e26438
...
...
@@ -224,7 +224,7 @@ func GetEnvKey(key string) string {
func
getMetadataConfig
()
string
{
branch
:=
os
.
Getenv
(
"RANCHER_METADATA_BRANCH"
)
if
branch
==
""
{
branch
=
"
release-v2.5
"
branch
=
"
dev-v2.5-1021-patches
"
}
data
:=
map
[
string
]
interface
{}{
"url"
:
fmt
.
Sprintf
(
"https://releases.rancher.com/kontainer-driver-metadata/%s/data.json"
,
branch
),
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment