From 664beb4383bc8e6ef05899b9e07a90e504985103 Mon Sep 17 00:00:00 2001 From: Akshay Gaikwad Date: Thu, 9 Jun 2022 13:42:27 +0530 Subject: [PATCH] Replace rafay with paralus --- env.example | 6 +- internal/cluster/clusterproxy.go | 2 +- internal/cluster/fixtures/data/download.yaml | 78 ++++---- internal/fixtures/data/agent_templates.yaml | 52 +++--- .../fixtures/data/relay_agent_template.yaml | 6 +- internal/fixtures/data/relay_template.yaml | 80 ++++---- main.go | 4 +- .../000018_sentry_bootstrap_infra.up.sql | 4 +- ...019_sentry_bootstrap_agent_template.up.sql | 4 +- .../000020_sentry_bootstrap_agent.up.sql | 4 +- pkg/controller/apply/apply.go | 2 +- pkg/controller/apply/testdata/prometheus.yaml | 172 +++++++++--------- .../apply/testdata/rafay-system-ns.yaml | 106 +++++------ .../apply/testdata/service1-current.yaml | 6 +- .../apply/testdata/statefulset-patch.yaml | 12 +- .../apply/testdata/statefulset.yaml | 18 +- pkg/controller/runtime/testdata/etcd.yaml | 2 +- .../runtime/testdata/statefulset-patch.yaml | 8 +- .../runtime/testdata/statefulset.yaml | 14 +- pkg/controller/util/owner.go | 2 +- pkg/gateway/annotator.go | 4 +- pkg/gateway/gateway.go | 10 +- pkg/gateway/httpbody.go | 2 +- pkg/gateway/json.go | 18 +- pkg/gateway/yaml.go | 16 +- pkg/pool/pool.go | 5 +- pkg/sentry/authz/authz.go | 16 +- .../authz/data/cluster_role_cluster_read.yaml | 2 +- .../data/cluster_role_cluster_write.yaml | 2 +- .../authz/data/cluster_role_full_access.yaml | 2 +- .../data/cluster_role_namespace_read.yaml | 2 +- .../data/cluster_role_namespace_write.yaml | 2 +- pkg/sentry/authz/data/namespace.yaml | 2 +- pkg/sentry/authz/data/role_read_access.yaml | 2 +- pkg/sentry/authz/data/role_write_access.yaml | 4 +- pkg/sentry/cryptoutil/cert_test.go | 12 +- pkg/sentry/kubeconfig/cert_cn.go | 4 +- pkg/sentry/kubeconfig/kubeconfig.go | 10 +- pkg/sentry/peering/peering.go | 8 +- pkg/service/cluster_test.go | 10 +- proto/types/commonpb/v3/common.pb.go | 2 +- proto/types/commonpb/v3/common.proto | 2 +- proto/types/controller/const.go | 2 +- proto/types/sentry/constants.go | 2 +- server/bootstrap.go | 2 +- server/cluster.go | 2 +- server/kubectl_cluster_settings.go | 6 +- 47 files changed, 367 insertions(+), 366 deletions(-) diff --git a/env.example b/env.example index a7d8c90..6e9b03a 100644 --- a/env.example +++ b/env.example @@ -16,8 +16,8 @@ SENTRY_PEERING_HOST='peering.sentry.paralus.local:10001' CORE_RELAY_CONNECTOR_HOST='*.core-connector.relay.paralus.local:10002' CORE_RELAY_USER_HOST='*.user.relay.paralus.local:10002' SENTRY_BOOTSTRAP_ADDR='console.paralus.dev:80' -BOOTSTRAP_KEK='rafay' -RELAY_IMAGE='registry.rafay-edge.net/rafay/rafay-relay-agent:r1.10.0-24' +BOOTSTRAP_KEK='paralus' +RELAY_IMAGE='paralus/paralus-relay-agent:r1.10.0-24' # audit ES_END_POINT='http://127.0.0.1:9200' @@ -29,7 +29,7 @@ RELAY_COMMANDS_ES_INDEX_PREFIX='auditlog-commands' CORE_CD_RELAY_USER_HOST='*.user.cdrelay.paralus.local:10012' CORE_CD_RELAY_CONNECTOR_HOST='*.core-connector.cdrelay.paralus.local:10012' -SCHEDULER_NAMESPACE='rafay-system' +SCHEDULER_NAMESPACE='paralus-system' # Kratos KRATOS_ADDR='http://localhost:4433' diff --git a/internal/cluster/clusterproxy.go b/internal/cluster/clusterproxy.go index a96fff4..13a7df7 100644 --- a/internal/cluster/clusterproxy.go +++ b/internal/cluster/clusterproxy.go @@ -11,7 +11,7 @@ import ( const ( BEGIN_PROXY_DATA = "-----BEGIN PROXY DATA-----" END_PROXY_DATA = "-----END PROXY DATA-----" - NO_PROXY_PARALUS_DATA = "localhost,127.0.0.1,127.0.0.2,k8master.service.consul,ingress-nginx-controller-admission.rafay-system.svc,rafay-drift.rafay-system.svc,secretstore-webhook.rafay-system.svc" + NO_PROXY_PARALUS_DATA = "localhost,127.0.0.1,127.0.0.2,k8master.service.consul,ingress-nginx-controller-admission.paralus-system.svc,paralus-drift.paralus-system.svc,secretstore-webhook.paralus-system.svc" ) func UpdateProxyData(cert string, proxyConfig infrav3.ProxyConfig, clusterCidr map[string]string) string { diff --git a/internal/cluster/fixtures/data/download.yaml b/internal/cluster/fixtures/data/download.yaml index 0d4b6db..09c580e 100644 --- a/internal/cluster/fixtures/data/download.yaml +++ b/internal/cluster/fixtures/data/download.yaml @@ -4,19 +4,19 @@ kind: Namespace metadata: labels: control-plane: controller-manager - name: rafay-system + name: paralus-system --- apiVersion: v1 kind: ServiceAccount metadata: name: system-sa - namespace: rafay-system + namespace: paralus-system --- {{- if and .Cluster.Metadata.Labels (eq (index .Cluster.Metadata.Labels "paralus.dev/kubernetesProvider") "OPENSHIFT") }} apiVersion: security.openshift.io/v1 kind: SecurityContextConstraints metadata: - name: rafay-privileged-scc + name: paralus-privileged-scc annotations: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" @@ -27,7 +27,7 @@ metadata: only for cluster administration. Grant with caution.' release.openshift.io/create-only: "true" labels: - rep-workload: "rafay-privileged-scc" + rep-workload: "paralus-privileged-scc" allowHostDirVolumePlugin: true allowHostIPC: true allowHostNetwork: true @@ -58,12 +58,12 @@ seccompProfiles: supplementalGroups: type: RunAsAny users: -- system:serviceaccount:rafay-system:default -- system:serviceaccount:rafay-system:system-sa -- system:serviceaccount:rafay-system:ingress-nginx -- system:serviceaccount:rafay-system:ingress-nginx-admission -- system:serviceaccount:rafay-system:gatekeeper-admin -- system:serviceaccount:rafay-system:gatekeeper-update-namespace-label +- system:serviceaccount:paralus-system:default +- system:serviceaccount:paralus-system:system-sa +- system:serviceaccount:paralus-system:ingress-nginx +- system:serviceaccount:paralus-system:ingress-nginx-admission +- system:serviceaccount:paralus-system:gatekeeper-admin +- system:serviceaccount:paralus-system:gatekeeper-update-namespace-label volumes: - '*' --- @@ -71,7 +71,7 @@ volumes: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: rafay:manager + name: paralus:manager rules: - apiGroups: - '*' @@ -147,23 +147,23 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: rafay:rafay-system:manager-rolebinding + name: paralus:paralus-system:manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: rafay:manager + name: paralus:manager subjects: - kind: ServiceAccount name: system-sa - namespace: rafay-system + namespace: paralus-system - kind: ServiceAccount name: default - namespace: rafay-system + namespace: paralus-system --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: rafay:proxy-role + name: paralus:proxy-role rules: - apiGroups: - authentication.k8s.io @@ -181,32 +181,32 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: rafay:rafay-system:proxy-rolebinding - namespace: rafay-system + name: paralus:paralus-system:proxy-rolebinding + namespace: paralus-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: rafay:proxy-role + name: paralus:proxy-role subjects: - kind: ServiceAccount name: system-sa - namespace: rafay-system + namespace: paralus-system - kind: ServiceAccount name: default - namespace: rafay-system + namespace: paralus-system --- apiVersion: scheduling.k8s.io/v1 -description: This priority class should be used for rafay service pods only. +description: This priority class should be used for paralus service pods only. kind: PriorityClass metadata: - name: rafay-cluster-critical + name: paralus-cluster-critical value: 1000000000 --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: rafay:leader-election-role - namespace: rafay-system + name: paralus:leader-election-role + namespace: paralus-system rules: - apiGroups: - "" @@ -238,30 +238,30 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: rafay:leader-election-rolebinding - namespace: rafay-system + name: paralus:leader-election-rolebinding + namespace: paralus-system roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: rafay:leader-election-role + name: paralus:leader-election-role subjects: - kind: ServiceAccount name: system-sa - namespace: rafay-system + namespace: paralus-system - kind: ServiceAccount name: default - namespace: rafay-system + namespace: paralus-system --- apiVersion: v1 kind: ConfigMap metadata: name: proxy-config - namespace: rafay-system + namespace: paralus-system labels: app.kubernetes.io/managed-by: Helm annotations: meta.helm.sh/release-name: v2-infra - meta.helm.sh/release-namespace: rafay-system + meta.helm.sh/release-namespace: paralus-system data: httpProxy: "{{if .Cluster.Spec.ProxyConfig}}{{ if .Cluster.Spec.ProxyConfig.Enabled }}{{- .Cluster.Spec.ProxyConfig.HttpProxy -}}{{end}}{{end}}" httpsProxy: "{{if .Cluster.Spec.ProxyConfig}}{{ if .Cluster.Spec.ProxyConfig.Enabled }}{{- .Cluster.Spec.ProxyConfig.HttpsProxy -}}{{end}}{{end}}" @@ -274,12 +274,12 @@ apiVersion: v1 kind: ConfigMap metadata: name: relay-agent-config - namespace: rafay-system + namespace: paralus-system labels: app.kubernetes.io/managed-by: Helm annotations: meta.helm.sh/release-name: v2-infra - meta.helm.sh/release-namespace: rafay-system + meta.helm.sh/release-namespace: paralus-system data: clusterID: {{if .Cluster.Metadata.Labels}}{{ index .Cluster.Metadata.Labels "paralus.dev/clusterID" }}{{end}} relays: '{{if .Cluster.Metadata.Annotations}}{{- index .Cluster.Metadata.Annotations "relays" -}}{{end}}' @@ -288,12 +288,12 @@ apiVersion: apps/v1 kind: Deployment metadata: name: relay-agent - namespace: rafay-system + namespace: paralus-system labels: app.kubernetes.io/managed-by: Helm annotations: meta.helm.sh/release-name: v2-infra - meta.helm.sh/release-namespace: rafay-system + meta.helm.sh/release-namespace: paralus-system spec: selector: matchLabels: @@ -319,11 +319,11 @@ spec: values: - amd64 terminationGracePeriodSeconds: 10 - priorityClassName: rafay-cluster-critical + priorityClassName: paralus-cluster-critical serviceAccountName: system-sa initContainers: - name: set-limits - image: "registry.rafay-edge.net/rafay/busybox:1.33" + image: "registry.paralus-edge.net/paralus/busybox:1.33" command: ["sh", "-c", "ulimit -n 65536"] securityContext: privileged: true @@ -401,4 +401,4 @@ spec: volumes: - name: relay-agent-config configMap: - name: relay-agent-config \ No newline at end of file + name: relay-agent-config diff --git a/internal/fixtures/data/agent_templates.yaml b/internal/fixtures/data/agent_templates.yaml index 076afdf..5480ad3 100644 --- a/internal/fixtures/data/agent_templates.yaml +++ b/internal/fixtures/data/agent_templates.yaml @@ -1,9 +1,9 @@ items: - metadata: - name: rafay-sentry-peering-server + name: paralus-sentry-peering-server displayName: "Paralus Sentry Peering Server" spec: - infraRef: rafay-sentry-peering + infraRef: paralus-sentry-peering autoRegister: true autoApprove: true ignoreMultipleRegister: true @@ -11,18 +11,18 @@ items: hosts: - host: "{{ .sentryPeeringHost }}" type: "HostTypeExternal" - - host: "rafay-sentry:7001" + - host: "paralus-sentry:7001" type: "HostTypeInternal" - - host: "rafay-sentry.rafay-system:7001 " + - host: "paralus-sentry.paralus-system:7001 " type: "HostTypeInternal" - - host: "rafay-sentry.rafay-system.svc.cluster.local:7001" + - host: "paralus-sentry.paralus-system.svc.cluster.local:7001" type: "HostTypeInternal" inClusterTemplate: "" outOfClusterTemplate: "" - metadata: - name: rafay-sentry-peering-client + name: paralus-sentry-peering-client spec: - infraRef: rafay-sentry-peering + infraRef: paralus-sentry-peering autoRegister: true autoApprove: true ignoreMultipleRegister: true @@ -30,12 +30,12 @@ items: inClusterTemplate: "" outOfClusterTemplate: "" - metadata: - name: rafay-core-relay-server + name: paralus-core-relay-server displayName: "Paralus Core Relay Server" labels: paralus.dev/connectorTemplate: "true" spec: - infraRef: rafay-core-relay + infraRef: paralus-core-relay autoRegister: true autoApprove: true ignoreMultipleRegister: true @@ -46,11 +46,11 @@ items: inClusterTemplate: "" outOfClusterTemplate: "" - metadata: - name: rafay-core-relay-agent + name: paralus-core-relay-agent labels: paralus.dev/defaultRelay: "true" spec: - infraRef: rafay-core-relay + infraRef: paralus-core-relay autoRegister: false autoApprove: true ignoreMultipleRegister: true @@ -61,14 +61,14 @@ items: inClusterTemplate: "" outOfClusterTemplate: "" - metadata: - name: rafay-core-relay-user + name: paralus-core-relay-user displayName: "Paralus Core User Server" labels: paralus.dev/defaultUser: "true" paralus.dev/userTemplate: "true" - paralus.dev/connectorAgentTemplate: "rafay-core-relay-agent" + paralus.dev/connectorAgentTemplate: "paralus-core-relay-agent" spec: - infraRef: rafay-core-relay-user + infraRef: paralus-core-relay-user autoRegister: true autoApprove: true ignoreMultipleRegister: true @@ -79,12 +79,12 @@ items: inClusterTemplate: "" outOfClusterTemplate: "" - metadata: - name: rafay-core-cd-relay-user + name: paralus-core-cd-relay-user displayName: "Paralus Core CD Relay User" labels: paralus.dev/defaultCDUser: "true" spec: - infraRef: rafay-core-cd-relay-user + infraRef: paralus-core-cd-relay-user autoRegister: true autoApprove: true ignoreMultipleRegister: true @@ -92,19 +92,19 @@ items: hosts: - host: "{{ .coreCDRelayUserHost }}" type: "HostTypeExternal" - - host: "rafay-cd-agent:7000" + - host: "paralus-cd-agent:7000" type: "HostTypeInternal" - - host: "rafay-cd-agent.rafay-system:7000 " + - host: "paralus-cd-agent.paralus-system:7000 " type: "HostTypeInternal" - - host: "rafay-cd-agent.rafay-system.svc.cluster.local:7000" + - host: "paralus-cd-agent.paralus-system.svc.cluster.local:7000" type: "HostTypeInternal" inClusterTemplate: "" outOfClusterTemplate: "" - metadata: - name: rafay-core-cd-relay-server + name: paralus-core-cd-relay-server displayName: "Paralus Core CD Relay Server" spec: - infraRef: rafay-core-cd-relay + infraRef: paralus-core-cd-relay autoRegister: true autoApprove: true ignoreMultipleRegister: true @@ -115,12 +115,12 @@ items: inClusterTemplate: "" outOfClusterTemplate: "" - metadata: - name: rafay-core-cd-relay-agent + name: paralus-core-cd-relay-agent displayName: "Paralus Core CD Relay Agent" labels: paralus.dev/defaultCDRelay: "true" spec: - infraRef: rafay-core-cd-relay + infraRef: paralus-core-cd-relay autoRegister: false autoApprove: true ignoreMultipleRegister: true @@ -131,12 +131,12 @@ items: inClusterTemplate: "" outOfClusterTemplate: "" - metadata: - name: rafay-sentry-cd-peering-client + name: paralus-sentry-cd-peering-client spec: - infraRef: rafay-sentry-peering + infraRef: paralus-sentry-peering autoRegister: true autoApprove: true ignoreMultipleRegister: true templateType: "Client" inClusterTemplate: "" - outOfClusterTemplate: "" \ No newline at end of file + outOfClusterTemplate: "" diff --git a/internal/fixtures/data/relay_agent_template.yaml b/internal/fixtures/data/relay_agent_template.yaml index 9a177f2..81b0ca3 100644 --- a/internal/fixtures/data/relay_agent_template.yaml +++ b/internal/fixtures/data/relay_agent_template.yaml @@ -5,7 +5,7 @@ metadata: rep-addon: v2-relay-agent rep-cluster: "{{ .DownloadData.ClusterID }}" name: "kube-proxy-agent-{{ .DownloadData.ClusterID }}" - namespace: rafay-system + namespace: paralus-system spec: progressDeadlineSeconds: 1800 replicas: 1 @@ -98,7 +98,7 @@ spec: privileged: true terminationMessagePath: /dev/termination-log terminationMessagePolicy: File - priorityClassName: rafay-cluster-critical + priorityClassName: paralus-cluster-critical restartPolicy: Always schedulerName: default-scheduler securityContext: {} @@ -121,4 +121,4 @@ metadata: rep-addon: v2-relay-agent rep-cluster: "{{ .DownloadData.ClusterID }}" name: "kube-proxy-agent-config-{{ .DownloadData.ClusterID }}" - namespace: rafay-system \ No newline at end of file + namespace: paralus-system diff --git a/internal/fixtures/data/relay_template.yaml b/internal/fixtures/data/relay_template.yaml index 01df948..41bfdb8 100644 --- a/internal/fixtures/data/relay_template.yaml +++ b/internal/fixtures/data/relay_template.yaml @@ -4,15 +4,15 @@ kind: Namespace metadata: labels: control-plane: controller-manager - name: rafay-system + name: paralus-system --- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: rafay-kube-proxy-audit - namespace: rafay-system + name: paralus-kube-proxy-audit + namespace: paralus-system spec: accessModes: - ReadWriteOnce @@ -26,19 +26,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: rafay-kube-proxy - name: rafay-kube-proxy - namespace: rafay-system + app: paralus-kube-proxy + name: paralus-kube-proxy + namespace: paralus-system spec: replicas: 1 progressDeadlineSeconds: 1800 selector: matchLabels: - app: rafay-kube-proxy + app: paralus-kube-proxy template: metadata: labels: - app: rafay-kube-proxy + app: paralus-kube-proxy spec: containers: - args: @@ -59,60 +59,60 @@ spec: valueFrom: configMapKeyRef: key: sentry.peering.host - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: SENTRY_ADDR valueFrom: configMapKeyRef: key: sentry.addr - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: BOOTSTRAP_ADDR valueFrom: configMapKeyRef: key: sentry.addr - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: RELAY_PEERING_TOKEN valueFrom: configMapKeyRef: key: peer.token - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: RELAY_USER_TOKEN valueFrom: configMapKeyRef: key: user.token - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: RELAY_USER_HOST_PORT valueFrom: configMapKeyRef: key: user.host.port - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: RELAY_CONNECTOR_TOKEN valueFrom: configMapKeyRef: key: connector.token - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: RELAY_CONNECTOR_HOST_PORT valueFrom: configMapKeyRef: key: connector.host.port - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: RELAY_NETWORK_ID valueFrom: configMapKeyRef: key: relaynetwork.id - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: AUDIT_PATH valueFrom: configMapKeyRef: key: audit.path - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config image: "{{ .DownloadData.RelayImage }}" imagePullPolicy: IfNotPresent - name: rafay-kube-proxy + name: paralus-kube-proxy terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - - mountPath: /opt/rafay/audit + - mountPath: /opt/paralus/audit name: audit dnsPolicy: ClusterFirst restartPolicy: Always @@ -120,16 +120,16 @@ spec: volumes: - name: audit persistentVolumeClaim: - claimName: rafay-kube-proxy-audit + claimName: paralus-kube-proxy-audit --- apiVersion: v1 kind: ConfigMap metadata: - name: rafay-kube-proxy-config - namespace: rafay-system + name: paralus-kube-proxy-config + namespace: paralus-system data: - audit.path: "/opt/rafay/audit" + audit.path: "/opt/paralus/audit" sentry.addr: "{{ .DownloadData.SentryAddr }}" sentry.peering.host: "{{ .DownloadData.PeerHost }}" peer.token: "{{ .DownloadData.PeerToken }}" @@ -143,8 +143,8 @@ data: apiVersion: v1 kind: Service metadata: - name: rafay-kube-proxy - namespace: rafay-system + name: paralus-kube-proxy + namespace: paralus-system spec: ports: - name: tcp-relay @@ -156,7 +156,7 @@ spec: protocol: TCP targetPort: 8003 selector: - app: rafay-kube-proxy + app: paralus-kube-proxy --- apiVersion: apps/v1 @@ -164,19 +164,19 @@ kind: Deployment metadata: annotations: labels: - app: rafay-kube-proxy-tail - name: rafay-kube-proxy-tail - namespace: rafay-system + app: paralus-kube-proxy-tail + name: paralus-kube-proxy-tail + namespace: paralus-system spec: progressDeadlineSeconds: 600 replicas: 1 selector: matchLabels: - app: rafay-kube-proxy-tail + app: paralus-kube-proxy-tail template: metadata: labels: - app: rafay-kube-proxy-tail + app: paralus-kube-proxy-tail spec: containers: - args: @@ -196,36 +196,36 @@ spec: valueFrom: configMapKeyRef: key: sentry.peering.host - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: SENTRY_ADDR valueFrom: configMapKeyRef: key: sentry.addr - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: BOOTSTRAP_ADDR valueFrom: configMapKeyRef: key: sentry.addr - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: RELAY_PEERING_TOKEN valueFrom: configMapKeyRef: key: peer.token - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config - name: AUDIT_PATH valueFrom: configMapKeyRef: key: audit.path - name: rafay-kube-proxy-config + name: paralus-kube-proxy-config image: "{{ .DownloadData.RelayImage }}" imagePullPolicy: IfNotPresent - name: rafay-kube-proxy-tail + name: paralus-kube-proxy-tail terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - - mountPath: /opt/rafay/audit + - mountPath: /opt/paralus/audit name: audit volumes: - name: audit persistentVolumeClaim: - claimName: rafay-kube-proxy-audit + claimName: paralus-kube-proxy-audit diff --git a/main.go b/main.go index be3a6f1..4602385 100644 --- a/main.go +++ b/main.go @@ -188,8 +188,8 @@ func setup() { viper.SetDefault(coreRelayConnectorHostEnv, "*.core-connector.relay.paralus.local:10002") viper.SetDefault(coreRelayUserHostEnv, "*.user.relay.paralus.local:10002") viper.SetDefault(sentryBootstrapEnv, "console.paralus.dev:443") - viper.SetDefault(bootstrapKEKEnv, "rafay") - viper.SetDefault(relayImageEnv, "registry.rafay-edge.net/rafay/rafay-relay-agent:r1.10.0-24") + viper.SetDefault(bootstrapKEKEnv, "paralus") + viper.SetDefault(relayImageEnv, "paralus/paralus-relay-agent:r1.10.0-24") // audit viper.SetDefault(esEndPointEnv, "http://127.0.0.1:9200") diff --git a/persistence/migrations/admindb/000018_sentry_bootstrap_infra.up.sql b/persistence/migrations/admindb/000018_sentry_bootstrap_infra.up.sql index 98bc4af..1f55818 100644 --- a/persistence/migrations/admindb/000018_sentry_bootstrap_infra.up.sql +++ b/persistence/migrations/admindb/000018_sentry_bootstrap_infra.up.sql @@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS sentry_bootstrap_infra ( organization_id uuid, partner_id uuid, project_id uuid, - -- rafay meta fields + -- paralus meta fields display_name character varying(256) NOT NULL, created_at timestamp WITH time zone NOT NULL, modified_at timestamp WITH time zone, @@ -22,4 +22,4 @@ ALTER TABLE sentry_bootstrap_infra OWNER TO admindbuser; ALTER TABLE ONLY sentry_bootstrap_infra ADD CONSTRAINT sentry_bootstrap_infra_pkey PRIMARY KEY (name); ALTER TABLE ONLY sentry_bootstrap_infra - ADD CONSTRAINT sentry_bootstrap_infra_name_partner_id_organization_id_proj_key UNIQUE (name, partner_id, organization_id, project_id); \ No newline at end of file + ADD CONSTRAINT sentry_bootstrap_infra_name_partner_id_organization_id_proj_key UNIQUE (name, partner_id, organization_id, project_id); diff --git a/persistence/migrations/admindb/000019_sentry_bootstrap_agent_template.up.sql b/persistence/migrations/admindb/000019_sentry_bootstrap_agent_template.up.sql index e3834e1..e82a1d9 100644 --- a/persistence/migrations/admindb/000019_sentry_bootstrap_agent_template.up.sql +++ b/persistence/migrations/admindb/000019_sentry_bootstrap_agent_template.up.sql @@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS sentry_bootstrap_agent_template ( partner_id uuid, project_id uuid, infra_ref character varying(256) NOT NULL, - -- rafay meta fields + -- paralus meta fields display_name character varying(256) NOT NULL, created_at timestamp WITH time zone NOT NULL, modified_at timestamp WITH time zone, @@ -36,4 +36,4 @@ ALTER TABLE ONLY sentry_bootstrap_agent_template ALTER TABLE ONLY sentry_bootstrap_agent_template ADD CONSTRAINT sentry_bootstrap_agent_template_infra_ref_fkey FOREIGN KEY (infra_ref) - REFERENCES sentry_bootstrap_infra(name); \ No newline at end of file + REFERENCES sentry_bootstrap_infra(name); diff --git a/persistence/migrations/admindb/000020_sentry_bootstrap_agent.up.sql b/persistence/migrations/admindb/000020_sentry_bootstrap_agent.up.sql index 68c6952..df998de 100644 --- a/persistence/migrations/admindb/000020_sentry_bootstrap_agent.up.sql +++ b/persistence/migrations/admindb/000020_sentry_bootstrap_agent.up.sql @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS sentry_bootstrap_agent ( project_id uuid, template_ref character varying(256) NOT NULL, agent_mode character varying(512) NOT NULL, - -- rafay meta fields + -- paralus meta fields display_name character varying(256) NOT NULL, created_at timestamp WITH time zone NOT NULL, modified_at timestamp WITH time zone, @@ -35,4 +35,4 @@ ALTER TABLE ONLY sentry_bootstrap_agent ALTER TABLE ONLY sentry_bootstrap_agent ADD CONSTRAINT sentry_bootstrap_agent_template_ref_fkey FOREIGN KEY (template_ref) - REFERENCES sentry_bootstrap_agent_template(name); \ No newline at end of file + REFERENCES sentry_bootstrap_agent_template(name); diff --git a/pkg/controller/apply/apply.go b/pkg/controller/apply/apply.go index 5c14b56..dad1417 100644 --- a/pkg/controller/apply/apply.go +++ b/pkg/controller/apply/apply.go @@ -72,7 +72,7 @@ func WithUseUpdate(o runtime.Object) Option { } // WithForceUseUpdate sets if update should be used instead of patch for apply -// operation, irrespective of whether the object is of rafay domain or not +// operation, irrespective of whether the object is of paralus domain or not func WithForceUseUpdate() Option { return func(opts *Options) { opts.UseUpdate = true diff --git a/pkg/controller/apply/testdata/prometheus.yaml b/pkg/controller/apply/testdata/prometheus.yaml index d94d5a7..fba0c09 100644 --- a/pkg/controller/apply/testdata/prometheus.yaml +++ b/pkg/controller/apply/testdata/prometheus.yaml @@ -6177,7 +6177,7 @@ spec: kind: ServiceAccount metadata: name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-k8s-clusterrole object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6208,14 +6208,14 @@ spec: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-k8s-roleconfig object: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: prometheus-k8s-config - namespace: rafay-infra + namespace: paralus-infra rules: - apiGroups: - "" @@ -6261,13 +6261,13 @@ spec: - get - list - watch - - name: prometheus-k8s-role-rafay-infra + - name: prometheus-k8s-role-paralus-infra object: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra rules: - apiGroups: - "" @@ -6286,7 +6286,7 @@ spec: kind: RoleBinding metadata: name: prometheus-k8s-config - namespace: rafay-infra + namespace: paralus-infra roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -6294,7 +6294,7 @@ spec: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-k8s-rolebinding-default object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6309,7 +6309,7 @@ spec: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-k8s-rolebinding-kube-system object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6324,14 +6324,14 @@ spec: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: rafay-infra - - name: prometheus-k8s-rolebinding-rafay-infra + namespace: paralus-infra + - name: prometheus-k8s-rolebinding-paralus-infra object: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -6339,14 +6339,14 @@ spec: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-operator-serviceaccount object: apiVersion: v1 kind: ServiceAccount metadata: name: prometheus-operator - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-operator-clusterrole object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6428,7 +6428,7 @@ spec: subjects: - kind: ServiceAccount name: prometheus-operator - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-operator-servicemonitor object: apiVersion: monitoring.coreos.com/v1 @@ -6437,7 +6437,7 @@ spec: labels: k8s-app: prometheus-operator name: prometheus-operator - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - honorLabels: true @@ -6451,7 +6451,7 @@ spec: kind: ServiceAccount metadata: name: alertmanager-main - namespace: rafay-infra + namespace: paralus-infra - name: alertmanager-main-secret object: apiVersion: v1 @@ -6462,7 +6462,7 @@ spec: annotations: paralus.dev/overridedBy: cluster/default-override-eks-london-1118 name: alertmanager-main - namespace: rafay-infra + namespace: paralus-infra type: Opaque - name: kube-state-metrics-service-account object: @@ -6470,7 +6470,7 @@ spec: kind: ServiceAccount metadata: name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra - name: kube-state-metrics-cluster-role object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6555,14 +6555,14 @@ spec: subjects: - kind: ServiceAccount name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra - name: kube-state-metrics-role object: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra rules: - apiGroups: - "" @@ -6594,7 +6594,7 @@ spec: kind: RoleBinding metadata: name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -6602,14 +6602,14 @@ spec: subjects: - kind: ServiceAccount name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra - name: node-exporter-serviceaccount object: apiVersion: v1 kind: ServiceAccount metadata: name: node-exporter - namespace: rafay-infra + namespace: paralus-infra - name: node-exporter-cluster-role object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6642,14 +6642,14 @@ spec: subjects: - kind: ServiceAccount name: node-exporter - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-adapter-service-account object: apiVersion: v1 kind: ServiceAccount metadata: name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-adapter-cluster-role object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6674,7 +6674,7 @@ spec: kind: ClusterRoleBinding metadata: name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -6682,7 +6682,7 @@ spec: subjects: - kind: ServiceAccount name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-adapter-cluster-role-binding-delegator object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6696,7 +6696,7 @@ spec: subjects: - kind: ServiceAccount name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-adapter-cluster-role-server-resources object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6744,7 +6744,7 @@ spec: kind: ConfigMap metadata: name: adapter-config - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-adapter-role-binding-auth-reader object: apiVersion: rbac.authorization.k8s.io/v1 @@ -6759,7 +6759,7 @@ spec: subjects: - kind: ServiceAccount name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra - name: prometheus-k8s-edge-creds-configmap object: apiVersion: v1 @@ -6772,7 +6772,7 @@ spec: annotations: paralus.dev/overridedBy: cluster/default-override-eks-london-1118 name: edge-creds - namespace: rafay-infra + namespace: paralus-infra type: Opaque tasklet: metadata: @@ -6780,7 +6780,7 @@ spec: finalizers: - cluster.paralus.dev.v2.predelete name: v1-prometheus - namespace: rafay-infra + namespace: paralus-infra spec: init: - name: prometheus-k8s-prometheus @@ -6793,22 +6793,22 @@ spec: labels: prometheus: k8s name: k8s - namespace: rafay-infra + namespace: paralus-infra spec: alerting: alertmanagers: - name: alertmanager-main - namespace: rafay-infra + namespace: paralus-infra port: web baseImage: quay.io/prometheus/prometheus evaluationInterval: 1m externalLabels: deployment_env: staging - rc_edgeid: g29loe2.private.pkvwv2n.edge.stage.rafay-edge.net - externalUrl: https://prometheusrelay.ops.stage.rafay-edge.net + rc_edgeid: g29loe2.private.pkvwv2n.edge.stage.paralus-edge.net + externalUrl: https://prometheusrelay.ops.stage.paralus-edge.net nodeSelector: beta.kubernetes.io/os: linux - priorityClassName: rafay-cluster-critical + priorityClassName: paralus-cluster-critical remoteWrite: - queueConfig: batchSendDeadline: 10s @@ -6824,8 +6824,8 @@ spec: caFile: /etc/prometheus/secrets/edge-creds/ca.crt certFile: /etc/prometheus/secrets/edge-creds/client.crt keyFile: /etc/prometheus/secrets/edge-creds/client.key - serverName: influxdb01.core.stage.rafay-edge.net - url: https://influxdb01.core.stage.rafay-edge.net/api/v1/prom/write?db=monitoringdb&rp=shortterm&u=prometheus_svc&p=Paralus!98 + serverName: influxdb01.core.stage.paralus-edge.net + url: https://influxdb01.core.stage.paralus-edge.net/api/v1/prom/write?db=monitoringdb&rp=shortterm&u=prometheus_svc&p=Paralus!98 writeRelabelConfigs: - action: keep regex: rcloud.*|kube_daemonset_metadata_generation|kube_deployment_metadata_generation|node_cpu_seconds_total|kube_pod_container_status_running|kube_pod_container_resource_requests_cpu_cores|kube_pod_container_resource_limits_cpu_cores|node:node_num_cpu:sum|:node_memory_MemFreeCachedBuffers_bytes:sum|:node_memory_MemTotal_bytes:sum|node_memory_MemTotal_bytes|kube_pod_container_resource_requests_memory_bytes|kube_pod_container_resource_limits_memory_bytes|amespace_pod_name_container_name:container_cpu_usage_seconds_total:sum_rate|namespace_pod_name_container_name:container_cpu_usage_seconds_total:sum_rate|container_memory_rss|namespace_pod_name_container_name:container_cpu_usage_seconds_total:sum_rate|node:node_cpu_utilisation:avg1m|node:node_cpu_saturation_load1:|kube_pod_info|node:node_memory_utilisation:|node:node_memory_utilisation:ratio|node:node_memory_swap_io_bytes:sum_rate|node:node_disk_utilisation:avg_irate|:kube_pod_info_node_count:|node:node_disk_saturation:avg_irate|node:node_net_utilisation:sum_irate|node:node_net_saturation:sum_irate|node_filesystem_size_bytes|node_filesystem_avail_bytes|node_namespace_pod:kube_pod_info:|node_load1|node_load5|node_load15|node_memory_MemFree_bytes|node_memory_Buffers_bytes|node_memory_Cached_bytes|node_disk_read_bytes_total|node_disk_written_bytes_total|node_disk_io_time_seconds_total|node:node_filesystem_usage:|node_network_receive_bytes_total|node_network_transmit_bytes_total|container_memory_usage_bytes|kube_pod_container_resource_requests_memory_bytes|container_cpu_usage_seconds_total|container_network_receive_bytes_total|container_network_transmit_bytes_total|kube_statefulset_replicas|kube_statefulset_status_replicas|kube_statefulset_status_replicas_ready|kube_statefulset_status_replicas_current|kube_statefulset_status_replicas_updated|node_boot_time_seconds|kube_node_info|kube_pod_container_info|kube_statefulset_metadata_generation|kube_statefulset_status_observed_generation|kubelet_volume_stats_capacity_bytes|kubelet_volume_stats_available_bytes|kubelet_volume_stats_used_bytes|kube_node_status_condition|fluentd_input_status_num_records_total|fluentd_output_status_buffer_queue_length|fluentd_output_status_num_errors|fluentd_output_status_emit_count|fluentd_output_status_buffer_queue_length|fluentd_output_status_retry_count|fluentd_output_status_rollback_count|fluentd_output_status_buffer_total_bytes|fluentd_output_status_num_records_total @@ -6853,7 +6853,7 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: matchNames: - - rafay-infra + - paralus-infra serviceMonitorSelector: matchExpressions: - key: k8s-app @@ -6877,7 +6877,7 @@ spec: labels: k8s-app: prometheus name: prometheus - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - interval: 30s @@ -6893,7 +6893,7 @@ spec: labels: k8s-app: alertmanager name: alertmanager - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - interval: 30s @@ -6914,7 +6914,7 @@ spec: labels: alertmanager: main name: main - namespace: rafay-infra + namespace: paralus-infra spec: baseImage: quay.io/prometheus/alertmanager nodeSelector: @@ -6934,7 +6934,7 @@ spec: labels: k8s-app: kube-state-metrics name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -6963,7 +6963,7 @@ spec: labels: k8s-app: node-exporter name: node-exporter - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -6982,14 +6982,14 @@ spec: kind: APIService metadata: name: v1beta1.custom.metrics.k8s.io - namespace: rafay-infra + namespace: paralus-infra spec: group: custom.metrics.k8s.io groupPriorityMinimum: 100 insecureSkipTLSVerify: true service: name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra version: v1beta1 versionPriority: 5 - name: kube-control-manager-service @@ -7019,7 +7019,7 @@ spec: labels: prometheus: k8s name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra spec: ports: - name: web @@ -7036,7 +7036,7 @@ spec: labels: k8s-app: prometheus-operator name: prometheus-operator - namespace: rafay-infra + namespace: paralus-infra spec: clusterIP: None ports: @@ -7053,7 +7053,7 @@ spec: labels: alertmanager: main name: alertmanager-main - namespace: rafay-infra + namespace: paralus-infra spec: ports: - name: web @@ -7072,7 +7072,7 @@ spec: labels: k8s-app: kube-state-metrics name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra spec: clusterIP: None ports: @@ -7092,7 +7092,7 @@ spec: labels: k8s-app: node-exporter name: node-exporter - namespace: rafay-infra + namespace: paralus-infra spec: clusterIP: None ports: @@ -7109,7 +7109,7 @@ spec: labels: name: prometheus-adapter name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra spec: ports: - name: https @@ -7125,7 +7125,7 @@ spec: labels: k8s-app: kubelet name: kubelet - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -7170,7 +7170,7 @@ spec: labels: k8s-app: fluentd name: fluentd - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - interval: 1m @@ -7200,7 +7200,7 @@ spec: labels: k8s-app: apiserver name: kube-apiserver - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -7231,7 +7231,7 @@ spec: labels: k8s-app: coredns name: coredns - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -7251,7 +7251,7 @@ spec: labels: k8s-app: kube-controller-manager name: kube-controller-manager - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - interval: 30s @@ -7276,7 +7276,7 @@ spec: labels: k8s-app: kube-scheduler name: kube-scheduler - namespace: rafay-infra + namespace: paralus-infra spec: endpoints: - interval: 30s @@ -7297,7 +7297,7 @@ spec: labels: k8s-app: prometheus-operator name: prometheus-operator - namespace: rafay-infra + namespace: paralus-infra spec: replicas: 1 selector: @@ -7342,7 +7342,7 @@ spec: labels: app: kube-state-metrics name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra spec: replicas: 1 selector: @@ -7441,7 +7441,7 @@ spec: labels: app: node-exporter name: node-exporter - namespace: rafay-infra + namespace: paralus-infra spec: selector: matchLabels: @@ -7524,7 +7524,7 @@ spec: kind: Deployment metadata: name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra spec: replicas: 1 selector: @@ -7544,7 +7544,7 @@ spec: - --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/ - --secure-port=6443 - --v=4 - image: registry.dev.rafay-edge.net:5000/rafay/k8s-prometheus-adapter-amd64:v1.0.4 + image: registry.dev.paralus-edge.net:5000/paralus/k8s-prometheus-adapter-amd64:v1.0.4 name: prometheus-adapter ports: - containerPort: 6443 @@ -7572,7 +7572,7 @@ spec: prometheus: k8s role: alert-rules name: prometheus-k8s-rules - namespace: rafay-infra + namespace: paralus-infra spec: groups: - name: k8s.rules @@ -8503,7 +8503,7 @@ spec: prometheus: k8s role: alert-rules name: custom-prometheus-k8s-rules - namespace: rafay-infra + namespace: paralus-infra spec: groups: - name: custom.rules @@ -8679,7 +8679,7 @@ status: apiVersion: v1 kind: ServiceAccount name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4345" uid: bfca15e3-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8719,7 +8719,7 @@ status: apiVersion: rbac.authorization.k8s.io/v1 kind: Role name: prometheus-k8s-config - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4351" uid: bfd1918a-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8755,13 +8755,13 @@ status: state: StepComplete - jobReason: not configured jobState: StepJobComplete - name: prometheus-k8s-role-rafay-infra + name: prometheus-k8s-role-paralus-infra objectReason: object type *v1.Role not handled objectRef: apiVersion: rbac.authorization.k8s.io/v1 kind: Role name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4354" uid: bfe3792f-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8775,7 +8775,7 @@ status: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding name: prometheus-k8s-config - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4355" uid: bfe4dbec-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8811,13 +8811,13 @@ status: state: StepComplete - jobReason: not configured jobState: StepJobComplete - name: prometheus-k8s-rolebinding-rafay-infra + name: prometheus-k8s-rolebinding-paralus-infra objectReason: object type *v1.RoleBinding not handled objectRef: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding name: prometheus-k8s - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4359" uid: bff0fd0d-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8831,7 +8831,7 @@ status: apiVersion: v1 kind: ServiceAccount name: prometheus-operator - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4360" uid: bff248c3-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8871,7 +8871,7 @@ status: apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor name: prometheus-operator - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4365" uid: bff65354-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8885,7 +8885,7 @@ status: apiVersion: v1 kind: ServiceAccount name: alertmanager-main - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4366" uid: bff799f4-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8899,7 +8899,7 @@ status: apiVersion: v1 kind: Secret name: alertmanager-main - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4367" uid: bff8f244-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8913,7 +8913,7 @@ status: apiVersion: v1 kind: ServiceAccount name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4370" uid: bffeb3cb-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8953,7 +8953,7 @@ status: apiVersion: rbac.authorization.k8s.io/v1 kind: Role name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4375" uid: c0027a33-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8967,7 +8967,7 @@ status: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding name: kube-state-metrics - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4376" uid: c00399d7-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -8981,7 +8981,7 @@ status: apiVersion: v1 kind: ServiceAccount name: node-exporter - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4377" uid: c0050866-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -9021,7 +9021,7 @@ status: apiVersion: v1 kind: ServiceAccount name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4382" uid: c00f3ed8-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -9048,7 +9048,7 @@ status: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding name: prometheus-adapter - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4386" uid: c011c005-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -9088,7 +9088,7 @@ status: apiVersion: v1 kind: ConfigMap name: adapter-config - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4389" uid: c01581ce-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -9116,7 +9116,7 @@ status: apiVersion: v1 kind: Secret name: edge-creds - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4391" uid: c01ebd57-0a47-11ea-8c3a-0219fcc74e7c objectState: StepObjectComplete @@ -9127,6 +9127,6 @@ status: apiVersion: cluster.paralus.dev/v2 kind: Tasklet name: v1-prometheus - namespace: rafay-infra + namespace: paralus-infra resourceVersion: "4456" uid: c3930f90-0a47-11ea-8c3a-0219fcc74e7c diff --git a/pkg/controller/apply/testdata/rafay-system-ns.yaml b/pkg/controller/apply/testdata/rafay-system-ns.yaml index d4ef0ae..ae281a9 100644 --- a/pkg/controller/apply/testdata/rafay-system-ns.yaml +++ b/pkg/controller/apply/testdata/rafay-system-ns.yaml @@ -15,7 +15,7 @@ metadata: labels: paralus.dev/global: "true" paralus.dev/modified-sa: "true" - paralus.dev/psp: rafay-privileged-psp + paralus.dev/psp: paralus-privileged-psp paralus.dev/system: "true" rep-drift-reconcillation: enabled managedFields: @@ -59,10 +59,10 @@ metadata: f:spec: .: {} f:postCreate: {} - manager: rafay-connector + manager: paralus-connector operation: Update time: "2021-09-15T05:00:18Z" - name: rafay-system + name: paralus-system namespace: default resourceVersion: "1272" uid: e4550a5c-a2ef-4277-8283-0f4e3478970c @@ -74,12 +74,12 @@ spec: kind: ClusterRole metadata: annotations: - paralus.dev/original: '{"kind":"ClusterRole","rules":[{"verbs":["*"],"apiGroups":["*"],"resources":["*"]},{"verbs":["*"],"nonResourceURLs":["*"]},{"verbs":["create","delete","get","list","patch","update","watch"],"apiGroups":["cluster.paralus.dev"],"resources":["namespaces"]},{"verbs":["get","patch","update"],"apiGroups":["cluster.paralus.dev"],"resources":["namespaces/status"]},{"verbs":["create","delete","get","list","patch","update","watch"],"apiGroups":["cluster.paralus.dev"],"resources":["tasklets"]},{"verbs":["get","patch","update"],"apiGroups":["cluster.paralus.dev"],"resources":["tasklets/status"]},{"verbs":["create","delete","get","list","patch","update","watch"],"apiGroups":["cluster.paralus.dev"],"resources":["tasks"]},{"verbs":["get","patch","update"],"apiGroups":["cluster.paralus.dev"],"resources":["tasks/status"]}],"metadata":{"name":"rafay:manager","creationTimestamp":null,"labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"apiVersion":"rbac.authorization.k8s.io/v1"}' + paralus.dev/original: '{"kind":"ClusterRole","rules":[{"verbs":["*"],"apiGroups":["*"],"resources":["*"]},{"verbs":["*"],"nonResourceURLs":["*"]},{"verbs":["create","delete","get","list","patch","update","watch"],"apiGroups":["cluster.paralus.dev"],"resources":["namespaces"]},{"verbs":["get","patch","update"],"apiGroups":["cluster.paralus.dev"],"resources":["namespaces/status"]},{"verbs":["create","delete","get","list","patch","update","watch"],"apiGroups":["cluster.paralus.dev"],"resources":["tasklets"]},{"verbs":["get","patch","update"],"apiGroups":["cluster.paralus.dev"],"resources":["tasklets/status"]},{"verbs":["create","delete","get","list","patch","update","watch"],"apiGroups":["cluster.paralus.dev"],"resources":["tasks"]},{"verbs":["get","patch","update"],"apiGroups":["cluster.paralus.dev"],"resources":["tasks/status"]}],"metadata":{"name":"paralus:manager","creationTimestamp":null,"labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"apiVersion":"rbac.authorization.k8s.io/v1"}' rep-drift-action: deny creationTimestamp: null labels: rep-drift-reconcillation: enabled - name: rafay:manager + name: paralus:manager rules: - apiGroups: - '*' @@ -157,11 +157,11 @@ spec: kind: ClusterRole metadata: annotations: - paralus.dev/original: '{"kind":"ClusterRole","rules":[{"verbs":["create"],"apiGroups":["authentication.k8s.io"],"resources":["tokenreviews"]},{"verbs":["create"],"apiGroups":["authorization.k8s.io"],"resources":["subjectaccessreviews"]}],"metadata":{"name":"rafay:proxy-role","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"apiVersion":"rbac.authorization.k8s.io/v1"}' + paralus.dev/original: '{"kind":"ClusterRole","rules":[{"verbs":["create"],"apiGroups":["authentication.k8s.io"],"resources":["tokenreviews"]},{"verbs":["create"],"apiGroups":["authorization.k8s.io"],"resources":["subjectaccessreviews"]}],"metadata":{"name":"paralus:proxy-role","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"apiVersion":"rbac.authorization.k8s.io/v1"}' rep-drift-action: deny labels: rep-drift-reconcillation: enabled - name: rafay:proxy-role + name: paralus:proxy-role rules: - apiGroups: - authentication.k8s.io @@ -178,17 +178,17 @@ spec: namespaceMeta: annotations: rep-drift-action: deny - role: rafay-system + role: paralus-system creationTimestamp: null labels: control-plane: controller-manager paralus.dev/global: "true" paralus.dev/modified-sa: "true" - paralus.dev/psp: rafay-privileged-psp + paralus.dev/psp: paralus-privileged-psp paralus.dev/system: "true" rep-drift-reconcillation: enabled - role: rafay-system - name: rafay-system + role: paralus-system + name: paralus-system postCreate: - name: create-system-sa-serviceaccount object: @@ -196,24 +196,24 @@ spec: kind: ServiceAccount metadata: annotations: - paralus.dev/original: '{"kind":"ServiceAccount","metadata":{"name":"system-sa","namespace":"rafay-system","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"apiVersion":"v1"}' + paralus.dev/original: '{"kind":"ServiceAccount","metadata":{"name":"system-sa","namespace":"paralus-system","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"apiVersion":"v1"}' rep-drift-action: deny labels: rep-drift-reconcillation: enabled name: system-sa - namespace: rafay-system + namespace: paralus-system - name: create-leader-election-role object: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: - paralus.dev/original: '{"kind":"Role","rules":[{"verbs":["get","list","watch","create","update","patch","delete"],"apiGroups":[""],"resources":["configmaps"]},{"verbs":["get","update","patch"],"apiGroups":[""],"resources":["configmaps/status"]},{"verbs":["create"],"apiGroups":[""],"resources":["events"]}],"metadata":{"name":"rafay:leader-election-role","namespace":"rafay-system","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"apiVersion":"rbac.authorization.k8s.io/v1"}' + paralus.dev/original: '{"kind":"Role","rules":[{"verbs":["get","list","watch","create","update","patch","delete"],"apiGroups":[""],"resources":["configmaps"]},{"verbs":["get","update","patch"],"apiGroups":[""],"resources":["configmaps/status"]},{"verbs":["create"],"apiGroups":[""],"resources":["events"]}],"metadata":{"name":"paralus:leader-election-role","namespace":"paralus-system","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"apiVersion":"rbac.authorization.k8s.io/v1"}' rep-drift-action: deny labels: rep-drift-reconcillation: enabled - name: rafay:leader-election-role - namespace: rafay-system + name: paralus:leader-election-role + namespace: paralus-system rules: - apiGroups: - "" @@ -247,73 +247,73 @@ spec: kind: RoleBinding metadata: annotations: - paralus.dev/original: '{"kind":"RoleBinding","roleRef":{"kind":"Role","name":"rafay:leader-election-role","apiGroup":"rbac.authorization.k8s.io"},"metadata":{"name":"rafay:leader-election-rolebinding","namespace":"rafay-system","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"subjects":[{"kind":"ServiceAccount","name":"system-sa","namespace":"rafay-system"},{"kind":"ServiceAccount","name":"default","namespace":"rafay-system"}],"apiVersion":"rbac.authorization.k8s.io/v1"}' + paralus.dev/original: '{"kind":"RoleBinding","roleRef":{"kind":"Role","name":"paralus:leader-election-role","apiGroup":"rbac.authorization.k8s.io"},"metadata":{"name":"paralus:leader-election-rolebinding","namespace":"paralus-system","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"subjects":[{"kind":"ServiceAccount","name":"system-sa","namespace":"paralus-system"},{"kind":"ServiceAccount","name":"default","namespace":"paralus-system"}],"apiVersion":"rbac.authorization.k8s.io/v1"}' rep-drift-action: deny labels: rep-drift-reconcillation: enabled - name: rafay:leader-election-rolebinding - namespace: rafay-system + name: paralus:leader-election-rolebinding + namespace: paralus-system roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: rafay:leader-election-role + name: paralus:leader-election-role subjects: - kind: ServiceAccount name: system-sa - namespace: rafay-system + namespace: paralus-system - kind: ServiceAccount name: default - namespace: rafay-system + namespace: paralus-system - name: create-manager-role-binding object: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: - paralus.dev/original: '{"kind":"ClusterRoleBinding","roleRef":{"kind":"ClusterRole","name":"rafay:manager","apiGroup":"rbac.authorization.k8s.io"},"metadata":{"name":"rafay:rafay-system:manager-rolebinding","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"subjects":[{"kind":"ServiceAccount","name":"system-sa","namespace":"rafay-system"},{"kind":"ServiceAccount","name":"default","namespace":"rafay-system"}],"apiVersion":"rbac.authorization.k8s.io/v1"}' + paralus.dev/original: '{"kind":"ClusterRoleBinding","roleRef":{"kind":"ClusterRole","name":"paralus:manager","apiGroup":"rbac.authorization.k8s.io"},"metadata":{"name":"paralus:paralus-system:manager-rolebinding","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"subjects":[{"kind":"ServiceAccount","name":"system-sa","namespace":"paralus-system"},{"kind":"ServiceAccount","name":"default","namespace":"paralus-system"}],"apiVersion":"rbac.authorization.k8s.io/v1"}' rep-drift-action: deny labels: rep-drift-reconcillation: enabled - name: rafay:rafay-system:manager-rolebinding + name: paralus:paralus-system:manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: rafay:manager + name: paralus:manager subjects: - kind: ServiceAccount name: system-sa - namespace: rafay-system + namespace: paralus-system - kind: ServiceAccount name: default - namespace: rafay-system + namespace: paralus-system - name: create-proxy-role-binding object: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: - paralus.dev/original: '{"kind":"ClusterRoleBinding","roleRef":{"kind":"ClusterRole","name":"rafay:proxy-role","apiGroup":"rbac.authorization.k8s.io"},"metadata":{"name":"rafay:rafay-system:proxy-rolebinding","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"subjects":[{"kind":"ServiceAccount","name":"system-sa","namespace":"rafay-system"},{"kind":"ServiceAccount","name":"default","namespace":"rafay-system"}],"apiVersion":"rbac.authorization.k8s.io/v1"}' + paralus.dev/original: '{"kind":"ClusterRoleBinding","roleRef":{"kind":"ClusterRole","name":"paralus:proxy-role","apiGroup":"rbac.authorization.k8s.io"},"metadata":{"name":"paralus:paralus-system:proxy-rolebinding","labels":{"rep-drift-reconcillation":"enabled"},"annotations":{"rep-drift-action":"deny"}},"subjects":[{"kind":"ServiceAccount","name":"system-sa","namespace":"paralus-system"},{"kind":"ServiceAccount","name":"default","namespace":"paralus-system"}],"apiVersion":"rbac.authorization.k8s.io/v1"}' rep-drift-action: deny labels: rep-drift-reconcillation: enabled - name: rafay:rafay-system:proxy-rolebinding + name: paralus:paralus-system:proxy-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: rafay:proxy-role + name: paralus:proxy-role subjects: - kind: ServiceAccount name: system-sa - namespace: rafay-system + namespace: paralus-system - kind: ServiceAccount name: default - namespace: rafay-system + namespace: paralus-system - name: create-access-log-configmap_v2_1 object: apiVersion: v1 data: fluent.conf: | - + @type forward require_ack_response true ack_response_timeout 190 @@ -333,27 +333,27 @@ spec: overflow_action block - host log-aggregator.rafay-infra.svc.cluster.local + host log-aggregator.paralus-infra.svc.cluster.local port 24224 kind: ConfigMap metadata: annotations: - paralus.dev/original: '{"data":{"fluent.conf":"\n @type + paralus.dev/original: '{"data":{"fluent.conf":"\n @type forward\n require_ack_response true\n ack_response_timeout 190\n \n @type memory\n flush_mode interval\n retry_type exponential_backoff\n flush_thread_count 2\n flush_interval 60s\n retry_forever false\n retry_max_interval 1h\n retry_timeout 32h\n retry_max_times 17\n retry_randomize true\n chunk_limit_size 5M\n queue_limit_length 8\n overflow_action - block\n \n \n host log-aggregator.rafay-infra.svc.cluster.local\n port - 24224\n \n\n"},"kind":"ConfigMap","metadata":{"name":"rafay-ingress-log-config","labels":{"logger":"rafay-logger","rep-drift-reconcillation":"enabled"},"namespace":"rafay-system","annotations":{"rep-drift-action":"deny"}},"apiVersion":"v1"}' + block\n \n \n host log-aggregator.paralus-infra.svc.cluster.local\n port + 24224\n \n\n"},"kind":"ConfigMap","metadata":{"name":"paralus-ingress-log-config","labels":{"logger":"paralus-logger","rep-drift-reconcillation":"enabled"},"namespace":"paralus-system","annotations":{"rep-drift-action":"deny"}},"apiVersion":"v1"}' rep-drift-action: deny labels: - logger: rafay-logger + logger: paralus-logger rep-drift-reconcillation: enabled - name: rafay-ingress-log-config - namespace: rafay-system + name: paralus-ingress-log-config + namespace: paralus-system status: conditions: - lastUpdateTime: "2021-09-15T05:00:18Z" @@ -380,7 +380,7 @@ status: objectRef: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole - name: rafay:manager + name: paralus:manager resourceVersion: "1258" uid: 855e1d07-8a75-47be-9e98-d03810f634a6 objectSpecHash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 @@ -394,7 +394,7 @@ status: objectRef: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole - name: rafay:proxy-role + name: paralus:proxy-role resourceVersion: "1259" uid: abf1cc60-8f9a-4fad-be5d-5551fc6c236a objectSpecHash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 @@ -404,7 +404,7 @@ status: namespaceRef: apiVersion: v1 kind: Namespace - name: rafay-system + name: paralus-system resourceVersion: "1262" uid: 574a3611-2ab8-436f-999a-f463360e5d3d observedGeneration: 1 @@ -417,7 +417,7 @@ status: apiVersion: v1 kind: ServiceAccount name: system-sa - namespace: rafay-system + namespace: paralus-system resourceVersion: "1265" uid: f1981c17-775d-4138-8633-776ad49fb586 objectSpecHash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 @@ -431,8 +431,8 @@ status: objectRef: apiVersion: rbac.authorization.k8s.io/v1 kind: Role - name: rafay:leader-election-role - namespace: rafay-system + name: paralus:leader-election-role + namespace: paralus-system resourceVersion: "1266" uid: 3afaf464-0b94-4116-9bcc-93a4978174c6 objectSpecHash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 @@ -446,8 +446,8 @@ status: objectRef: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding - name: rafay:leader-election-rolebinding - namespace: rafay-system + name: paralus:leader-election-rolebinding + namespace: paralus-system resourceVersion: "1267" uid: 12551dfd-7143-4e83-a0a6-0c4ab1e1d4fe objectSpecHash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 @@ -461,7 +461,7 @@ status: objectRef: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding - name: rafay:rafay-system:manager-rolebinding + name: paralus:paralus-system:manager-rolebinding resourceVersion: "1268" uid: 2fe8a87a-d571-4997-b22e-a6da5bdcbe49 objectSpecHash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 @@ -475,7 +475,7 @@ status: objectRef: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding - name: rafay:rafay-system:proxy-rolebinding + name: paralus:paralus-system:proxy-rolebinding resourceVersion: "1269" uid: 7f3c4c02-cd90-40c0-8663-5f156c50e6c3 objectSpecHash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 @@ -489,11 +489,11 @@ status: objectRef: apiVersion: v1 kind: ConfigMap - name: rafay-ingress-log-config - namespace: rafay-system + name: paralus-ingress-log-config + namespace: paralus-system resourceVersion: "1270" uid: e86e3ea0-a3b2-4187-b552-c18e5f6ca30f objectSpecHash: d26d566c010b3b8a7dde8ef1a406a961c8839d60951b08cbd8d34c1c885c6cd2 objectState: StepObjectComplete reason: complete - state: StepComplete \ No newline at end of file + state: StepComplete diff --git a/pkg/controller/apply/testdata/service1-current.yaml b/pkg/controller/apply/testdata/service1-current.yaml index 5a4a8ae..dc64633 100644 --- a/pkg/controller/apply/testdata/service1-current.yaml +++ b/pkg/controller/apply/testdata/service1-current.yaml @@ -9,14 +9,14 @@ metadata: "port": 24224, "nodePort": null, "protocol": "TCP", "targetPort": 24224}, {"name": "prometheus", "port": 24231, "nodePort": null, "protocol": "TCP", "targetPort": 24231}], "selector": {"app": "log-aggregator"}}, "metadata": {"name": "log-aggregator", - "namespace": "rafay-infra", "annotations": {"paralus.dev/previous": "{\"kind\": + "namespace": "paralus-infra", "annotations": {"paralus.dev/previous": "{\"kind\": \"Service\", \"spec\": {\"type\": \"ClusterIP\", \"ports\": [{\"name\": \"log-aggregator-tcp\", \"port\": 8888, \"protocol\": \"TCP\", \"targetPort\": 8888}, {\"name\": \"log-aggregator-udp\", \"port\": 5140, \"protocol\": \"UDP\", \"targetPort\": 5140}, {\"name\": \"log-aggregator-fwd\", \"port\": 24224, \"protocol\": \"TCP\", \"targetPort\": 24224}, {\"name\": \"prometheus\", \"port\": 24231, \"protocol\": \"TCP\", \"targetPort\": 24231}], \"selector\": {\"app\": \"log-aggregator\"}}, \"metadata\": {\"name\": \"log-aggregator\", - \"namespace\": \"rafay-infra\"}, \"apiVersion\": \"v1\"}"}}, "apiVersion": "v1"}' + \"namespace\": \"paralus-infra\"}, \"apiVersion\": \"v1\"}"}}, "apiVersion": "v1"}' creationTimestamp: "2020-02-12T21:49:41Z" name: log-aggregator namespace: default @@ -52,4 +52,4 @@ spec: sessionAffinity: None type: NodePort status: - loadBalancer: {} \ No newline at end of file + loadBalancer: {} diff --git a/pkg/controller/apply/testdata/statefulset-patch.yaml b/pkg/controller/apply/testdata/statefulset-patch.yaml index cbbb64b..b8a2237 100644 --- a/pkg/controller/apply/testdata/statefulset-patch.yaml +++ b/pkg/controller/apply/testdata/statefulset-patch.yaml @@ -3,32 +3,32 @@ kind: StatefulSet metadata: annotations: paralus.dev/overridedBy: global/global-override - name: rafay-connector + name: paralus-connector namespace: default spec: replicas: 1 selector: matchLabels: - app: rafay-connector + app: paralus-connector serviceName: "connector" template: metadata: labels: - app: rafay-connector + app: paralus-connector spec: containers: - - image: rafaysystems/rafay-connector:latest + - image: paralussystems/paralus-connector:latest imagePullPolicy: Always name: connector resources: {} volumeMounts: - mountPath: /etc/config name: connector-config - priorityClassName: rafay-cluster-critical + priorityClassName: paralus-cluster-critical terminationGracePeriodSeconds: 10 volumes: - configMap: name: connector-config name: connector-config status: - replicas: 0 \ No newline at end of file + replicas: 0 diff --git a/pkg/controller/apply/testdata/statefulset.yaml b/pkg/controller/apply/testdata/statefulset.yaml index c720cba..3746a22 100644 --- a/pkg/controller/apply/testdata/statefulset.yaml +++ b/pkg/controller/apply/testdata/statefulset.yaml @@ -3,8 +3,8 @@ kind: StatefulSet metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"apiVersion":"apps/v1","kind":"StatefulSet","metadata":{"annotations":{},"name":"rafay-connector","namespace":"rafay-system"},"spec":{"replicas":1,"selector":{"matchLabels":{"app":"rafay-connector"}},"serviceName":"connector","template":{"metadata":{"labels":{"app":"rafay-connector"}},"spec":{"containers":[{"image":"rafaysystems/rafay-connector:latest","name":"connector","volumeMounts":[{"mountPath":"/etc/config","name":"connector-config"}]}],"priorityClassName":"rafay-cluster-critical","terminationGracePeriodSeconds":10,"volumes":[{"configMap":{"name":"connector-config"},"name":"connector-config"}]}}}} - name: rafay-connector + {"apiVersion":"apps/v1","kind":"StatefulSet","metadata":{"annotations":{},"name":"paralus-connector","namespace":"paralus-system"},"spec":{"replicas":1,"selector":{"matchLabels":{"app":"paralus-connector"}},"serviceName":"connector","template":{"metadata":{"labels":{"app":"paralus-connector"}},"spec":{"containers":[{"image":"paralussystems/paralus-connector:latest","name":"connector","volumeMounts":[{"mountPath":"/etc/config","name":"connector-config"}]}],"priorityClassName":"paralus-cluster-critical","terminationGracePeriodSeconds":10,"volumes":[{"configMap":{"name":"connector-config"},"name":"connector-config"}]}}}} + name: paralus-connector namespace: default spec: podManagementPolicy: OrderedReady @@ -12,16 +12,16 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - app: rafay-connector + app: paralus-connector serviceName: connector template: metadata: creationTimestamp: null labels: - app: rafay-connector + app: paralus-connector spec: containers: - - image: rafaysystems/rafay-connector:latest + - image: paralussystems/paralus-connector:latest imagePullPolicy: Always name: connector resources: {} @@ -31,7 +31,7 @@ spec: - mountPath: /etc/config name: connector-config dnsPolicy: ClusterFirst - priorityClassName: rafay-cluster-critical + priorityClassName: paralus-cluster-critical restartPolicy: Always schedulerName: default-scheduler securityContext: {} @@ -48,9 +48,9 @@ spec: status: collisionCount: 0 currentReplicas: 1 - currentRevision: rafay-connector-568bcd85cb + currentRevision: paralus-connector-568bcd85cb observedGeneration: 1 readyReplicas: 1 replicas: 1 - updateRevision: rafay-connector-568bcd85cb - updatedReplicas: 1 \ No newline at end of file + updateRevision: paralus-connector-568bcd85cb + updatedReplicas: 1 diff --git a/pkg/controller/runtime/testdata/etcd.yaml b/pkg/controller/runtime/testdata/etcd.yaml index 5a77272..31a6088 100644 --- a/pkg/controller/runtime/testdata/etcd.yaml +++ b/pkg/controller/runtime/testdata/etcd.yaml @@ -57,7 +57,7 @@ spec: - mountPath: /etcd0.etcd name: etcd-storage hostname: etcd0 - priorityClassName: rafay-cluster-critical + priorityClassName: paralus-cluster-critical volumes: - name: etcd-storage persistentVolumeClaim: diff --git a/pkg/controller/runtime/testdata/statefulset-patch.yaml b/pkg/controller/runtime/testdata/statefulset-patch.yaml index f7b23c7..043e0e7 100644 --- a/pkg/controller/runtime/testdata/statefulset-patch.yaml +++ b/pkg/controller/runtime/testdata/statefulset-patch.yaml @@ -1,15 +1,15 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - name: rafay-connector + name: paralus-connector spec: template: spec: containers: - name: connector - image: rafaysystems/rafay-connector:latest-1 + image: paralussystems/paralus-connector:latest-1 imagePullSecrets: - - name: rcloud-registry-creds + - name: paralus-registry-creds command: - test1 - - "" \ No newline at end of file + - "" diff --git a/pkg/controller/runtime/testdata/statefulset.yaml b/pkg/controller/runtime/testdata/statefulset.yaml index cf94cb4..bb05854 100644 --- a/pkg/controller/runtime/testdata/statefulset.yaml +++ b/pkg/controller/runtime/testdata/statefulset.yaml @@ -1,24 +1,24 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - name: rafay-connector - namespace: rafay-system + name: paralus-connector + namespace: paralus-system spec: selector: matchLabels: - app: rafay-connector + app: paralus-connector serviceName: "connector" replicas: 1 template: metadata: labels: - app: rafay-connector + app: paralus-connector spec: - priorityClassName: rafay-cluster-critical + priorityClassName: paralus-cluster-critical terminationGracePeriodSeconds: 10 containers: - name: connector - image: rafaysystems/rafay-connector:latest + image: paralussystems/paralus-connector:latest imagePullPolicy: Always volumeMounts: - name: connector-config @@ -26,4 +26,4 @@ spec: volumes: - name: connector-config configMap: - name: connector-config \ No newline at end of file + name: connector-config diff --git a/pkg/controller/util/owner.go b/pkg/controller/util/owner.go index dc7bbe4..a6443b5 100644 --- a/pkg/controller/util/owner.go +++ b/pkg/controller/util/owner.go @@ -75,7 +75,7 @@ func newOwnerRef(owner metav1.Object) (*metav1.OwnerReference, error) { } // SetOwnerReference sets owner reference for objects controlled -// by rafay cluster controllers +// by paralus cluster controllers func SetOwnerReference(owner, object metav1.Object) error { // Create a new ref diff --git a/pkg/gateway/annotator.go b/pkg/gateway/annotator.go index 7213917..2dedbf2 100644 --- a/pkg/gateway/annotator.go +++ b/pkg/gateway/annotator.go @@ -21,8 +21,8 @@ const ( RemoteAddr = "x-gateway-remote-addr" ) -// rafayGatewayAnnotator adds rafay gateway specific annotations -var rafayGatewayAnnotator = func(ctx context.Context, r *http.Request) metadata.MD { +// paralusGatewayAnnotator adds paralus gateway specific annotations +var paralusGatewayAnnotator = func(ctx context.Context, r *http.Request) metadata.MD { return metadata.New(map[string]string{ GatewayRequest: "true", GatewayURL: r.URL.EscapedPath(), diff --git a/pkg/gateway/gateway.go b/pkg/gateway/gateway.go index e79303c..dadcf62 100644 --- a/pkg/gateway/gateway.go +++ b/pkg/gateway/gateway.go @@ -19,14 +19,14 @@ type HandlerFromEndpoint func(ctx context.Context, mux *runtime.ServeMux, endpoi // NewGateway returns new grpc gateway func NewGateway(ctx context.Context, endpoint string, serveMuxOptions []runtime.ServeMuxOption, handlers ...HandlerFromEndpoint) (http.Handler, error) { - rafayJSON := NewParalusJSON() - rafayYAML := NewParalusYAML() + paralusJSON := NewParalusJSON() + paralusYAML := NewParalusYAML() httpBody := NewHTTPBodyMarshaler() serveMuxOptions = append(serveMuxOptions, runtime.WithMarshalerOption(runtime.MIMEWildcard, httpBody), - runtime.WithMarshalerOption(jsonContentType, rafayJSON), - runtime.WithMarshalerOption(yamlContentType, rafayYAML), - runtime.WithMetadata(rafayGatewayAnnotator), + runtime.WithMarshalerOption(jsonContentType, paralusJSON), + runtime.WithMarshalerOption(yamlContentType, paralusYAML), + runtime.WithMetadata(paralusGatewayAnnotator), ) mux := runtime.NewServeMux(serveMuxOptions...) diff --git a/pkg/gateway/httpbody.go b/pkg/gateway/httpbody.go index 841e36c..7b5e689 100644 --- a/pkg/gateway/httpbody.go +++ b/pkg/gateway/httpbody.go @@ -16,7 +16,7 @@ type httpBodyMarshaler struct { // NewHTTPBodyMarshaler returns new http body marshaler func NewHTTPBodyMarshaler() runtime.Marshaler { return &httpBodyMarshaler{ - Marshaler: &rafayJSON{}, + Marshaler: ¶lusJSON{}, } } diff --git a/pkg/gateway/json.go b/pkg/gateway/json.go index a80c58f..aaf4d77 100644 --- a/pkg/gateway/json.go +++ b/pkg/gateway/json.go @@ -11,39 +11,39 @@ const ( jsonContentType string = "application/json" ) -// rafayJSON is the rafay object to json marshaller -type rafayJSON struct { +// paralusJSON is the paralus object to json marshaller +type paralusJSON struct { } -// NewParalusJSON returns new grpc gateway rafay json marshaller +// NewParalusJSON returns new grpc gateway paralus json marshaller func NewParalusJSON() runtime.Marshaler { - return &rafayJSON{} + return ¶lusJSON{} } // Marshal marshals "v" into byte sequence. -func (m *rafayJSON) Marshal(v interface{}) ([]byte, error) { +func (m *paralusJSON) Marshal(v interface{}) ([]byte, error) { return json.Marshal(v) } // Unmarshal unmarshals "data" into "v". // "v" must be a pointer value. -func (m *rafayJSON) Unmarshal(b []byte, v interface{}) error { +func (m *paralusJSON) Unmarshal(b []byte, v interface{}) error { return json.Unmarshal(b, v) } // NewDecoder returns a Decoder which reads byte sequence from "r". -func (m *rafayJSON) NewDecoder(r io.Reader) runtime.Decoder { +func (m *paralusJSON) NewDecoder(r io.Reader) runtime.Decoder { return json.NewDecoder(r) } // NewEncoder returns an Encoder which writes bytes sequence into "w". -func (m *rafayJSON) NewEncoder(w io.Writer) runtime.Encoder { +func (m *paralusJSON) NewEncoder(w io.Writer) runtime.Encoder { return json.NewEncoder(w) } // ContentType returns the Content-Type which this marshaler is responsible for. -func (m *rafayJSON) ContentType(v interface{}) string { +func (m *paralusJSON) ContentType(v interface{}) string { return jsonContentType } diff --git a/pkg/gateway/yaml.go b/pkg/gateway/yaml.go index f52838b..cdf197f 100644 --- a/pkg/gateway/yaml.go +++ b/pkg/gateway/yaml.go @@ -13,17 +13,17 @@ const ( yamlContentType string = "application/yaml" ) -// rafayJSON is the rafay object to YAML marshaller -type rafayYAML struct { +// paralusJSON is the paralus object to YAML marshaller +type paralusYAML struct { } // NewParalusYAML returns new grpc gateway yaml marshaller func NewParalusYAML() runtime.Marshaler { - return &rafayYAML{} + return ¶lusYAML{} } // Marshal marshals "v" into byte sequence. -func (m *rafayYAML) Marshal(v interface{}) ([]byte, error) { +func (m *paralusYAML) Marshal(v interface{}) ([]byte, error) { b, err := json.Marshal(v) if err != nil { return nil, err @@ -39,7 +39,7 @@ func (m *rafayYAML) Marshal(v interface{}) ([]byte, error) { // Unmarshal unmarshals "data" into "v". // "v" must be a pointer value. -func (m *rafayYAML) Unmarshal(yb []byte, v interface{}) error { +func (m *paralusYAML) Unmarshal(yb []byte, v interface{}) error { jb, err := yaml.YAMLToJSON(yb) if err != nil { return err @@ -49,7 +49,7 @@ func (m *rafayYAML) Unmarshal(yb []byte, v interface{}) error { } // NewDecoder returns a Decoder which reads byte sequence from "r". -func (m *rafayYAML) NewDecoder(r io.Reader) runtime.Decoder { +func (m *paralusYAML) NewDecoder(r io.Reader) runtime.Decoder { return runtime.DecoderFunc(func(v interface{}) error { yb, err := ioutil.ReadAll(r) if err != nil { @@ -60,7 +60,7 @@ func (m *rafayYAML) NewDecoder(r io.Reader) runtime.Decoder { } // NewEncoder returns an Encoder which writes bytes sequence into "w". -func (m *rafayYAML) NewEncoder(w io.Writer) runtime.Encoder { +func (m *paralusYAML) NewEncoder(w io.Writer) runtime.Encoder { return runtime.EncoderFunc(func(v interface{}) error { yb, err := m.Marshal(v) if err != nil { @@ -73,6 +73,6 @@ func (m *rafayYAML) NewEncoder(w io.Writer) runtime.Encoder { } // ContentType returns the Content-Type which this marshaler is responsible for. -func (m *rafayYAML) ContentType(v interface{}) string { +func (m *paralusYAML) ContentType(v interface{}) string { return yamlContentType } diff --git a/pkg/pool/pool.go b/pkg/pool/pool.go index 03744db..a18088e 100644 --- a/pkg/pool/pool.go +++ b/pkg/pool/pool.go @@ -27,8 +27,9 @@ type GRPCPool struct { // NewGRPCPool returns new auth pool func NewGRPCPool(addr string, maxConnections int, creds credentials.TransportCredentials) *GRPCPool { - // as per https://rafaysystems.atlassian.net/browse/RC-9291 min number of connections for grpc - // across all services is set to 20; any service creating a connection pool size < 20 is now defaulted to 20 + // min number of connections for grpc across all services is + // set to 20; any service creating a connection pool size < 20 + // is now defaulted to 20 if maxConnections < DefaultMaxPoolConn { maxConnections = DefaultMaxPoolConn } diff --git a/pkg/sentry/authz/authz.go b/pkg/sentry/authz/authz.go index b6136bf..b8959f1 100644 --- a/pkg/sentry/authz/authz.go +++ b/pkg/sentry/authz/authz.go @@ -44,7 +44,7 @@ var namespaceScopePermissions = []string{ } const ( - rafayRelayLabel = "rafay-relay" + paralusRelayLabel = "paralus-relay" relayUserLabel = "relay-user" authzRefreshedLabel = "authz-refreshed" systemUsername = "admin@paralus.co" @@ -61,7 +61,7 @@ func getCurrentEpoch() string { func getAuthzLabels(userName string) map[string]string { return map[string]string{ - rafayRelayLabel: "true", + paralusRelayLabel: "true", relayUserLabel: userName, authzRefreshedLabel: getCurrentEpoch(), } @@ -187,9 +187,9 @@ func getRole(permission string) (r *rbacv1.Role, err error) { func getRoleName(nsName, permission string) string { switch permission { case sentry.KubectlNamespaceWritePermission: - return "rafay-ns-role-write-" + nsName + return "paralus-ns-role-write-" + nsName case sentry.KubectlNamespaceReadPermission: - return "rafay-ns-role-read-" + nsName + return "paralus-ns-role-read-" + nsName default: _log.Infow("getRoleName invalid namespace", "permission", permission) } @@ -211,7 +211,7 @@ func getClusterRoleBinding(sa *corev1.ServiceAccount, clusterRole string) *rbacv crb.Kind = "ClusterRoleBinding" crb.Name = getClusterRoleBindingName(sa.Name, clusterRole) // crb.Labels = map[string]string{ - // "rafay-relay": "true", + // "paralus-relay": "true", // "relay-user": sa.Name, // } subject := rbacv1.Subject{} @@ -246,7 +246,7 @@ func getRoleBinding(sa *corev1.ServiceAccount, roleName, namespace string) *rbac rb.Name = getRoleBindingName(sa.Name, roleName) rb.Namespace = namespace // rb.Labels = map[string]string{ - // "rafay-relay": "true", + // "paralus-relay": "true", // "relay-user": sa.Name, // } subject := rbacv1.Subject{} @@ -459,7 +459,7 @@ func GetAuthorization(ctx context.Context, req *sentryrpc.GetUserAuthorizationRe sa.APIVersion = "v1" sa.Kind = "ServiceAccount" sa.Name = cnAttr.Username - sa.Namespace = "rafay-system" + sa.Namespace = "paralus-system" crMap := make(map[string]*rbacv1.ClusterRole) crbMap := make(map[string]*rbacv1.ClusterRoleBinding) @@ -693,7 +693,7 @@ func getSystemUserAuthz(cnAttrs kubeconfig.CNAttributes) (resp *sentryrpc.GetUse sa.APIVersion = "v1" sa.Kind = "ServiceAccount" sa.Name = cnAttrs.Username - sa.Namespace = "rafay-system" + sa.Namespace = "paralus-system" sa.Labels = authzLabels cr, err := getClusterRole(sentry.KubectlFullAccessPermission) diff --git a/pkg/sentry/authz/data/cluster_role_cluster_read.yaml b/pkg/sentry/authz/data/cluster_role_cluster_read.yaml index 6904eb4..2c26f10 100644 --- a/pkg/sentry/authz/data/cluster_role_cluster_read.yaml +++ b/pkg/sentry/authz/data/cluster_role_cluster_read.yaml @@ -3,7 +3,7 @@ kind: ClusterRole metadata: name: cluster-scope-read-cluster-role labels: - rafay-relay: "true" + paralus-relay: "true" rules: - apiGroups: ["*"] resources: ["*"] diff --git a/pkg/sentry/authz/data/cluster_role_cluster_write.yaml b/pkg/sentry/authz/data/cluster_role_cluster_write.yaml index b4dbcdb..ec49d35 100644 --- a/pkg/sentry/authz/data/cluster_role_cluster_write.yaml +++ b/pkg/sentry/authz/data/cluster_role_cluster_write.yaml @@ -3,7 +3,7 @@ kind: ClusterRole metadata: name: cluster-scope-write-cluster-role labels: - rafay-relay: "true" + paralus-relay: "true" rules: - apiGroups: ["*"] resources: ["*"] diff --git a/pkg/sentry/authz/data/cluster_role_full_access.yaml b/pkg/sentry/authz/data/cluster_role_full_access.yaml index cbf638a..aed2d25 100644 --- a/pkg/sentry/authz/data/cluster_role_full_access.yaml +++ b/pkg/sentry/authz/data/cluster_role_full_access.yaml @@ -3,7 +3,7 @@ kind: ClusterRole metadata: name: full-access-cluster-role labels: - rafay-relay: "true" + paralus-relay: "true" rules: - apiGroups: ["*"] resources: ["*"] diff --git a/pkg/sentry/authz/data/cluster_role_namespace_read.yaml b/pkg/sentry/authz/data/cluster_role_namespace_read.yaml index 1d4b758..96a0144 100644 --- a/pkg/sentry/authz/data/cluster_role_namespace_read.yaml +++ b/pkg/sentry/authz/data/cluster_role_namespace_read.yaml @@ -3,7 +3,7 @@ kind: ClusterRole metadata: name: read-access-cluster-role labels: - rafay-relay: "true" + paralus-relay: "true" rules: - apiGroups: ["*"] resources: ["*"] diff --git a/pkg/sentry/authz/data/cluster_role_namespace_write.yaml b/pkg/sentry/authz/data/cluster_role_namespace_write.yaml index 37e95ff..917fd86 100644 --- a/pkg/sentry/authz/data/cluster_role_namespace_write.yaml +++ b/pkg/sentry/authz/data/cluster_role_namespace_write.yaml @@ -3,7 +3,7 @@ kind: ClusterRole metadata: name: write-access-cluster-role labels: - rafay-relay: "true" + paralus-relay: "true" rules: - apiGroups: ["*"] resources: ["*"] diff --git a/pkg/sentry/authz/data/namespace.yaml b/pkg/sentry/authz/data/namespace.yaml index 01695fe..29581be 100644 --- a/pkg/sentry/authz/data/namespace.yaml +++ b/pkg/sentry/authz/data/namespace.yaml @@ -3,4 +3,4 @@ kind: Namespace metadata: name: namespace-name labels: - rafay-relay: "true" + paralus-relay: "true" diff --git a/pkg/sentry/authz/data/role_read_access.yaml b/pkg/sentry/authz/data/role_read_access.yaml index 4c7b5e8..00ed4fc 100644 --- a/pkg/sentry/authz/data/role_read_access.yaml +++ b/pkg/sentry/authz/data/role_read_access.yaml @@ -3,7 +3,7 @@ kind: Role metadata: name: read-access-role labels: - rafay-relay: "true" + paralus-relay: "true" rules: - apiGroups: ["*"] resources: ["*"] diff --git a/pkg/sentry/authz/data/role_write_access.yaml b/pkg/sentry/authz/data/role_write_access.yaml index 3c5780d..eb9be81 100644 --- a/pkg/sentry/authz/data/role_write_access.yaml +++ b/pkg/sentry/authz/data/role_write_access.yaml @@ -3,8 +3,8 @@ kind: Role metadata: name: write-access-role labels: - rafay-relay: "true" + paralus-relay: "true" rules: - apiGroups: ["*"] resources: ["*"] - verbs: ["*"] \ No newline at end of file + verbs: ["*"] diff --git a/pkg/sentry/cryptoutil/cert_test.go b/pkg/sentry/cryptoutil/cert_test.go index db4b435..0b9c2d6 100644 --- a/pkg/sentry/cryptoutil/cert_test.go +++ b/pkg/sentry/cryptoutil/cert_test.go @@ -14,9 +14,9 @@ func TestVerifyCertHostname(t *testing.T) { DNSNames: []string{ "peering.sentry.paralus.local", "peering.sentry.paralus.local", - "rafay-sentry", - "rafay-sentry.rafay-system", - "rafay-sentry.rafay-system.cluster.local", + "paralus-sentry", + "paralus-sentry.paralus-system", + "paralus-sentry.paralus-system.cluster.local", }, } err := cert.VerifyHostname("peering.sentry.paralus.local") @@ -24,17 +24,17 @@ func TestVerifyCertHostname(t *testing.T) { t.Error(err) return } - err = cert.VerifyHostname("rafay-sentry.rafay-system") + err = cert.VerifyHostname("paralus-sentry.paralus-system") if err != nil { t.Error(err) return } - err = cert.VerifyHostname("rafay-sentry") + err = cert.VerifyHostname("paralus-sentry") if err != nil { t.Error(err) return } - err = cert.VerifyHostname("rafay-sentry.rafay-system.cluster.local") + err = cert.VerifyHostname("paralus-sentry.paralus-system.cluster.local") if err != nil { t.Error(err) return diff --git a/pkg/sentry/kubeconfig/cert_cn.go b/pkg/sentry/kubeconfig/cert_cn.go index 972b674..8bfe0d2 100644 --- a/pkg/sentry/kubeconfig/cert_cn.go +++ b/pkg/sentry/kubeconfig/cert_cn.go @@ -24,7 +24,7 @@ const ( TerminalShell = "ts" // WebShell is the session originated for browser based kubectl WebShell = "ws" - // ParalusSystem is the session originated for rafay system controller purpose e.g. native helm + // ParalusSystem is the session originated for paralus system controller purpose e.g. native helm ParalusSystem = "rs" // RelayNetwork is the session originated for custom relay network (non-core-relay) RelayNetworkCN = "rn" @@ -83,7 +83,7 @@ func GetSessionTypeString(t string) string { case WebShell: return "browser shell" case ParalusSystem: - return "rafay system" + return "paralus system" default: return "unknown session type " + t } diff --git a/pkg/sentry/kubeconfig/kubeconfig.go b/pkg/sentry/kubeconfig/kubeconfig.go index 770f7ff..1cb715a 100644 --- a/pkg/sentry/kubeconfig/kubeconfig.go +++ b/pkg/sentry/kubeconfig/kubeconfig.go @@ -232,7 +232,7 @@ func GetConfigForUser(ctx context.Context, bs service.BootstrapService, aps serv if !isSSOAcc { projects, isOrgScope, err = getProjectsForAccount(ctx, opts.Account, opts.Organization, opts.Partner, aps) if err != nil { - _log.Errorw("error getting project for rafay ", "account", opts.Account, "error", err.Error()) + _log.Errorw("error getting project for paralus ", "account", opts.Account, "error", err.Error()) return nil, err } } else { @@ -276,7 +276,7 @@ func GetConfigForUser(ctx context.Context, bs service.BootstrapService, aps serv return nil, err } for _, ba := range bal.Items { - if ba.Spec.TemplateRef != "rafay-core-relay-agent" && ba.Spec.TemplateRef != "rafay-core-cd-relay-agent" { + if ba.Spec.TemplateRef != "paralus-core-relay-agent" && ba.Spec.TemplateRef != "paralus-core-cd-relay-agent" { if vi, ok := set[ba.Metadata.Name]; ok { v := vi.(sentry.BootstrapAgent) if v.Spec.TemplateRef == ba.Spec.TemplateRef { @@ -418,7 +418,7 @@ func getConfig(username, namespace, certCN, serverHost string, bootstrapInfra *s var contexts []clientcmdapiv1.NamedContext for _, ba := range bootstrapAgents { - if ba.Spec.TemplateRef != "rafay-core-relay-agent" && ba.Spec.TemplateRef != "rafay-core-cd-relay-agent" { + if ba.Spec.TemplateRef != "paralus-core-relay-agent" && ba.Spec.TemplateRef != "paralus-core-cd-relay-agent" { // skip non default agents from system kubeconfiog continue } @@ -633,7 +633,7 @@ func getUserConfig(ctx context.Context, opts commonv3.QueryOptions, username, na // prune agent list // if a cluster is added to custom relay then exlude it from default for _, ba := range bootstrapAgents { - if ba.Spec.TemplateRef != "rafay-core-relay-agent" && ba.Spec.TemplateRef != "rafay-core-cd-relay-agent" { + if ba.Spec.TemplateRef != "paralus-core-relay-agent" && ba.Spec.TemplateRef != "paralus-core-cd-relay-agent" { baMaps[ba.Metadata.Name] = *ba } else { if _, ok := baMaps[ba.Metadata.Name]; !ok { @@ -643,7 +643,7 @@ func getUserConfig(ctx context.Context, opts commonv3.QueryOptions, username, na } for _, ba := range baMaps { - if ba.Spec.TemplateRef != "rafay-core-relay-agent" && ba.Spec.TemplateRef != "rafay-core-cd-relay-agent" { + if ba.Spec.TemplateRef != "paralus-core-relay-agent" && ba.Spec.TemplateRef != "paralus-core-cd-relay-agent" { // handle custome relay network } else { diff --git a/pkg/sentry/peering/peering.go b/pkg/sentry/peering/peering.go index 52563f3..5251bb4 100644 --- a/pkg/sentry/peering/peering.go +++ b/pkg/sentry/peering/peering.go @@ -340,15 +340,15 @@ func GetPeeringServerCreds(ctx context.Context, bs service.BootstrapService, rpc defer cancel() var template *sentry.BootstrapAgentTemplate - template, err = bs.GetBootstrapAgentTemplate(nctx, "rafay-sentry-peering-server") + template, err = bs.GetBootstrapAgentTemplate(nctx, "paralus-sentry-peering-server") if err != nil { return } config := ®ister.Config{ - TemplateName: "rafay-sentry-peering-server", + TemplateName: "paralus-sentry-peering-server", Addr: fmt.Sprintf("localhost:%d", rpcPort), - Name: "rafay-sentry-peering-server", + Name: "paralus-sentry-peering-server", Scheme: "grpc", Mode: "server", } @@ -383,7 +383,7 @@ func GetPeeringServerCreds(ctx context.Context, bs service.BootstrapService, rpc var agent *sentry.BootstrapAgent - agent, err = bs.GetBootstrapAgent(nctx, template.Metadata.Name, query.WithName("rafay-sentry-peering-server"), query.WithGlobalScope()) + agent, err = bs.GetBootstrapAgent(nctx, template.Metadata.Name, query.WithName("paralus-sentry-peering-server"), query.WithGlobalScope()) if err != nil { if err != sql.ErrNoRows { diff --git a/pkg/service/cluster_test.go b/pkg/service/cluster_test.go index c43d638..be49dd1 100644 --- a/pkg/service/cluster_test.go +++ b/pkg/service/cluster_test.go @@ -27,7 +27,7 @@ func TestCreateCluster(t *testing.T) { downloadData := &common.DownloadData{ ControlAddr: "localhost:5002", APIAddr: "localhost:8000", - RelayAgentImage: "rafaysystems/relay:latest", + RelayAgentImage: "paralus/relay:latest", } ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger()) @@ -71,7 +71,7 @@ func TestUpdateCluster(t *testing.T) { downloadData := &common.DownloadData{ ControlAddr: "localhost:5002", APIAddr: "localhost:8000", - RelayAgentImage: "rafaysystems/relay:latest", + RelayAgentImage: "paralus/relay:latest", } ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger()) @@ -105,7 +105,7 @@ func TestSelectCluster(t *testing.T) { downloadData := &common.DownloadData{ ControlAddr: "localhost:5002", APIAddr: "localhost:8000", - RelayAgentImage: "rafaysystems/relay:latest", + RelayAgentImage: "paralus/relay:latest", } ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger()) @@ -139,7 +139,7 @@ func TestGetCluster(t *testing.T) { downloadData := &common.DownloadData{ ControlAddr: "localhost:5002", APIAddr: "localhost:8000", - RelayAgentImage: "rafaysystems/relay:latest", + RelayAgentImage: "paralus/relay:latest", } ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger()) @@ -172,7 +172,7 @@ func TestListCluster(t *testing.T) { downloadData := &common.DownloadData{ ControlAddr: "localhost:5002", APIAddr: "localhost:8000", - RelayAgentImage: "rafaysystems/relay:latest", + RelayAgentImage: "paralus/relay:latest", } ps := NewClusterService(db, downloadData, NewBootstrapService(db), getLogger()) diff --git a/proto/types/commonpb/v3/common.pb.go b/proto/types/commonpb/v3/common.pb.go index a26b856..a16636d 100644 --- a/proto/types/commonpb/v3/common.pb.go +++ b/proto/types/commonpb/v3/common.pb.go @@ -151,7 +151,7 @@ func (ParalusConditionStatus) EnumDescriptor() ([]byte, []int) { return file_proto_types_commonpb_v3_common_proto_rawDescGZIP(), []int{1} } -// ParalusTypeMeta is the type meta for rafay resources +// ParalusTypeMeta is the type meta for paralus resources type ParalusTypeMeta struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/proto/types/commonpb/v3/common.proto b/proto/types/commonpb/v3/common.proto index b4275b2..9a8811b 100644 --- a/proto/types/commonpb/v3/common.proto +++ b/proto/types/commonpb/v3/common.proto @@ -5,7 +5,7 @@ import "google/protobuf/timestamp.proto"; import "google/api/field_behavior.proto"; import "protoc-gen-openapiv2/options/annotations.proto"; -// ParalusTypeMeta is the type meta for rafay resources +// ParalusTypeMeta is the type meta for paralus resources message ParalusTypeMeta { string apiVersion = 1; string kind = 2; diff --git a/proto/types/controller/const.go b/proto/types/controller/const.go index 67700c9..68a390b 100644 --- a/proto/types/controller/const.go +++ b/proto/types/controller/const.go @@ -3,7 +3,7 @@ package controller const ( // PreDeleteFinalizer is the finalizer for all cluster CRD pre delete PreDeleteFinalizer = "cluster.paralus.dev.v2.predelete" - // OwnerRef is set if a kubernetes resource is owned by rafay cluster controllers + // OwnerRef is set if a kubernetes resource is owned by paralus cluster controllers // this is used in place of k8s owner ref to enable managing namespaced/non namespaced // resources across namespaces OwnerRef = "paralus.dev/ownerRef" diff --git a/proto/types/sentry/constants.go b/proto/types/sentry/constants.go index 8369269..dc70c37 100644 --- a/proto/types/sentry/constants.go +++ b/proto/types/sentry/constants.go @@ -1,6 +1,6 @@ package sentry -// rafay specific annotations/labels keys +// paralus specific annotations/labels keys const ( ConfigV2Group = "config.paralus.dev/v2" ) diff --git a/server/bootstrap.go b/server/bootstrap.go index 4f12271..152a65b 100644 --- a/server/bootstrap.go +++ b/server/bootstrap.go @@ -247,7 +247,7 @@ func (s *bootstrapServer) RegisterBootstrapAgent(ctx context.Context, in *sentry resp.Certificate = signed resp.CaCertificate = []byte(infra.Spec.CaCert) - if template.Metadata.Name == "rafay-core-relay-agent" { + if template.Metadata.Name == "paralus-core-relay-agent" { _log.Info("updating cluster status for :: ", agent.Metadata.Name) err = s.updateClusterStatus(ctx, agent.Metadata.Name) } diff --git a/server/cluster.go b/server/cluster.go index 8d34ad7..a004021 100644 --- a/server/cluster.go +++ b/server/cluster.go @@ -94,7 +94,7 @@ func (s *clusterServer) DownloadCluster(ctx context.Context, cluster *infrapbv3. } return &commonv3.HttpBody{ - ContentType: "application/x-rafay-yaml", + ContentType: "application/x-paralus-yaml", Data: bb.Bytes(), }, nil } diff --git a/server/kubectl_cluster_settings.go b/server/kubectl_cluster_settings.go index 8228d8f..36ec391 100644 --- a/server/kubectl_cluster_settings.go +++ b/server/kubectl_cluster_settings.go @@ -49,14 +49,14 @@ func (s *kubectlClusterSettingsServer) UpdateKubectlClusterSettings(ctx context. opts := in.Opts if md, ok := metadata.FromIncomingContext(ctx); ok { - ua := md.Get("rafay-gateway-user-agent") + ua := md.Get("paralus-gateway-user-agent") if len(ua) > 0 { userAgent = ua[0] } } if md, ok := metadata.FromIncomingContext(ctx); ok { - h := md.Get("rafay-gateway-host") + h := md.Get("paralus-gateway-host") if len(h) > 0 { host = h[0] } @@ -64,7 +64,7 @@ func (s *kubectlClusterSettingsServer) UpdateKubectlClusterSettings(ctx context. remoteAddr = "127.0.0.1" //default if md, ok := metadata.FromIncomingContext(ctx); ok { - ra := md.Get("rafay-gateway-remote-addr") + ra := md.Get("paralus-gateway-remote-addr") if len(ra) > 0 { remoteAddr = ra[0] }