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.

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

ROX-24127: tenant resources via gitops #1803

Merged
merged 10 commits into from
May 15, 2024
Prev Previous commit
Next Next commit
ROX-24127: tenant resources via gitops
ludydoo committed May 10, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 5daef34f1d4a7ae5341646648c8e68fa5fca88cf
10 changes: 5 additions & 5 deletions dev/config/gitops-config.yaml
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ tenantResources:
default: |
labels:
app.kubernetes.io/managed-by: rhacs-fleetshard
app.kubernetes.io/instance: {{ .Name }}
rhacs.redhat.com/org-id: {{ .OrganizationID }}
rhacs.redhat.com/tenant: {{ .ID }}
rhacs.redhat.com/instance-type: {{ .InstanceType }}
app.kubernetes.io/instance: "{{ .Name }}"
rhacs.redhat.com/org-id: "{{ .OrganizationID }}"
rhacs.redhat.com/tenant: "{{ .ID }}"
rhacs.redhat.com/instance-type: "{{ .InstanceType }}"
annotations:
rhacs.redhat.com/org-name: {{ .OrganizationName }}
rhacs.redhat.com/org-name: "{{ .OrganizationName }}"
secureTenantNetwork: false
centralRdsCidrBlock: "10.1.0.0/16"
egressProxy:
24 changes: 12 additions & 12 deletions e2e/e2e_canary_upgrade_test.go
Original file line number Diff line number Diff line change
@@ -217,13 +217,13 @@ var _ = Describe("Fleetshard-sync Targeted Upgrade", Ordered, func() {
Expect(updateGitopsConfig(ctx, func(config gitops.Config) gitops.Config {
config.TenantResources.Default = `
labels:
app.kubernetes.io/managed-by: rhacs-fleetshard
app.kubernetes.io/instance: {{ .Name }}
rhacs.redhat.com/org-id: {{ .OrganizationID }}
rhacs.redhat.com/tenant: {{ .ID }}
rhacs.redhat.com/instance-type: {{ .InstanceType }}
app.kubernetes.io/managed-by: "rhacs-fleetshard"
app.kubernetes.io/instance: "{{ .Name }}"
rhacs.redhat.com/org-id: "{{ .OrganizationID }}"
rhacs.redhat.com/tenant: "{{ .ID }}"
rhacs.redhat.com/instance-type: "{{ .InstanceType }}"
annotations:
rhacs.redhat.com/org-name: {{ .OrganizationName }}
rhacs.redhat.com/org-name: "{{ .OrganizationName }}"
secureTenantNetwork: false
centralRdsCidrBlock: "10.1.0.0/16"
egressProxy:
@@ -585,13 +585,13 @@ metadata:
func defaultTenantResourceValues() string {
return `
labels:
app.kubernetes.io/managed-by: rhacs-fleetshard
app.kubernetes.io/instance: {{ .Name }}
rhacs.redhat.com/org-id: {{ .OrganizationID }}
rhacs.redhat.com/tenant: {{ .ID }}
rhacs.redhat.com/instance-type: {{ .InstanceType }}
app.kubernetes.io/managed-by: "rhacs-fleetshard"
app.kubernetes.io/instance: "{{ .Name }}"
rhacs.redhat.com/org-id: "{{ .OrganizationID }}"
rhacs.redhat.com/tenant: "{{ .ID }}"
rhacs.redhat.com/instance-type: "{{ .InstanceType }}"
annotations:
rhacs.redhat.com/org-name: {{ .OrganizationName }}
rhacs.redhat.com/org-name: "{{ .OrganizationName }}"
secureTenantNetwork: false
centralRdsCidrBlock: "10.1.0.0/16"
egressProxy: